diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml
index b151a9147..2c30a0391 100644
--- a/app/src/main/res/layout-sw600dp/fragment_settings.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml
@@ -33,67 +33,86 @@
         android:orientation="vertical"
         tools:ignore="UselessParent">
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_confirmations"/>
 
         <CheckBox
             android:id="@+id/set_share_validation"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_share_validation"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_share_validation_fav"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_share_validation_fav"
             android:layout_height="wrap_content" />
 
-
-        <CheckBox
-            android:id="@+id/set_auto_add_media_url"
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
-            android:text="@string/set_auto_add_media_url"
-            android:layout_height="wrap_content" />
-
-        <CheckBox
-            android:id="@+id/set_auto_store"
-            android:layout_width="wrap_content"
-            android:text="@string/set_auto_store_toot"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_timelines"/>
 
         <CheckBox
             android:id="@+id/set_display_direct"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_direct"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_local"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_local"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_global"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_global"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_art"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_art"
             android:layout_height="wrap_content" />
 
-        <!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
         <CheckBox
-            android:id="@+id/set_capitalize"
+            android:id="@+id/set_old_direct_timeline"
             android:layout_width="wrap_content"
-            android:text="@string/set_capitalize"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_old_direct_timeline"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_notification"/>
+
         <!-- LIVE NOTIFICATIONS SETTINGS -->
         <CheckBox
             android:id="@+id/set_live_notify"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/live_notif"
             android:layout_height="wrap_content" />
 
@@ -101,49 +120,23 @@
         <CheckBox
             android:id="@+id/set_keep_background_process"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_keep_background_process"
             android:layout_height="wrap_content" />
 
-        <!-- GIF AVATARS -->
-        <CheckBox
-            android:id="@+id/set_disable_gif"
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
-            android:text="@string/set_disable_gif"
-            android:layout_height="wrap_content" />
-
-
-        <!-- EXPAND CW -->
-        <CheckBox
-            android:id="@+id/set_expand_cw"
-            android:layout_width="wrap_content"
-            android:text="@string/expand_cw"
-            android:layout_height="wrap_content" />
-
-        <!-- EXPAND Images -->
-        <CheckBox
-            android:id="@+id/set_expand_image"
-            android:layout_width="wrap_content"
-            android:text="@string/expand_image"
-            android:layout_height="wrap_content" />
-
-        <!-- DISPLAY BOOKMARK BUTTON -->
-        <CheckBox
-            android:id="@+id/set_display_bookmarks"
-            android:layout_width="wrap_content"
-            android:text="@string/set_display_bookmark_button"
-            android:layout_height="wrap_content" />
-
-        <!-- FIT PREVIEWS  -->
-        <CheckBox
-            android:id="@+id/set_fit_preview"
-            android:layout_width="wrap_content"
-            android:text="@string/set_fit_preview"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_interface"/>
 
         <!-- COMPACT MODE  -->
         <CheckBox
             android:id="@+id/set_compact_mode"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_compact_mode"
             android:layout_height="wrap_content" />
 
@@ -151,53 +144,152 @@
         <CheckBox
             android:id="@+id/set_display_follow_instance"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_follow_instance"
             android:layout_height="wrap_content" />
 
-        <!-- PUT THE WHOLE CONTENT WHEN SHARING  -->
+        <!-- DISPLAY BOOKMARK BUTTON -->
         <CheckBox
-            android:id="@+id/set_share_details"
+            android:id="@+id/set_display_bookmarks"
             android:layout_width="wrap_content"
-            android:text="@string/set_share_details"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_display_bookmark_button"
             android:layout_height="wrap_content" />
 
+        <!-- FIT PREVIEWS  -->
         <CheckBox
-            android:id="@+id/set_automatically_split_toot"
+            android:id="@+id/set_fit_preview"
             android:layout_width="wrap_content"
-            android:text="@string/set_automatically_split_toot"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_fit_preview"
             android:layout_height="wrap_content" />
 
+        <!-- GIF AVATARS -->
         <CheckBox
-            android:id="@+id/set_display_emoji"
+            android:id="@+id/set_disable_gif"
             android:layout_width="wrap_content"
-            android:text="@string/set_display_emoji"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_disable_gif"
             android:layout_height="wrap_content" />
 
-
         <CheckBox
             android:id="@+id/set_display_card"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_card"
             android:layout_height="wrap_content" />
 
         <CheckBox
             android:id="@+id/set_display_video_preview"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_video_preview"
             android:layout_height="wrap_content" />
 
