diff --git a/app/src/main/java/io/netbird/client/ui/server/ChangeServerFragment.java b/app/src/main/java/io/netbird/client/ui/server/ChangeServerFragment.java
index 0e9fa4c..3f85b53 100644
--- a/app/src/main/java/io/netbird/client/ui/server/ChangeServerFragment.java
+++ b/app/src/main/java/io/netbird/client/ui/server/ChangeServerFragment.java
@@ -226,7 +226,7 @@ public void onDestroyView() {
 
     private void showConfirmChangeServerDialog() {
         final View dialogView = getLayoutInflater().inflate(R.layout.dialog_confirm_change_server, null);
-        final AlertDialog alertDialog = new AlertDialog.Builder(requireContext())
+        final AlertDialog alertDialog = new AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme)
                 .setView(dialogView)
                 .create();
 
@@ -243,7 +243,7 @@ private void showConfirmChangeServerDialog() {
     private void showSuccessDialog(Context context) {
         requireActivity().runOnUiThread(() -> {
             final View dialogView = getLayoutInflater().inflate(R.layout.dialog_change_server_success, null);
-            final AlertDialog alertDialog = new AlertDialog.Builder(context)
+            final AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.AlertDialogTheme)
                     .setView(dialogView)
                     .create();
 
diff --git a/app/src/main/res/drawable-night/bg_rounded_white.xml b/app/src/main/res/drawable-night/bg_rounded_white.xml
index 178434c..6f76c54 100644
--- a/app/src/main/res/drawable-night/bg_rounded_white.xml
+++ b/app/src/main/res/drawable-night/bg_rounded_white.xml
@@ -3,4 +3,5 @@
     android:shape="rectangle">
 
     <solid android:color="@color/nb_bg" />
+    <corners android:radius="28dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_rounded_white.xml b/app/src/main/res/drawable/bg_rounded_white.xml
index b226f53..2d90c42 100644
--- a/app/src/main/res/drawable/bg_rounded_white.xml
+++ b/app/src/main/res/drawable/bg_rounded_white.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle">
 
     <solid android:color="@android:color/white" />
-    <corners android:radius="32dp" />
+    <corners android:radius="28dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_change_server_success.xml b/app/src/main/res/layout/dialog_change_server_success.xml
index c410b0b..2fe2d1a 100644
--- a/app/src/main/res/layout/dialog_change_server_success.xml
+++ b/app/src/main/res/layout/dialog_change_server_success.xml
@@ -1,59 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:padding="24dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_rounded_white">
+    android:paddingStart="@dimen/dialog_horizontal_margin"
+    android:paddingEnd="@dimen/dialog_horizontal_margin"
+    android:gravity="center_horizontal">
 
-    <ImageView
-        android:id="@+id/icon_warning"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:contentDescription="@string/change_server_success_icon"
-        android:src="@drawable/check"
-        android:layout_margin="30dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <TextView
-        android:id="@+id/text_title"
-        android:layout_width="0dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:padding="24dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/change_server_success_title"
-        android:textStyle="bold"
-        android:textSize="18sp"
-        android:textAlignment="center"
-        android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@id/icon_warning"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        android:maxWidth="@dimen/dialog_max_width"
+        android:background="@drawable/bg_rounded_white">
 
-    <TextView
-        android:id="@+id/text_description"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/change_server_success_desc"
-        android:textSize="14sp"
-        android:textAlignment="center"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/text_title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <ImageView
+            android:id="@+id/icon_warning"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:contentDescription="@string/change_server_success_icon"
+            android:src="@drawable/check"
+            android:layout_margin="30dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
-        android:id="@+id/btn_close"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@android:string/ok"
-        android:textAllCaps="false"
-        app:layout_constraintTop_toBottomOf="@id/text_description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:background="@drawable/btn_bg_orange"
-        android:layout_marginTop="24dp" />
+        <TextView
+            android:id="@+id/text_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/change_server_success_title"
+            android:textStyle="bold"
+            android:textSize="18sp"
+            android:textAlignment="center"
+            android:layout_marginTop="30dp"
+            app:layout_constraintTop_toBottomOf="@id/icon_warning"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <TextView
+            android:id="@+id/text_description"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/change_server_success_desc"
+            android:textSize="14sp"
+            android:textAlignment="center"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/text_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <Button
+            android:id="@+id/btn_close"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@android:string/ok"
+            android:textAllCaps="false"
+            app:layout_constraintTop_toBottomOf="@id/text_description"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:background="@drawable/btn_bg_orange"
+            android:layout_marginTop="24dp" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_confirm_change_server.xml b/app/src/main/res/layout/dialog_confirm_change_server.xml
index 0710b07..7b469b9 100644
--- a/app/src/main/res/layout/dialog_confirm_change_server.xml
+++ b/app/src/main/res/layout/dialog_confirm_change_server.xml
@@ -1,77 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:padding="24dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_rounded_white">
+    android:fillViewport="true"
+    android:paddingStart="@dimen/dialog_horizontal_margin"
+    android:paddingEnd="@dimen/dialog_horizontal_margin"
+    android:clipToPadding="false"
+    android:background="@android:color/transparent">
 
-    <ImageView
-        android:id="@+id/icon_warning"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:contentDescription="@string/desc_exclamation_mark"
-        android:src="@drawable/exclamation"
-        android:layout_margin="30dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <TextView
-        android:id="@+id/text_title"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/change_server_alert_title"
-        android:textStyle="bold"
-        android:textSize="18sp"
-        android:textAlignment="center"
-        android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@id/icon_warning"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        android:gravity="center_horizontal">
 
-    <TextView
-        android:id="@+id/text_description"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/change_server_alert_desc"
-        android:textSize="14sp"
-        android:textAlignment="center"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/text_title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:padding="24dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxWidth="@dimen/dialog_max_width"
+            android:background="@drawable/bg_rounded_white">
 
-    <Button
-        android:id="@+id/btn_yes"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/change_server_alert_yes"
-        android:textAllCaps="false"
-        app:layout_constraintTop_toBottomOf="@id/text_description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:background="@drawable/btn_bg_orange"
-        android:layout_marginTop="24dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:foreground="@drawable/focus_highlight" />
+        <ImageView
+            android:id="@+id/icon_warning"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:contentDescription="@string/desc_exclamation_mark"
+            android:src="@drawable/exclamation"
+            android:layout_margin="30dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
-        android:id="@+id/btn_cancel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/change_server_alert_cancel"
-        android:textAllCaps="false"
-        android:textColor="@color/nb_orange"
-        android:background="@drawable/btn_bg_transparent"
-        app:layout_constraintTop_toBottomOf="@id/btn_yes"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:foreground="@drawable/focus_highlight" />
+        <TextView
+            android:id="@+id/text_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/change_server_alert_title"
+            android:textStyle="bold"
+            android:textSize="18sp"
+            android:textAlignment="center"
+            android:layout_marginTop="30dp"
+            app:layout_constraintTop_toBottomOf="@id/icon_warning"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <TextView
+            android:id="@+id/text_description"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/change_server_alert_desc"
+            android:textSize="14sp"
+            android:textAlignment="center"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/text_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <Button
+            android:id="@+id/btn_yes"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/change_server_alert_yes"
+            android:textAllCaps="false"
+            app:layout_constraintTop_toBottomOf="@id/text_description"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:background="@drawable/btn_bg_orange"
+            android:layout_marginTop="24dp"
+            android:focusable="true"
+            android:focusableInTouchMode="false"
+            android:foreground="@drawable/focus_highlight" />
+
+        <Button
+            android:id="@+id/btn_cancel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/change_server_alert_cancel"
+            android:textAllCaps="false"
+            android:textColor="@color/nb_orange"
+            android:background="@drawable/btn_bg_transparent"
+            app:layout_constraintTop_toBottomOf="@id/btn_yes"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="12dp"
+            android:focusable="true"
+            android:focusableInTouchMode="false"
+            android:foreground="@drawable/focus_highlight" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_simple_alert_message.xml b/app/src/main/res/layout/dialog_simple_alert_message.xml
index cd5f1b5..7d0994c 100644
--- a/app/src/main/res/layout/dialog_simple_alert_message.xml
+++ b/app/src/main/res/layout/dialog_simple_alert_message.xml
@@ -1,44 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_rounded_nb_bg"
-    android:maxWidth="560dp"
-    android:minWidth="280dp"
-    android:padding="24dp">
+    android:paddingStart="@dimen/dialog_horizontal_margin"
+    android:paddingEnd="@dimen/dialog_horizontal_margin"
+    android:gravity="center_horizontal">
 
-    <ImageView
-        android:id="@+id/icon_dialog"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:contentDescription="@string/exclamation_mark"
-        android:src="@drawable/exclamation"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/nb_orange" />
-
-    <TextView
-        android:id="@+id/txt_dialog"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/icon_dialog"
-        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ultricies, lorem sit amet ultrices tincidunt, neque neque molestie lacus, dictum consequat sapien neque at quam. Proin vel justo nulla." />
+        android:background="@drawable/bg_rounded_nb_bg"
+        android:maxWidth="@dimen/dialog_max_width"
+        android:minWidth="280dp"
+        android:padding="24dp">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_ok_dialog"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@android:string/ok"
-        android:textColor="@color/nb_orange"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/txt_dialog"
-        tools:text="@android:string/ok" />
+        <ImageView
+            android:id="@+id/icon_dialog"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:contentDescription="@string/exclamation_mark"
+            android:src="@drawable/exclamation"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/nb_orange" />
+
+        <TextView
+            android:id="@+id/txt_dialog"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:textAlignment="center"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/icon_dialog"
+            tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ultricies, lorem sit amet ultrices tincidunt, neque neque molestie lacus, dictum consequat sapien neque at quam. Proin vel justo nulla." />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_ok_dialog"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@android:string/ok"
+            android:textColor="@color/nb_orange"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/txt_dialog"
+            tools:text="@android:string/ok" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_advanced.xml b/app/src/main/res/layout/fragment_advanced.xml
index 0382b0f..9c74605 100644
--- a/app/src/main/res/layout/fragment_advanced.xml
+++ b/app/src/main/res/layout/fragment_advanced.xml
@@ -2,591 +2,608 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/scr_vw_advanced"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:id="@+id/scr_vw_advanced"
     tools:context=".ui.advanced.AdvancedFragment">
 
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="40dp">
-
-    <TextView
-        android:id="@+id/title_pre_shared_key"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/advanced_title_presharedkey"
-        android:textStyle="bold"
-        android:textSize="20sp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="16dp" />
-
-    <TextView
-        android:id="@+id/text_server_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/advanced_details"
-        android:textColor="@color/nb_txt_light"
-        app:layout_constraintTop_toBottomOf="@id/title_pre_shared_key"
-        app:layout_constraintStart_toStartOf="parent"
-        android:textSize="15sp"
-        android:layout_marginTop="16dp" />
-
-    <EditText
-        android:id="@+id/preshared_key"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
-        android:hint="@string/advanced_hint"
-        android:textSize="14sp"
-        android:inputType="textUri"
-        android:background="@drawable/edit_text_white"
-        android:padding="16dp"
-	android:textColor="@color/nb_txt"
-        android:textColorHint="@color/nb_txt_light"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        app:layout_constraintTop_toBottomOf="@id/text_server_label"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="8dp" />
-
-    <Button
-        android:id="@+id/btn_save"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/advanced_save"
-        android:textAllCaps="false"
-        android:background="@drawable/btn_bg_orange"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:foreground="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/preshared_key"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="24dp" />
-
-    <View
-        android:id="@+id/separator"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:background="@drawable/separator"
-        app:layout_constraintTop_toBottomOf="@id/btn_save"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="24dp"/>
-
-    <LinearLayout
-        android:id="@+id/trace_log_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_marginTop="24dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/separator"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <TextView
-            android:id="@+id/switchLabel"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/advanced_tracelog"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="15sp"
-            />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/switch_trace_log"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/button_share_logs"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/advanced_share_logs"
-        android:textAllCaps="false"
-        android:background="@drawable/btn_bg_orange"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:foreground="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/trace_log_layout"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="16dp" />
-
-    <View
-        android:id="@+id/separator_rosenpass"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:background="@drawable/separator"
-        app:layout_constraintTop_toBottomOf="@id/button_share_logs"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="24dp"/>
-
-    <LinearLayout
-        android:id="@+id/layout_rosenpas"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_marginTop="24dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/separator_rosenpass"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/advanced_rosenpass"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="15sp"
-            />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/switch_rosenpass"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false" />
-    </LinearLayout>
-
     <LinearLayout
-        android:id="@+id/layout_rosenpass_permissive"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/layout_rosenpas"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/advanced_rosenpass_permissive"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="15sp"
-            />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/switch_rosenpass_permissive"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/separator_network"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:background="@drawable/separator"
-        app:layout_constraintTop_toBottomOf="@id/layout_rosenpass_permissive"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="24dp"/>
-
-    <TextView
-        android:id="@+id/title_network_security"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/advanced_title_network_security"
-        android:textStyle="bold"
-        android:textSize="20sp"
-        app:layout_constraintTop_toBottomOf="@id/separator_network"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="16dp" />
+        android:gravity="center_horizontal">
 
-    <LinearLayout
-        android:id="@+id/layout_allow_ssh"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/title_network_security"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+            android:maxWidth="@dimen/fragment_max_width"
+            android:padding="40dp">
 
             <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/advanced_allow_ssh"
-                android:textColor="@color/nb_txt_light" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_allow_ssh"
+                android:id="@+id/title_pre_shared_key"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:focusable="false"
-                android:clickable="false" />
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_allow_ssh_desc"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="12sp"
-            android:layout_marginTop="2dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="48dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_block_inbound"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/layout_allow_ssh"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+                android:layout_marginTop="16dp"
+                android:text="@string/advanced_title_presharedkey"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/advanced_block_inbound"
-                android:textColor="@color/nb_txt_light" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_block_inbound"
+                android:id="@+id/text_server_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:focusable="false"
-                android:clickable="false" />
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_block_inbound_desc"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="12sp"
-            android:layout_marginTop="2dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="48dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_disable_client_routes"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/layout_block_inbound"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+                android:layout_marginTop="16dp"
+                android:text="@string/advanced_details"
+                android:textColor="@color/nb_txt_light"
+                android:textSize="15sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title_pre_shared_key" />
 
-            <TextView
+            <EditText
+                android:id="@+id/preshared_key"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/advanced_disable_client_routes"
-                android:textColor="@color/nb_txt_light" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_disable_client_routes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:focusable="false"
-                android:clickable="false" />
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_disable_client_routes_desc"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="12sp"
-            android:layout_marginTop="2dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="48dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_disable_server_routes"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/layout_disable_client_routes"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <TextView
+                android:layout_marginTop="8dp"
+                android:autofillHints=""
+                android:background="@drawable/edit_text_white"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="@string/advanced_hint"
+                android:inputType="textUri"
+                android:padding="16dp"
+                android:textColor="@color/nb_txt"
+                android:textColorHint="@color/nb_txt_light"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/text_server_label" />
+
+            <Button
+                android:id="@+id/btn_save"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/advanced_disable_server_routes"
-                android:textColor="@color/nb_txt_light" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_disable_server_routes"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/btn_bg_orange"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:foreground="@drawable/focus_highlight"
+                android:text="@string/advanced_save"
+                android:textAllCaps="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/preshared_key" />
+
+            <View
+                android:id="@+id/separator"
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/separator"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_save" />
+
+            <LinearLayout
+                android:id="@+id/trace_log_layout"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:focusable="false"
-                android:clickable="false" />
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_disable_server_routes_desc"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="12sp"
-            android:layout_marginTop="2dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="48dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_disable_dns"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/layout_disable_server_routes"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <TextView
+                android:layout_marginTop="24dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/separator">
+
+                <TextView
+                    android:id="@+id/switchLabel"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/advanced_tracelog"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="15sp" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/switch_trace_log"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:focusable="false" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/button_share_logs"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/advanced_disable_dns"
-                android:textColor="@color/nb_txt_light" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_disable_dns"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/btn_bg_orange"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:foreground="@drawable/focus_highlight"
+                android:text="@string/advanced_share_logs"
+                android:textAllCaps="false"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/trace_log_layout" />
+
+            <View
+                android:id="@+id/separator_rosenpass"
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/separator"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/button_share_logs" />
+
+            <LinearLayout
+                android:id="@+id/layout_rosenpas"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:focusable="false"
-                android:clickable="false" />
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_disable_dns_desc"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="12sp"
-            android:layout_marginTop="2dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="48dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_disable_firewall"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:background="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/layout_disable_dns"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <TextView
+                android:layout_marginTop="24dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/separator_rosenpass">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/advanced_rosenpass"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="15sp" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/switch_rosenpass"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:focusable="false" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layout_rosenpass_permissive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/advanced_disable_firewall"
-                android:textColor="@color/nb_txt_light" />
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_rosenpas">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/advanced_rosenpass_permissive"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="15sp" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/switch_rosenpass_permissive"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:focusable="false" />
+            </LinearLayout>
+
+            <View
+                android:id="@+id/separator_network"
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/separator"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_rosenpass_permissive" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_disable_firewall"
+            <TextView
+                android:id="@+id/title_network_security"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:focusable="false"
-                android:clickable="false" />
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_disable_firewall_desc"
-            android:textColor="@color/nb_txt_light"
-            android:textSize="12sp"
-            android:layout_marginTop="2dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="48dp" />
-
-    </LinearLayout>
-
-    <include
-        android:id="@+id/layout_force_relay_connection"
-        layout="@layout/component_switch"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:orientation="vertical"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/layout_disable_firewall" />
-
-    <LinearLayout
-        android:id="@+id/layout_theme"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toBottomOf="@id/layout_force_relay_connection"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_theme_title"
-            android:textStyle="bold"
-            android:textSize="20sp"
-            android:textColor="@color/nb_txt"
-            android:layout_marginTop="16dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/advanced_theme_desc"
-            android:textSize="14sp"
-            android:textColor="@color/nb_txt_light"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp" />
-
-        <RadioGroup
-            android:id="@+id/radioGroup_theme"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="8dp">
-
-            <RadioButton
-                android:id="@+id/radio_theme_system"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/advanced_title_network_security"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/separator_network" />
+
+            <LinearLayout
+                android:id="@+id/layout_allow_ssh"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/advanced_theme_system"
-                android:textColor="@color/nb_txt_light"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:orientation="vertical"
                 android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title_network_security">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/advanced_allow_ssh"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:id="@+id/switch_allow_ssh"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        android:focusable="false" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/advanced_allow_ssh_desc"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layout_block_inbound"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
                 android:focusable="true"
                 android:focusableInTouchMode="false"
-                android:background="@drawable/focus_highlight" />
-
-            <RadioButton
-                android:id="@+id/radio_theme_light"
-                android:layout_width="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_allow_ssh">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/advanced_block_inbound"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:id="@+id/switch_block_inbound"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        android:focusable="false" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/advanced_block_inbound_desc"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layout_disable_client_routes"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/advanced_theme_light"
-                android:layout_marginStart="16dp"
-                android:textColor="@color/nb_txt_light"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:orientation="vertical"
                 android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_block_inbound">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/advanced_disable_client_routes"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:id="@+id/switch_disable_client_routes"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        android:focusable="false" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/advanced_disable_client_routes_desc"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layout_disable_server_routes"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
                 android:focusable="true"
                 android:focusableInTouchMode="false"
-                android:background="@drawable/focus_highlight" />
-
-            <RadioButton
-                android:id="@+id/radio_theme_dark"
-                android:layout_width="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_disable_client_routes">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/advanced_disable_server_routes"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:id="@+id/switch_disable_server_routes"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        android:focusable="false" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/advanced_disable_server_routes_desc"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layout_disable_dns"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/advanced_theme_dark"
-                android:layout_marginStart="16dp"
-                android:textColor="@color/nb_txt_light"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:focusableInTouchMode="false"
+                android:orientation="vertical"
                 android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_disable_server_routes">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/advanced_disable_dns"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:id="@+id/switch_disable_dns"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        android:focusable="false" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/advanced_disable_dns_desc"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layout_disable_firewall"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/focus_highlight"
+                android:clickable="true"
                 android:focusable="true"
                 android:focusableInTouchMode="false"
-                android:background="@drawable/focus_highlight" />
-        </RadioGroup>
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_disable_dns">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/advanced_disable_firewall"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:id="@+id/switch_disable_firewall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        android:focusable="false" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/advanced_disable_firewall_desc"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <include
+                android:id="@+id/layout_force_relay_connection"
+                layout="@layout/component_switch"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_disable_firewall" />
+
+            <LinearLayout
+                android:id="@+id/layout_theme"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/layout_force_relay_connection">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/advanced_theme_title"
+                    android:textColor="@color/nb_txt"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/advanced_theme_desc"
+                    android:textColor="@color/nb_txt_light"
+                    android:textSize="14sp" />
+
+                <RadioGroup
+                    android:id="@+id/radioGroup_theme"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/radio_theme_system"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/focus_highlight"
+                        android:focusable="true"
+                        android:focusableInTouchMode="false"
+                        android:padding="12dp"
+                        android:text="@string/advanced_theme_system"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <RadioButton
+                        android:id="@+id/radio_theme_light"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:background="@drawable/focus_highlight"
+                        android:focusable="true"
+                        android:focusableInTouchMode="false"
+                        android:padding="12dp"
+                        android:text="@string/advanced_theme_light"
+                        android:textColor="@color/nb_txt_light" />
+
+                    <RadioButton
+                        android:id="@+id/radio_theme_dark"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:background="@drawable/focus_highlight"
+                        android:focusable="true"
+                        android:focusableInTouchMode="false"
+                        android:padding="12dp"
+                        android:text="@string/advanced_theme_dark"
+                        android:textColor="@color/nb_txt_light" />
+                </RadioGroup>
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profiles.xml b/app/src/main/res/layout/fragment_profiles.xml
index 79ed741..e239e12 100644
--- a/app/src/main/res/layout/fragment_profiles.xml
+++ b/app/src/main/res/layout/fragment_profiles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,34 +7,42 @@
     android:background="@color/nb_bg"
     tools:context=".ui.profile.ProfilesFragment">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_profiles"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:paddingTop="16dp"
-        android:paddingBottom="88dp"
-        android:clipToPadding="false"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:listitem="@layout/list_item_profile" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:maxWidth="@dimen/fragment_max_width"
+        android:layout_gravity="center_horizontal">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/btn_add_profile"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/profiles_add"
-        android:src="@drawable/add_24px"
-        app:backgroundTint="@color/nb_orange"
-        app:tint="@android:color/white"
-        app:elevation="0dp"
-        app:hoveredFocusedTranslationZ="0dp"
-        app:pressedTranslationZ="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_profiles"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="88dp"
+            android:clipToPadding="false"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:listitem="@layout/list_item_profile" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btn_add_profile"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:contentDescription="@string/profiles_add"
+            android:src="@drawable/add_24px"
+            app:backgroundTint="@color/nb_orange"
+            app:tint="@android:color/white"
+            app:elevation="0dp"
+            app:hoveredFocusedTranslationZ="0dp"
+            app:pressedTranslationZ="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_server.xml b/app/src/main/res/layout/fragment_server.xml
index b38d3dd..7f6a5b5 100644
--- a/app/src/main/res/layout/fragment_server.xml
+++ b/app/src/main/res/layout/fragment_server.xml
@@ -1,156 +1,166 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp">
+    android:fillViewport="true">
 
-    <TextView
-        android:id="@+id/text_server_label"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/change_server_title_server"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:maxWidth="@dimen/fragment_max_width"
+        android:layout_gravity="center_horizontal"
+        android:padding="16dp">
 
-    <EditText
-        android:id="@+id/edit_text_server"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:autofillHints=""
-        android:hint="@string/change_server_hint"
-        android:textSize="14sp"
-        android:inputType="textUri"
-        android:imeOptions="actionDone"
-        android:background="@drawable/edit_text_white"
-        android:padding="12dp"
-        android:textColor="@color/nb_txt"
-        android:textColorHint="@color/nb_txt_light"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:foreground="@drawable/focus_highlight"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/text_server_label"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/setup_key_group"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        tools:visibility="visible"
-        app:constraint_referenced_ids="edit_text_setup_key, text_setup_key_tooltip" />
-
-    <TextView
-        android:id="@+id/text_setup_key_label"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/change_server_setup_key"
-        android:textSize="12sp"
-        app:drawableLeftCompat="@drawable/add_24px"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:foreground="@drawable/focus_highlight"
-        android:padding="8dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toBottomOf="@id/edit_text_server"
-        app:layout_constraintStart_toStartOf="@id/text_server_label"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <TextView
+            android:id="@+id/text_server_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/change_server_title_server"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:layout_marginTop="16dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-    <EditText
-        android:id="@+id/edit_text_setup_key"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:autofillHints=""
-        android:hint="@string/change_server_setup_key_hint"
-        android:textSize="14sp"
-        android:inputType="textUri"
-        android:imeOptions="actionDone"
-        android:background="@drawable/edit_text_white"
-        android:padding="12dp"
-        android:textColor="@color/nb_txt"
-        android:textColorHint="@color/nb_txt_light"
-        android:foreground="@drawable/focus_highlight"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/text_setup_key_label"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <EditText
+            android:id="@+id/edit_text_server"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:autofillHints=""
+            android:hint="@string/change_server_hint"
+            android:textSize="14sp"
+            android:inputType="textUri"
+            android:imeOptions="actionDone"
+            android:background="@drawable/edit_text_white"
+            android:padding="12dp"
+            android:textColor="@color/nb_txt"
+            android:textColorHint="@color/nb_txt_light"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:foreground="@drawable/focus_highlight"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/text_server_label"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <LinearLayout
-        android:id="@+id/text_setup_key_tooltip"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:background="@drawable/btn_bg_transparent"
-        android:padding="12dp"
-        android:layout_marginTop="24dp"
-        android:animateLayoutChanges="true"
-        app:layout_constraintTop_toBottomOf="@id/edit_text_setup_key"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/setup_key_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:constraint_referenced_ids="edit_text_setup_key, text_setup_key_tooltip" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:id="@+id/text_setup_key_label"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/change_server_setup_key_warning"
-            android:textColor="@color/nb_orange"
-            android:justificationMode="inter_word"
-            android:textSize="16sp" />
-    </LinearLayout>
+            android:text="@string/change_server_setup_key"
+            android:textSize="12sp"
+            app:drawableLeftCompat="@drawable/add_24px"
+            android:focusable="true"
+            android:focusableInTouchMode="false"
+            android:clickable="true"
+            android:foreground="@drawable/focus_highlight"
+            android:padding="8dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintTop_toBottomOf="@id/edit_text_server"
+            app:layout_constraintStart_toStartOf="@id/text_server_label"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
-        android:id="@+id/btn_change_server"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/change_server_btn"
-        android:textAllCaps="false"
-        android:background="@drawable/btn_bg_orange"
-        android:layout_marginTop="24dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:foreground="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/text_setup_key_tooltip"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <EditText
+            android:id="@+id/edit_text_setup_key"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:autofillHints=""
+            android:hint="@string/change_server_setup_key_hint"
+            android:textSize="14sp"
+            android:inputType="textUri"
+            android:imeOptions="actionDone"
+            android:background="@drawable/edit_text_white"
+            android:padding="12dp"
+            android:textColor="@color/nb_txt"
+            android:textColorHint="@color/nb_txt_light"
+            android:foreground="@drawable/focus_highlight"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/text_setup_key_label"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <LinearLayout
-        android:id="@+id/btn_use_netbird"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:background="@drawable/btn_bg_transparent"
-        android:padding="12dp"
-        android:layout_marginTop="24dp"
-        android:focusable="true"
-        android:focusableInTouchMode="false"
-        android:clickable="true"
-        android:foreground="@drawable/focus_highlight"
-        app:layout_constraintTop_toBottomOf="@id/btn_change_server"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        <LinearLayout
+            android:id="@+id/text_setup_key_tooltip"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:background="@drawable/btn_bg_transparent"
+            android:padding="12dp"
+            android:layout_marginTop="24dp"
+            android:animateLayoutChanges="true"
+            app:layout_constraintTop_toBottomOf="@id/edit_text_setup_key"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:contentDescription="@string/fragment_firstinstall_desc_logo"
-            android:src="@drawable/ic_netbird_btn"
-            android:layout_marginEnd="8dp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/change_server_setup_key_warning"
+                android:textColor="@color/nb_orange"
+                android:justificationMode="inter_word"
+                android:textSize="16sp" />
+        </LinearLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
+        <Button
+            android:id="@+id/btn_change_server"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/change_server_btn_reset"
-            android:textColor="@color/nb_orange"
-            android:textSize="16sp"
-            android:textAllCaps="false" />
-    </LinearLayout>
+            android:text="@string/change_server_btn"
+            android:textAllCaps="false"
+            android:background="@drawable/btn_bg_orange"
+            android:layout_marginTop="24dp"
+            android:focusable="true"
+            android:focusableInTouchMode="false"
+            android:foreground="@drawable/focus_highlight"
+            app:layout_constraintTop_toBottomOf="@id/text_setup_key_tooltip"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/btn_use_netbird"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:background="@drawable/btn_bg_transparent"
+            android:padding="12dp"
+            android:layout_marginTop="24dp"
+            android:focusable="true"
+            android:focusableInTouchMode="false"
+            android:clickable="true"
+            android:foreground="@drawable/focus_highlight"
+            app:layout_constraintTop_toBottomOf="@id/btn_change_server"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:contentDescription="@string/fragment_firstinstall_desc_logo"
+                android:src="@drawable/ic_netbird_btn"
+                android:layout_marginEnd="8dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/change_server_btn_reset"
+                android:text="@string/change_server_btn_reset"
+                android:textColor="@color/nb_orange"
+                android:textSize="16sp"
+                android:textAllCaps="false" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000..363a902
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="dialog_horizontal_margin">56dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4ab4520..f43b7b5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,4 +5,7 @@
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
     <dimen name="nav_header_height">176dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="dialog_horizontal_margin">16dp</dimen>
+    <dimen name="dialog_max_width">560dp</dimen>
+    <dimen name="fragment_max_width">500dp</dimen>
 </resources>
\ No newline at end of file