diff --git a/app/src/main/java/com/m57/hermescontrol/Navigation.kt b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
index 9641c574..75470e23 100644
--- a/app/src/main/java/com/m57/hermescontrol/Navigation.kt
+++ b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
@@ -330,12 +330,6 @@ fun MainNavigation() {
 
                         entry<ChatScreen> {
                             ChatScreenContent(
-                                onNavigateToSettings = {
-                                    // B7 (Jun 18 2026): route through
-                                    // NavigationController to prevent
-                                    // stacking duplicate entries.
-                                    NavigationController.navigateTo(SettingsScreen)
-                                },
                                 onOpenDrawer = { openDrawer() },
                             )
                         }
diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
index 49bb291a..587d2478 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
@@ -50,7 +50,6 @@ import androidx.compose.material.icons.filled.History
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.Stop
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Card
@@ -99,7 +98,6 @@ import com.m57.hermescontrol.ui.common.HermesScaffold
 
 @Composable
 fun ChatScreen(
-    onNavigateToSettings: () -> Unit,
     modifier: Modifier = Modifier,
     onOpenDrawer: (() -> Unit)? = null,
     viewModel: ChatViewModel = viewModel(),
@@ -330,14 +328,6 @@ fun ChatScreen(
                         if (state.isSearchActive) "Close search" else "Search",
                 )
             }
-
-            // Settings
-            IconButton(onClick = onNavigateToSettings) {
-                Icon(
-                    imageVector = Icons.Filled.Settings,
-                    contentDescription = "Settings",
-                )
-            }
         },
     ) { _ ->
         Column(