-        <CheckBox
-            android:id="@+id/set_old_direct_timeline"
-            android:layout_width="wrap_content"
-            android:text="@string/set_old_direct_timeline"
-            android:layout_height="wrap_content" />
-
         <CheckBox
             android:id="@+id/set_display_content_after_fetch_more"
             android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
             android:text="@string/set_display_content_after_fetch_more"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_composing"/>
+
+        <CheckBox
+            android:id="@+id/set_auto_add_media_url"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_auto_add_media_url"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_auto_store"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_auto_store_toot"
+            android:layout_height="wrap_content" />
+
+        <!-- CARRIAGE RETURN AFTER MENTION IN REPLIES -->
+        <CheckBox
+            android:id="@+id/set_capitalize"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_capitalize"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_automatically_split_toot"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_automatically_split_toot"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/set_display_emoji"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_display_emoji"
+            android:layout_height="wrap_content" />
+
+        <!-- PUT THE WHOLE CONTENT WHEN SHARING  -->
+        <CheckBox
+            android:id="@+id/set_share_details"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/set_share_details"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_marginTop="@dimen/settings_category_label_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_category_label_hiddencontent"/>
+
+        <!-- EXPAND CW -->
+        <CheckBox
+            android:id="@+id/set_expand_cw"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/expand_cw"
+            android:layout_height="wrap_content" />
+
+        <!-- EXPAND Images -->
+        <CheckBox
+            android:id="@+id/set_expand_image"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/settings_checkbox_margin"
+            android:layout_marginBottom="@dimen/settings_checkbox_margin"
+            android:text="@string/expand_image"
+            android:layout_height="wrap_content" />
+
+
+
+
+
+
+
+
+
+
+
         <!-- TRUNCATE LONG TOOTS -->
         <TextView
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 1a7d33153..55f5f4364 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -41,7 +41,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelconfirmations"/>
+            android:text="@string/settings_category_label_confirmations"/>
         <CheckBox
             android:id="@+id/set_share_validation"
             android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labeltimelines"/>
+            android:text="@string/settings_category_label_timelines"/>
 
         <CheckBox
             android:id="@+id/set_display_direct"
@@ -106,7 +106,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelnotification"/>
+            android:text="@string/settings_category_label_notification"/>
 
         <!-- LIVE NOTIFICATIONS SETTINGS -->
         <CheckBox
@@ -130,7 +130,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelinterface"/>
+            android:text="@string/settings_category_label_interface"/>
 
         <!-- COMPACT MODE  -->
         <CheckBox
@@ -205,7 +205,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelcomposing"/>
+            android:text="@string/settings_category_label_composing"/>
 
         <CheckBox
             android:id="@+id/set_auto_add_media_url"
@@ -261,7 +261,7 @@
             android:layout_marginTop="@dimen/settings_category_label_margin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/settings_category_labelhiddencontent"/>
+            android:text="@string/settings_category_label_hiddencontent"/>
 
         <!-- EXPAND CW -->
         <CheckBox
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 72484f073..1dcd8109c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,5 +13,5 @@
     <dimen name="fab_margin_floating">16dp</dimen>
     <dimen name="item_offset">5dp</dimen>
     <dimen name="settings_checkbox_margin">2dp</dimen>
-    <dimen name="settings_category_label_margin">5dp</dimen>
+    <dimen name="settings_category_label_margin">2dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02e707b39..42faea042 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -835,12 +835,12 @@
     <string name="toots_client">Toots (Device)</string>
     <string name="modify">Modify</string>
     <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_labelconfirmations">Confirmations</string>
-    <string name="settings_category_labeltimelines">Timelines</string>
-    <string name="settings_category_labelnotification">Notification service</string>
-    <string name="settings_category_labelinterface">Interface</string>
-    <string name="settings_category_labelhiddencontent">Hidden content</string>
-    <string name="settings_category_labelcomposing">Composing</string>
+    <string name="settings_category_label_confirmations">Confirmations</string>
+    <string name="settings_category_label_timelines">Timelines</string>
+    <string name="settings_category_label_notification">Notification service</string>
+    <string name="settings_category_label_interface">Interface</string>
+    <string name="settings_category_label_hiddencontent">Hidden content</string>
+    <string name="settings_category_label_composing">Composing</string>
     <!-- end languages -->