diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index e35d231a21..d9d2bed22f 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -40,7 +40,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_enabled"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparator1" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparator1"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvEnabledHint"
@@ -84,7 +85,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_metered"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparator2" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparator2"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvMeteredHint"
@@ -142,7 +144,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_browse"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/barrier1" />
+            app:layout_constraintTop_toBottomOf="@id/barrier1"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvBrowseHint"
@@ -166,7 +169,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_allow_insecure"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBrowseHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvBrowseHint"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvSectionDisplay"
@@ -197,7 +201,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_unified"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparator3" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparator3"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvUnifiedHint"
@@ -221,7 +226,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_threading"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvUnifiedHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvUnifiedHint"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvThreadingHint"
@@ -245,7 +251,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_compact"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvThreadingHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvThreadingHint"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAvatars"
@@ -256,7 +263,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_avatars"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swCompact" />
+            app:layout_constraintTop_toBottomOf="@id/swCompact"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swIdenticons"
@@ -267,7 +275,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_identicons"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swAvatars" />
+            app:layout_constraintTop_toBottomOf="@id/swAvatars"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swPreview"
@@ -278,7 +287,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_preview"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swIdenticons" />
+            app:layout_constraintTop_toBottomOf="@id/swIdenticons"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvSectionBehavior"
@@ -309,7 +319,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_swipe"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparator4" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparator4"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swActionbar"
@@ -320,7 +331,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_actionbar"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swSwipe" />
+            app:layout_constraintTop_toBottomOf="@id/swSwipe"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAutoclose"
@@ -331,7 +343,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_autoclose"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swActionbar" />
+            app:layout_constraintTop_toBottomOf="@id/swActionbar"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvAutocloseHint"
@@ -355,7 +368,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_collapse"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAutocloseHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvAutocloseHint"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swConfirm"
@@ -366,7 +380,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_confirm"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swCollapse" />
+            app:layout_constraintTop_toBottomOf="@id/swCollapse"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swSender"
@@ -377,7 +392,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_sender"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swConfirm" />
+            app:layout_constraintTop_toBottomOf="@id/swConfirm"
+            app:switchPadding="12dp" />
 
         <TextView
             android:id="@+id/tvSenderHint"
@@ -401,7 +417,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_light"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSenderHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvSenderHint"
+            app:switchPadding="12dp" />
 
         <Button
             android:id="@+id/btnSound"
@@ -446,7 +463,8 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_updates"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparator5" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparator5"
+            app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swDebug"
@@ -458,7 +476,8 @@
             android:layout_marginBottom="12dp"
             android:text="@string/title_advanced_debug"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swUpdates" />
+            app:layout_constraintTop_toBottomOf="@id/swUpdates"
+            app:switchPadding="12dp" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpNotification"