diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 676b87dfe8..a74d915da8 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -57,7 +57,6 @@ import { CheckpointWarning } from "./CheckpointWarning"
 import QueuedMessages from "./QueuedMessages"
 import { getLatestTodo } from "@roo/todo"
 import { QueuedMessage } from "@roo-code/types"
-import FilesChangedOverview from "../file-changes/FilesChangedOverview"
 
 export interface ChatViewProps {
 	isHidden: boolean
@@ -1833,10 +1832,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							<CheckpointWarning />
 						</div>
 					)}
-
-					<div className="px-3">
-						<FilesChangedOverview />
-					</div>
 				</>
 			) : (
 				<div className="flex-1 min-h-0 overflow-y-auto flex flex-col gap-4 relative">
diff --git a/webview-ui/src/components/chat/TaskHeader.tsx b/webview-ui/src/components/chat/TaskHeader.tsx
index 8fd06b168f..53cbd602b3 100644
--- a/webview-ui/src/components/chat/TaskHeader.tsx
+++ b/webview-ui/src/components/chat/TaskHeader.tsx
@@ -19,6 +19,7 @@ import { TaskActions } from "./TaskActions"
 import { ContextWindowProgress } from "./ContextWindowProgress"
 import { Mention } from "./Mention"
 import { TodoListDisplay } from "./TodoListDisplay"
+import FilesChangedOverview from "../file-changes/FilesChangedOverview"
 
 export interface TaskHeaderProps {
 	task: ClineMessage
@@ -285,6 +286,7 @@ const TaskHeader = ({
 				)}
 			</div>
 			<TodoListDisplay todos={todos ?? (task as any)?.tool?.todos ?? []} />
+			<FilesChangedOverview />
 		</div>
 	)
 }
diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx
index a8217d2e25..dae3c3a8bc 100644
--- a/webview-ui/src/components/settings/SettingsView.tsx
+++ b/webview-ui/src/components/settings/SettingsView.tsx
@@ -16,7 +16,6 @@ import {
 	GitBranch,
 	Bell,
 	Database,
-	Monitor,
 	SquareTerminal,
 	FlaskConical,
 	AlertTriangle,
@@ -60,7 +59,6 @@ import { BrowserSettings } from "./BrowserSettings"
 import { CheckpointSettings } from "./CheckpointSettings"
 import { NotificationSettings } from "./NotificationSettings"
 import { ContextManagementSettings } from "./ContextManagementSettings"
-import { UISettings } from "./UISettings"
 import { TerminalSettings } from "./TerminalSettings"
 import { ExperimentalSettings } from "./ExperimentalSettings"
 import { LanguageSettings } from "./LanguageSettings"
@@ -86,7 +84,6 @@ const sectionNames = [
 	"checkpoints",
 	"notifications",
 	"contextManagement",
-	"ui",
 	"terminal",
 	"prompts",
 	"experimental",
@@ -424,7 +421,6 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 			{ id: "checkpoints", icon: GitBranch },
 			{ id: "notifications", icon: Bell },
 			{ id: "contextManagement", icon: Database },
-			{ id: "ui", icon: Monitor },
 			{ id: "terminal", icon: SquareTerminal },
 			{ id: "prompts", icon: MessageSquare },
 			{ id: "experimental", icon: FlaskConical },
@@ -693,9 +689,6 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 						/>
 					)}
 
-					{/* UI Section */}
-					{activeTab === "ui" && <UISettings />}
-
 					{/* Terminal Section */}
 					{activeTab === "terminal" && (
 						<TerminalSettings