diff --git a/WordPress/src/main/res/xml/site_settings.xml b/WordPress/src/main/res/xml/site_settings.xml
index e9606e662312..e86f76632c9a 100644
--- a/WordPress/src/main/res/xml/site_settings.xml
+++ b/WordPress/src/main/res/xml/site_settings.xml
@@ -10,6 +10,31 @@
android:key="@string/pref_key_site_general"
android:title="@string/site_settings_general_header">
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
@@ -146,6 +146,18 @@
android:title="@string/site_settings_default_category_title"
app:longClickHint="@string/site_settings_category_hint" />
+
+
+
+
-
-
-
-
-
+
-
-
+
+
+
+
-
+
-
+
@@ -322,11 +327,6 @@
-
-
@@ -336,6 +336,24 @@
android:title="@string/site_settings_discussion_header"
app:longClickHint="@string/site_settings_discussion_hint">
+
+
+
+
+
+
-
+
-
+
@@ -380,23 +398,17 @@
android:id="@+id/pref_site_comments"
android:title="@string/site_settings_comments_header">
-
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -484,35 +484,48 @@
android:key="@string/pref_key_jetpack_security_screen"
android:title="@string/jetpack_security_setting_title">
+
+
+
+
+
+
+
+
-
-
-
+
-
+
-
-
-
-
-
-