diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index e7a030f1..39cbf866 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -87,6 +87,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
       ),
     );
     return [
+      SettingsCategory(
+        icon: Icons.badge_outlined,
+        title: l10n.settings_nodeSettings,
+        builder: _identityPane,
+      ),
       SettingsCategory(
         icon: Icons.settings_input_antenna,
         title: l10n.settings_radioSettings,
@@ -99,35 +104,36 @@ class _SettingsScreenState extends State<SettingsScreen> {
         subtitle: l10n.radioStats_settingsSubtitle,
         builder: _radioStatsPane,
       ),
-      SettingsCategory(
-        icon: Icons.badge_outlined,
-        title: l10n.settings_nodeSettings,
-        builder: _identityPane,
-      ),
       SettingsCategory(
         icon: Icons.shield_outlined,
         title: l10n.settings_privacy,
         subtitle: l10n.settings_privacySubtitle,
         builder: _privacyPane,
       ),
-      SettingsCategory(
-        icon: Icons.block,
-        title: l10n.block_settingsTitle,
-        subtitle: l10n.block_settingsSubtitle,
-        builder: _blockedPane,
-      ),
       SettingsCategory(
         icon: Icons.contacts_outlined,
         title: l10n.contacts_title,
         subtitle: l10n.settings_contactSettingsSubtitle,
         builder: _contactsPane,
       ),
+      SettingsCategory(
+        icon: Icons.block,
+        title: l10n.block_settingsTitle,
+        subtitle: l10n.block_settingsSubtitle,
+        builder: _blockedPane,
+      ),
       SettingsCategory(
         icon: Icons.sms_outlined,
         title: l10n.settings_messageSettings,
         subtitle: l10n.settings_messageSettingsSubtitle,
         builder: _messageSettingsPane,
       ),
+      SettingsCategory(
+        icon: Icons.tune,
+        title: l10n.settings_appSettings,
+        subtitle: l10n.settings_appSettingsSubtitle,
+        builder: _appPane,
+      ),
       SettingsCategory(
         icon: Icons.info_outline,
         title: l10n.settings_deviceInfo,
@@ -140,12 +146,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
           subtitle: 'WiFi · MQTT brokers · display',
           builder: _observerPane,
         ),
-      SettingsCategory(
-        icon: Icons.tune,
-        title: l10n.settings_appSettings,
-        subtitle: l10n.settings_appSettingsSubtitle,
-        builder: _appPane,
-      ),
       SettingsCategory(
         icon: Icons.bolt_outlined,
         title: l10n.settings_actions,