diff --git a/app/src/main/java/org/schabi/newpipe/settings/DebugSettingsFragment.java b/app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java
similarity index 100%
rename from app/src/main/java/org/schabi/newpipe/settings/DebugSettingsFragment.java
rename to app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java
diff --git a/app/src/main/res/xml/main_settings.xml b/app/src/debug/res/xml/main_settings.xml
similarity index 100%
rename from app/src/main/res/xml/main_settings.xml
rename to app/src/debug/res/xml/main_settings.xml
diff --git a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
index 5502a06eb..6d6f0fa75 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java
@@ -21,10 +21,5 @@ public class MainSettingsFragment extends BasePreferenceFragment {
 
             defaultPreferences.edit().putBoolean(getString(R.string.update_app_key), false).apply();
         }
-
-        if (!DEBUG) {
-            final Preference debug = findPreference(getString(R.string.debug_pref_screen_key));
-            getPreferenceScreen().removePreference(debug);
-        }
     }
 }
diff --git a/app/src/release/res/xml/main_settings.xml b/app/src/release/res/xml/main_settings.xml
new file mode 100644
index 000000000..e2fb9cb9b
--- /dev/null
+++ b/app/src/release/res/xml/main_settings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="general_preferences"
+    android:title="@string/settings">
+
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.VideoAudioSettingsFragment"
+        android:icon="?attr/ic_headset"
+        android:title="@string/settings_category_video_audio_title"/>
+
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.DownloadSettingsFragment"
+        android:icon="?attr/ic_file_download"
+        android:title="@string/settings_category_downloads_title"/>
+
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.AppearanceSettingsFragment"
+        android:icon="?attr/ic_palette"
+        android:title="@string/settings_category_appearance_title"/>
+
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.HistorySettingsFragment"
+        android:icon="?attr/ic_history"
+        android:title="@string/settings_category_history_title"/>
+
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.ContentSettingsFragment"
+        android:icon="?attr/ic_language"
+        android:title="@string/content"/>
+
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.NotificationSettingsFragment"
+        android:icon="?attr/ic_play_arrow"
+        android:title="@string/settings_category_notification_title"/>
+
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.UpdateSettingsFragment"
+        android:icon="?attr/ic_settings_update"
+        android:title="@string/settings_category_updates_title"
+        android:key="update_pref_screen_key"/>
+</PreferenceScreen>