diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/preference/CustomFontPreferenceCategory.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/preference/CustomFontPreferenceCategory.java
index 2cbde4bc..174dfceb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/preference/CustomFontPreferenceCategory.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/preference/CustomFontPreferenceCategory.java
@@ -10,7 +10,6 @@ import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceViewHolder;
 
 import ml.docilealligator.infinityforreddit.CustomFontReceiver;
-import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapperReceiver;
 
@@ -39,10 +38,10 @@ public class CustomFontPreferenceCategory extends PreferenceCategory implements
         super.onBindViewHolder(holder);
         View titleTextView = holder.findViewById(android.R.id.title);
         holder.setDividerAllowedAbove(false);
-        View iconView = holder.findViewById(R.id.icon_frame);
+        /*View iconView = holder.findViewById(R.id.icon_frame);
         if (iconView != null) {
             iconView.setVisibility(View.GONE);
-        }
+        }*/
 
         if (customThemeWrapper != null) {
             if (titleTextView instanceof TextView) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7470aae9..43ca53f8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -660,6 +660,7 @@
     <string name="settings_proxy_hostname">Hostname</string>
     <string name="settings_proxy_port">Port</string>
     <string name="settings_hide_fab_in_post_details">Hide Floating Action Button</string>
+    <string name="settings_category_media_title">Media</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
@@ -1543,7 +1544,7 @@
 
     <string name="jump_to_parent_comment">Jump to Parent Comment</string>
     <string name="long_press_post_non_media_area">Long Press on Post (Non-Media Area)</string>
-    <string name="long_press_post_media">Long Press on Media</string>
+    <string name="long_press_post_media">Long Press on Post Media</string>
     <string name="show_post_options">Show Post Options</string>
     <string name="preview_in_fullscreen">Preview in Fullscreen</string>
 
diff --git a/app/src/main/res/xml/gestures_and_buttons_preferences.xml b/app/src/main/res/xml/gestures_and_buttons_preferences.xml
index a2d6ac07..fdfd8da1 100644
--- a/app/src/main/res/xml/gestures_and_buttons_preferences.xml
+++ b/app/src/main/res/xml/gestures_and_buttons_preferences.xml
@@ -8,11 +8,39 @@
         app:title="@string/settings_swipe_to_go_back_title"
         app:summary="@string/settings_swipe_to_go_back_summary" />
 
+    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
+        app:defaultValue="false"
+        app:key="lock_bottom_app_bar"
+        app:title="@string/settings_lock_bottom_app_bar_title"
+        app:isPreferenceVisible="false" />
+
+    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
+        app:defaultValue="true"
+        app:key="pull_to_refresh"
+        app:title="@string/settings_pull_to_refresh_title" />
+
+    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
+        app:defaultValue="false"
+        app:key="swipe_between_posts"
+        app:title="@string/settings_swipe_between_posts_title" />
+
+    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontPreferenceCategory
+        app:title="@string/settings_category_media_title" />
+
     <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
         app:defaultValue="true"
         app:key="swipe_vertically_to_go_back_from_media"
         app:title="@string/settings_swipe_vertically_to_go_back_from_media_title" />
 
+    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
+        app:defaultValue="false"
+        app:key="pinch_to_zoom_video"
+        app:title="@string/settings_pinch_to_zoom_video_title"
+        app:summary="@string/settings_experimental_feature" />
+
+    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontPreferenceCategory
+        app:title="@string/settings_category_comment_title" />
+
     <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
         app:defaultValue="false"
         app:key="lock_jump_to_next_top_level_comment_button"
@@ -24,42 +52,23 @@
         app:title="@string/settings_swipe_up_to_hide_jump_to_next_top_level_comment_button_title"
         app:isPreferenceVisible="false" />
 
-    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
-        app:defaultValue="false"
-        app:key="lock_bottom_app_bar"
-        app:title="@string/settings_lock_bottom_app_bar_title"
-        app:isPreferenceVisible="false" />
-
     <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
         app:defaultValue="false"
         app:key="volume_keys_navigate_comments"
         app:title="@string/settings_volume_keys_navigate_comments_title" />
 
-    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
-        app:defaultValue="false"
-        app:key="volume_keys_navigate_posts"
-        app:title="@string/settings_volume_keys_navigate_posts_title" />
-
     <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
         app:defaultValue="false"
         app:key="swap_tap_and_long_in_comments"
         app:title="@string/settings_swap_tap_and_long_title" />
 
-    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
-        app:defaultValue="true"
-        app:key="pull_to_refresh"
-        app:title="@string/settings_pull_to_refresh_title" />
+    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontPreferenceCategory
+        app:title="@string/settings_category_post_title" />
 
     <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
         app:defaultValue="false"
-        app:key="swipe_between_posts"
-        app:title="@string/settings_swipe_between_posts_title" />
-
-    <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontSwitchPreference
-        app:defaultValue="false"
-        app:key="pinch_to_zoom_video"
-        app:title="@string/settings_pinch_to_zoom_video_title"
-        app:summary="@string/settings_experimental_feature" />
+        app:key="volume_keys_navigate_posts"
+        app:title="@string/settings_volume_keys_navigate_posts_title" />
 
     <ml.docilealligator.infinityforreddit.customviews.preference.CustomFontListPreference
         app:defaultValue="1"