diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cecbfa68..d9aabd6f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -346,7 +346,7 @@
     <string name="settings_advanced_exact_alarms_title">Genaue Alarme</string>
     <string name="settings_advanced_exact_alarms_true">ntfy kann genaue Alarme planen. Um WebSockets im Hintergrund wieder zu verbinden, sind genaue Alarme erforderlich. Hier tippen, um die Berechtigung zu widerrufen.</string>
     <string name="settings_advanced_exact_alarms_false">ntfy kann keine genauen Alarme planen. Um WebSockets im Hintergrund wieder zu verbinden, sind genaue Alarme erforderlich. Tippe hier, um die Berechtigung zu erteilen.</string>
-    <string name="settings_general_custom_headers_title">Benutzerdefinierte Header</string>
+    <string name="settings_advanced_custom_headers_title">Benutzerdefinierte Header</string>
     <string name="settings_general_custom_headers_summary">Benutzerdefinierte HTTP-Header pro Server hinzufügen</string>
     <string name="settings_general_custom_headers_prefs_title">Benutzerdefinierte Header</string>
     <string name="settings_general_custom_headers_prefs_header_add">Header hinzufügen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79338266..0f4ed1e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -461,8 +461,8 @@
     <string name="user_dialog_button_save">Save</string>
 
     <!-- Custom Headers settings -->
-    <string name="settings_general_custom_headers_key">CustomHeaders</string>
-    <string name="settings_general_custom_headers_title">Custom headers</string>
+    <string name="settings_advanced_custom_headers_key" translatable="false">CustomHeaders</string>
+    <string name="settings_advanced_custom_headers_title">Custom headers</string>
     <string name="settings_general_custom_headers_summary">Add custom HTTP headers per server</string>
     <string name="settings_general_custom_headers_prefs_title">Custom Headers</string>
     <string name="settings_general_custom_headers_prefs_header_add">Add header</string>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index b05a001e..82c79d6b 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -43,11 +43,6 @@
                 app:title="@string/settings_general_users_title"
                 app:summary="@string/settings_general_users_summary"
                 app:fragment="io.heckel.ntfy.ui.SettingsActivity$UserSettingsFragment"/>
-        <Preference
-                app:key="@string/settings_general_custom_headers_key"
-                app:title="@string/settings_general_custom_headers_title"
-                app:summary="@string/settings_general_custom_headers_summary"
-                app:fragment="io.heckel.ntfy.ui.SettingsActivity$CustomHeaderSettingsFragment"/>
         <ListPreference
                 app:key="@string/settings_general_language_key"
                 app:title="@string/settings_general_language_title"/>
@@ -99,6 +94,11 @@
                 app:key="@string/settings_advanced_unifiedpush_key"
                 app:title="@string/settings_advanced_unifiedpush_title"
                 app:enabled="true"/>
+        <Preference
+            app:key="@string/settings_advanced_custom_headers_key"
+            app:title="@string/settings_advanced_custom_headers_title"
+            app:summary="@string/settings_general_custom_headers_summary"
+            app:fragment="io.heckel.ntfy.ui.SettingsActivity$CustomHeaderSettingsFragment"/>
         <SwitchPreferenceCompat
                 app:key="@string/settings_advanced_record_logs_key"
                 app:title="@string/settings_advanced_record_logs_title"