diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
index 6d5c780202..effed19c59 100644
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
@@ -86,7 +86,7 @@ class RageShake @Inject constructor(private val activity: AppCompatActivity,
     }
 
     private fun openSettings() {
-        navigator.openSettings(activity, VectorSettingsActivity.EXTRA_DIRECT_ACCESS_DEVELOPER)
+        navigator.openSettings(activity, VectorSettingsActivity.EXTRA_DIRECT_ACCESS_ADVANCED_SETTINGS)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
index 810547f610..490805ea3c 100755
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
@@ -55,9 +55,9 @@ class VectorSettingsActivity : VectorBaseActivity(),
         if (isFirstCreation()) {
             // display the fragment
             when (intent.getIntExtra(EXTRA_DIRECT_ACCESS, EXTRA_DIRECT_ACCESS_ROOT)) {
-                EXTRA_DIRECT_ACCESS_DEVELOPER ->
-                    replaceFragment(R.id.vector_settings_page, VectorSettingsDeveloperModeFragment::class.java, null, FRAGMENT_TAG)
-                else                          ->
+                EXTRA_DIRECT_ACCESS_ADVANCED_SETTINGS ->
+                    replaceFragment(R.id.vector_settings_page, VectorSettingsAdvancedSettingsFragment::class.java, null, FRAGMENT_TAG)
+                else                                  ->
                     replaceFragment(R.id.vector_settings_page, VectorSettingsRootFragment::class.java, null, FRAGMENT_TAG)
             }
         }
@@ -122,7 +122,7 @@ class VectorSettingsActivity : VectorBaseActivity(),
         private const val EXTRA_DIRECT_ACCESS = "EXTRA_DIRECT_ACCESS"
 
         const val EXTRA_DIRECT_ACCESS_ROOT = 0
-        const val EXTRA_DIRECT_ACCESS_DEVELOPER = 1
+        const val EXTRA_DIRECT_ACCESS_ADVANCED_SETTINGS = 1
 
         private const val FRAGMENT_TAG = "VectorSettingsPreferencesFragment"
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsDeveloperModeFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsDeveloperModeFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt
index f700759fd0..43adcf6335 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsDeveloperModeFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt
@@ -23,10 +23,10 @@ import im.vector.riotx.core.platform.VectorBaseActivity
 import im.vector.riotx.core.preference.VectorSwitchPreference
 import im.vector.riotx.features.rageshake.RageShake
 
-class VectorSettingsDeveloperModeFragment : VectorSettingsBaseFragment() {
+class VectorSettingsAdvancedSettingsFragment : VectorSettingsBaseFragment() {
 
-    override var titleRes = R.string.settings_developer_mode
-    override val preferenceXmlRes = R.xml.vector_settings_developer_mode
+    override var titleRes = R.string.settings_advanced_settings
+    override val preferenceXmlRes = R.xml.vector_settings_advanced_settings
 
     private var rageshake: RageShake? = null
 
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 1134b4be0f..5b2b2e99e8 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -7,6 +7,7 @@
 
 
     <string name="settings_show_devices_list">See all my devices</string>
+    <string name="settings_advanced_settings">Advanced settings</string>
     <string name="settings_developer_mode">Developer mode</string>
     <string name="settings_developer_mode_summary">The developer mode activates hidden features and may also make the application less stable. For developers only!</string>
     <string name="settings_rageshake">Rageshake</string>
diff --git a/vector/src/main/res/xml/vector_settings_developer_mode.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
similarity index 73%
rename from vector/src/main/res/xml/vector_settings_developer_mode.xml
rename to vector/src/main/res/xml/vector_settings_advanced_settings.xml
index b7b800052f..93ff104a81 100644
--- a/vector/src/main/res/xml/vector_settings_developer_mode.xml
+++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
@@ -2,25 +2,6 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
-        android:key="SETTINGS_RAGE_SHAKE_CATEGORY_KEY"
-        android:title="@string/settings_rageshake">
-
-        <im.vector.riotx.core.preference.VectorSwitchPreference
-            android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
-            android:title="@string/send_bug_report_rage_shake" />
-
-        <androidx.preference.SeekBarPreference
-            android:defaultValue="13"
-            android:dependency="SETTINGS_USE_RAGE_SHAKE_KEY"
-            android:key="SETTINGS_RAGE_SHAKE_DETECTION_THRESHOLD_KEY"
-            android:max="15"
-            android:summary="@string/settings_rageshake_detection_threshold_summary"
-            android:title="@string/settings_rageshake_detection_threshold"
-            app:min="11" />
-
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_developer_mode">
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
@@ -44,21 +25,38 @@
 
         <!-- TODO Display unsupported events -->
 
-        <im.vector.riotx.core.preference.VectorPreferenceCategory
-            android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
-            android:title="@string/settings_notifications">
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-            <im.vector.riotx.core.preference.VectorPreference
-                android:persistent="false"
-                android:title="@string/settings_notifications_targets"
-                app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" />
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_RAGE_SHAKE_CATEGORY_KEY"
+        android:title="@string/settings_rageshake">
 
-            <im.vector.riotx.core.preference.VectorPreference
-                android:persistent="false"
-                android:title="@string/settings_push_rules"
-                app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" />
+        <im.vector.riotx.core.preference.VectorSwitchPreference
+            android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
+            android:title="@string/send_bug_report_rage_shake" />
 
-        </im.vector.riotx.core.preference.VectorPreferenceCategory>
+        <androidx.preference.SeekBarPreference
+            android:defaultValue="13"
+            android:dependency="SETTINGS_USE_RAGE_SHAKE_KEY"
+            android:key="SETTINGS_RAGE_SHAKE_DETECTION_THRESHOLD_KEY"
+            android:max="15"
+            android:summary="@string/settings_rageshake_detection_threshold_summary"
+            android:title="@string/settings_rageshake_detection_threshold"
+            app:min="11" />
+
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+
+    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_notifications">
+
+        <im.vector.riotx.core.preference.VectorPreference
+            android:persistent="false"
+            android:title="@string/settings_notifications_targets"
+            app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" />
+
+        <im.vector.riotx.core.preference.VectorPreference
+            android:persistent="false"
+            android:title="@string/settings_push_rules"
+            app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" />
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 0a59570050..f2e13d8111 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -47,8 +47,8 @@
 
     <im.vector.riotx.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_general"
-        android:title="@string/settings_developer_mode"
-        app:fragment="im.vector.riotx.features.settings.VectorSettingsDeveloperModeFragment" />
+        android:title="@string/settings_advanced_settings"
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedSettingsFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_help_about"