diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart
index c302fb3..efd7340 100644
--- a/lib/screens/channels_screen.dart
+++ b/lib/screens/channels_screen.dart
@@ -121,24 +121,44 @@ class _ChannelsScreenState extends State<ChannelsScreen>
           centerTitle: true,
           automaticallyImplyLeading: false,
           actions: [
-            if (_communities.isNotEmpty)
-              IconButton(
-                icon: const Icon(Icons.groups),
-                tooltip: context.l10n.community_manageCommunities,
-                onPressed: () => _showManageCommunitiesDialog(context),
-              ),
-            IconButton(
-              icon: const Icon(Icons.bluetooth_disabled),
-              tooltip: context.l10n.common_disconnect,
-              onPressed: () => _disconnect(context),
-            ),
-            IconButton(
-              icon: const Icon(Icons.tune),
-              tooltip: context.l10n.common_settings,
-              onPressed: () => Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => const SettingsScreen()),
-              ),
+            PopupMenuButton(
+              itemBuilder: (context) => [
+                PopupMenuItem(
+                  child: Row(
+                    children: [
+                      const Icon(Icons.logout, color: Colors.red),
+                      const SizedBox(width: 8),
+                      Text(context.l10n.common_disconnect),
+                    ],
+                  ),
+                  onTap: () => _disconnect(context),
+                ),
+                if (_communities.isNotEmpty)
+                  PopupMenuItem(
+                    child: Row(
+                      children: [
+                        const Icon(Icons.groups),
+                        const SizedBox(width: 8),
+                        Text(context.l10n.community_manageCommunities),
+                      ],
+                    ),
+                    onTap: () => _showManageCommunitiesDialog(context),
+                  ),
+                PopupMenuItem(
+                  child: Row(
+                    children: [
+                      const Icon(Icons.settings),
+                      const SizedBox(width: 8),
+                      Text(context.l10n.settings_title),
+                    ],
+                  ),
+                  onTap: () => Navigator.push(
+                    context,
+                    MaterialPageRoute(builder: (context) => const SettingsScreen()),
+                  ),
+                ),
+              ],
+              icon: const Icon(Icons.more_vert),
             ),
           ],
         ),
diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart
index 74e5cf9..edef811 100644
--- a/lib/screens/map_screen.dart
+++ b/lib/screens/map_screen.dart
@@ -245,20 +245,33 @@ class _MapScreenState extends State<MapScreen> {
               centerTitle: true,
               automaticallyImplyLeading: false,
               actions: [
-                IconButton(
-                  icon: const Icon(Icons.bluetooth_disabled),
-                  tooltip: context.l10n.common_disconnect,
-                  onPressed: () => _disconnect(context, connector),
-                ),
-                IconButton(
-                  icon: const Icon(Icons.tune),
-                  tooltip: context.l10n.common_settings,
-                  onPressed: () => Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => const SettingsScreen(),
+                PopupMenuButton(
+                  itemBuilder: (context) => [
+                    PopupMenuItem(
+                      child: Row(
+                        children: [
+                          const Icon(Icons.logout, color: Colors.red),
+                          const SizedBox(width: 8),
+                          Text(context.l10n.common_disconnect),
+                        ],
+                      ),
+                      onTap: () => _disconnect(context, connector),
                     ),
-                  ),
+                    PopupMenuItem(
+                      child: Row(
+                        children: [
+                          const Icon(Icons.settings),
+                          const SizedBox(width: 8),
+                          Text(context.l10n.settings_title),
+                        ],
+                      ),
+                      onTap: () => Navigator.push(
+                        context,
+                        MaterialPageRoute(builder: (context) => const SettingsScreen()),
+                      ),
+                    ),
+                  ],
+                  icon: const Icon(Icons.more_vert),
                 ),
               ],
             ),