diff --git a/tools/server/webui/src/lib/components/app/chat/ChatScreen/ChatScreenHeader.svelte b/tools/server/webui/src/lib/components/app/chat/ChatScreen/ChatScreenHeader.svelte
index 874140feec..53ae5411be 100644
--- a/tools/server/webui/src/lib/components/app/chat/ChatScreen/ChatScreenHeader.svelte
+++ b/tools/server/webui/src/lib/components/app/chat/ChatScreen/ChatScreenHeader.svelte
@@ -3,6 +3,7 @@
 	import { DialogChatSettings } from '$lib/components/app';
 	import { Button } from '$lib/components/ui/button';
 	import { useSidebar } from '$lib/components/ui/sidebar';
+	import McpLogo from '../../misc/McpLogo.svelte';
 
 	const sidebar = useSidebar();
 
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatSettings/ChatSettings.svelte b/tools/server/webui/src/lib/components/app/chat/ChatSettings/ChatSettings.svelte
index 10583b6e21..f513b9e86d 100644
--- a/tools/server/webui/src/lib/components/app/chat/ChatSettings/ChatSettings.svelte
+++ b/tools/server/webui/src/lib/components/app/chat/ChatSettings/ChatSettings.svelte
@@ -9,15 +9,14 @@
 		Moon,
 		ChevronLeft,
 		ChevronRight,
-		Database,
-		Cable
+		Database
 	} from '@lucide/svelte';
 	import {
 		ChatSettingsFooter,
 		ChatSettingsImportExportTab,
-		ChatSettingsFields,
-		McpSettingsSection
+		ChatSettingsFields
 	} from '$lib/components/app';
+	import McpLogo from '$lib/components/app/misc/McpLogo.svelte';
 	import { ScrollArea } from '$lib/components/ui/scroll-area';
 	import { config, settingsStore } from '$lib/stores/settings.svelte';
 	import { setMode } from 'mode-watcher';
@@ -242,8 +241,13 @@
 			]
 		},
 		{
-			title: 'MCP Client',
-			icon: Cable,
+			title: 'Import/Export',
+			icon: Database,
+			fields: []
+		},
+		{
+			title: 'MCP',
+			icon: McpLogo,
 			fields: [
 				{
 					key: 'agenticMaxTurns',
@@ -262,11 +266,6 @@
 				}
 			]
 		},
-		{
-			title: 'Import/Export',
-			icon: Database,
-			fields: []
-		},
 		{
 			title: 'Developer',
 			icon: Code,
@@ -506,16 +505,6 @@
 
 				{#if currentSection.title === 'Import/Export'}
 					<ChatSettingsImportExportTab />
-				{:else if currentSection.title === 'MCP Client'}
-					<div class="space-y-6">
-						<McpSettingsSection {localConfig} onConfigChange={handleConfigChange} />
-						<ChatSettingsFields
-							fields={currentSection.fields}
-							{localConfig}
-							onConfigChange={handleConfigChange}
-							onThemeChange={handleThemeChange}
-						/>
-					</div>
 				{:else}
 					<div class="space-y-6">
 						<ChatSettingsFields