diff --git a/src/i18n/locales/en/marketplace.json b/src/i18n/locales/en/marketplace.json
index 17ae20078a..a8ffcaa8f6 100644
--- a/src/i18n/locales/en/marketplace.json
+++ b/src/i18n/locales/en/marketplace.json
@@ -46,7 +46,6 @@
 		},
 		"title": "Marketplace"
 	},
-	"done": "Done",
 	"tabs": {
 		"installed": "Installed",
 		"browse": "Browse",
diff --git a/webview-ui/src/components/history/HistoryView.tsx b/webview-ui/src/components/history/HistoryView.tsx
index 6a8a7686d6..d08041eda0 100644
--- a/webview-ui/src/components/history/HistoryView.tsx
+++ b/webview-ui/src/components/history/HistoryView.tsx
@@ -84,16 +84,13 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 			<TabHeader className="flex flex-col gap-2">
 				<div className="flex items-center justify-between gap-2">
 					<div className="flex items-center gap-2">
-						<StandardTooltip content={t("history:done")}>
-							<Button
-								variant="ghost"
-								className="px-1.5 -ml-2"
-								onClick={onDone}
-								aria-label={t("history:done")}>
-								<ArrowLeft />
-								<span className="sr-only">{t("history:done")}</span>
-							</Button>
-						</StandardTooltip>
+						<Button
+							variant="ghost"
+							className="px-1.5 -ml-2"
+							onClick={onDone}
+							aria-label={t("settings:back")}>
+							<ArrowLeft />
+						</Button>
 						<h3 className="text-vscode-foreground m-0">{t("history:history")}</h3>
 					</div>
 					<StandardTooltip
diff --git a/webview-ui/src/components/marketplace/MarketplaceView.tsx b/webview-ui/src/components/marketplace/MarketplaceView.tsx
index 2aff6fc1e3..312736a8df 100644
--- a/webview-ui/src/components/marketplace/MarketplaceView.tsx
+++ b/webview-ui/src/components/marketplace/MarketplaceView.tsx
@@ -1,6 +1,5 @@
 import { useState, useEffect, useMemo, useContext } from "react"
 import { Button } from "@/components/ui/button"
-import { StandardTooltip } from "@/components/ui"
 import { ArrowLeft } from "lucide-react"
 import { Tab, TabContent, TabHeader } from "../common/Tab"
 import { MarketplaceViewStateManager } from "./MarketplaceViewStateManager"
@@ -103,16 +102,14 @@ export function MarketplaceView({ stateManager, onDone, targetTab }: Marketplace
 				<TabHeader className="flex flex-col sticky top-0 z-10 px-3 py-2">
 					<div className="flex items-center justify-between gap-2 px-2">
 						<div className="flex items-center gap-2">
-							<StandardTooltip content={t("marketplace:done")}>
-								<Button
-									variant="ghost"
-									className="px-1.5 -ml-2"
-									onClick={() => onDone?.()}
-									aria-label={t("marketplace:done")}>
-									<ArrowLeft />
-									<span className="sr-only">{t("marketplace:done")}</span>
-								</Button>
-							</StandardTooltip>
+							<Button
+								variant="ghost"
+								className="px-1.5 -ml-2"
+								onClick={() => onDone?.()}
+								aria-label={t("settings:back")}>
+								<ArrowLeft />
+								<span className="sr-only">{t("marketplace:done")}</span>
+							</Button>
 							<h3 className="font-bold m-0">{t("marketplace:title")}</h3>
 						</div>
 					</div>
diff --git a/webview-ui/src/components/settings/SettingsSearchInput.tsx b/webview-ui/src/components/settings/SettingsSearchInput.tsx
index ed30c362a8..8ed20fb497 100644
--- a/webview-ui/src/components/settings/SettingsSearchInput.tsx
+++ b/webview-ui/src/components/settings/SettingsSearchInput.tsx
@@ -38,17 +38,17 @@ export function SettingsSearchInput({
 				onKeyDown={onKeyDown}
 				placeholder={t("settings:search.placeholder")}
 				className={cn(
-					"pl-6 w-[0px] border-none focus:border-vscode-input-border focus:pl-8 focus:min-w-[110px] focus:w-full",
-					value && "pr-4 pl-8 min-w-[108px]",
+					"pl-6 focus:pl-8 w-[0px] border-none focus:border-vscode-input-border focus:min-w-[90px] focus:w-full",
+					value && "pl-8 pr-8 min-w-[50px] w-full",
 				)}
 			/>
 			{value && (
 				<button
 					type="button"
 					onClick={() => onChange("")}
-					className="absolute cursor-pointer right-2.5 top-1/2 -translate-y-1/2 size-4 text-vscode-descriptionForeground hover:text-vscode-foreground focus:outline-none"
+					className="absolute cursor-pointer right-2 top-1/2 -translate-y-1/2 size-4 text-vscode-descriptionForeground hover:text-vscode-foreground focus:outline-none"
 					aria-label="Clear search">
-					<X className="size-4" />
+					<X className="size-3" />
 				</button>
 			)}
 		</div>
diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx
index ded37de756..a47443757d 100644
--- a/webview-ui/src/components/settings/SettingsView.tsx
+++ b/webview-ui/src/components/settings/SettingsView.tsx
@@ -671,7 +671,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 	return (
 		<Tab>
 			<TabHeader className="flex justify-between items-center gap-2">
-				<div className="flex items-center gap-2 grow truncate">
+				<div className="flex items-center gap-2 grow">
 					<StandardTooltip content={t("settings:header.doneButtonTooltip")}>
 						<Button variant="ghost" className="px-1.5 -ml-2" onClick={() => checkUnsaveChanges(onDone)}>
 							<ArrowLeft />
diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json
index a78775eee1..f08730f172 100644
--- a/webview-ui/src/i18n/locales/ca/settings.json
+++ b/webview-ui/src/i18n/locales/ca/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Torna a la vista de tasques",
+	"search": {
+		"placeholder": "Troba un ajust...",
+		"noResults": "No s'han trobat resultats per \"{{query}}\""
+	},
 	"common": {
 		"save": "Desar",
 		"done": "Fet",
diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json
index 276fda10c2..2d9548a702 100644
--- a/webview-ui/src/i18n/locales/de/settings.json
+++ b/webview-ui/src/i18n/locales/de/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Zur Aufgabenansicht zurück",
+	"search": {
+		"placeholder": "Einstellung finden...",
+		"noResults": "Keine Treffer für \"{{query}}\""
+	},
 	"common": {
 		"save": "Speichern",
 		"done": "Fertig",
diff --git a/webview-ui/src/i18n/locales/en/history.json b/webview-ui/src/i18n/locales/en/history.json
index 608be93140..923f2901b0 100644
--- a/webview-ui/src/i18n/locales/en/history.json
+++ b/webview-ui/src/i18n/locales/en/history.json
@@ -3,7 +3,6 @@
 	"history": "History",
 	"exitSelectionMode": "Exit Selection Mode",
 	"enterSelectionMode": "Enter Selection Mode",
-	"done": "Done",
 	"searchPlaceholder": "Fuzzy search history...",
 	"newest": "Newest",
 	"oldest": "Oldest",
diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json
index 947123b1c4..9c3414c422 100644
--- a/webview-ui/src/i18n/locales/en/settings.json
+++ b/webview-ui/src/i18n/locales/en/settings.json
@@ -1,11 +1,11 @@
 {
+	"back": "Back to tasks view",
 	"search": {
 		"placeholder": "Find setting...",
 		"noResults": "No results found for \"{{query}}\""
 	},
 	"common": {
 		"save": "Save",
-		"done": "Done",
 		"cancel": "Cancel",
 		"reset": "Reset",
 		"select": "Select",
@@ -16,7 +16,7 @@
 		"title": "Settings",
 		"saveButtonTooltip": "Save changes",
 		"nothingChangedTooltip": "Nothing changed",
-		"doneButtonTooltip": "Discard unsaved changes and close settings panel"
+		"doneButtonTooltip": "Discard unsaved changes and go back to tasks view"
 	},
 	"unsavedChangesDialog": {
 		"title": "Unsaved Changes",
diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json
index 9102adf812..832af471cc 100644
--- a/webview-ui/src/i18n/locales/es/settings.json
+++ b/webview-ui/src/i18n/locales/es/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Volver a la vista de tareas",
+	"search": {
+		"placeholder": "Buscar ajuste...",
+		"noResults": "No se encontraron resultados para \"{{query}}\""
+	},
 	"common": {
 		"save": "Guardar",
 		"done": "Hecho",
diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json
index 0a7746a579..7f965e2397 100644
--- a/webview-ui/src/i18n/locales/fr/settings.json
+++ b/webview-ui/src/i18n/locales/fr/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Retour à la vue des tâches",
+	"search": {
+		"placeholder": "Trouver un réglage...",
+		"noResults": "Aucun résultat pour \"{{query}}\""
+	},
 	"common": {
 		"save": "Enregistrer",
 		"done": "Terminé",
diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json
index 1003c5ad48..084f9a8991 100644
--- a/webview-ui/src/i18n/locales/hi/settings.json
+++ b/webview-ui/src/i18n/locales/hi/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "टास्क व्यू पर वापस जाओ",
+	"search": {
+		"placeholder": "सेटिंग खोजें...",
+		"noResults": "\"{{query}}\" के लिए कोई परिणाम नहीं मिला"
+	},
 	"common": {
 		"save": "सहेजें",
 		"done": "पूर्ण",
diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json
index 2790c92222..8738c48bdc 100644
--- a/webview-ui/src/i18n/locales/id/settings.json
+++ b/webview-ui/src/i18n/locales/id/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Kembali ke tampilan tugas",
+	"search": {
+		"placeholder": "Cari pengaturan...",
+		"noResults": "Tidak ada hasil untuk \"{{query}}\""
+	},
 	"common": {
 		"save": "Simpan",
 		"done": "Selesai",
diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json
index 315ad3f664..fa72f56b60 100644
--- a/webview-ui/src/i18n/locales/it/settings.json
+++ b/webview-ui/src/i18n/locales/it/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Torna alla vista attività",
+	"search": {
+		"placeholder": "Trova impostazione...",
+		"noResults": "Nessun risultato per \"{{query}}\""
+	},
 	"common": {
 		"save": "Salva",
 		"done": "Fatto",
diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json
index a72baa5674..c97e551268 100644
--- a/webview-ui/src/i18n/locales/ja/settings.json
+++ b/webview-ui/src/i18n/locales/ja/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "タスクビューに戻る",
+	"search": {
+		"placeholder": "設定を検索...",
+		"noResults": "\"{{query}}\" の結果はありません"
+	},
 	"common": {
 		"save": "保存",
 		"done": "完了",
diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json
index 47278eec7f..a6d1c15ba0 100644
--- a/webview-ui/src/i18n/locales/ko/settings.json
+++ b/webview-ui/src/i18n/locales/ko/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "작업 보기로 돌아가기",
+	"search": {
+		"placeholder": "설정 찾기...",
+		"noResults": "\"{{query}}\"에 대한 결과가 없습니다"
+	},
 	"common": {
 		"save": "저장",
 		"done": "완료",
diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json
index 569099cddb..2010f7a590 100644
--- a/webview-ui/src/i18n/locales/nl/settings.json
+++ b/webview-ui/src/i18n/locales/nl/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Terug naar takenoverzicht",
+	"search": {
+		"placeholder": "Instelling zoeken...",
+		"noResults": "Geen resultaten voor \"{{query}}\""
+	},
 	"common": {
 		"save": "Opslaan",
 		"done": "Gereed",
diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json
index 3907ac765d..dc1e11756c 100644
--- a/webview-ui/src/i18n/locales/pl/settings.json
+++ b/webview-ui/src/i18n/locales/pl/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Wróć do widoku zadań",
+	"search": {
+		"placeholder": "Znajdź ustawienie...",
+		"noResults": "Brak wyników dla \"{{query}}\""
+	},
 	"common": {
 		"save": "Zapisz",
 		"done": "Gotowe",
diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json
index 1b5cc8fcf3..143b7eb720 100644
--- a/webview-ui/src/i18n/locales/pt-BR/settings.json
+++ b/webview-ui/src/i18n/locales/pt-BR/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Voltar para a visualização de tarefas",
+	"search": {
+		"placeholder": "Encontrar configuração...",
+		"noResults": "Nenhum resultado para \"{{query}}\""
+	},
 	"common": {
 		"save": "Salvar",
 		"done": "Concluído",
diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json
index a30fed3395..cff93a860f 100644
--- a/webview-ui/src/i18n/locales/ru/settings.json
+++ b/webview-ui/src/i18n/locales/ru/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Назад к списку задач",
+	"search": {
+		"placeholder": "Найти настройку...",
+		"noResults": "Нет результатов для \"{{query}}\""
+	},
 	"common": {
 		"save": "Сохранить",
 		"done": "Готово",
diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json
index 951bc29183..1144d101a8 100644
--- a/webview-ui/src/i18n/locales/tr/settings.json
+++ b/webview-ui/src/i18n/locales/tr/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Görev görünümüne dön",
+	"search": {
+		"placeholder": "Ayar bul...",
+		"noResults": "\"{{query}}\" için sonuç yok"
+	},
 	"common": {
 		"save": "Kaydet",
 		"done": "Tamamlandı",
diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json
index 4468b307f4..93a0486d74 100644
--- a/webview-ui/src/i18n/locales/vi/settings.json
+++ b/webview-ui/src/i18n/locales/vi/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "Quay lại chế độ xem nhiệm vụ",
+	"search": {
+		"placeholder": "Tìm cài đặt...",
+		"noResults": "Không tìm thấy kết quả cho \"{{query}}\""
+	},
 	"common": {
 		"save": "Lưu",
 		"done": "Hoàn thành",
diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json
index b2952120b4..88942659a4 100644
--- a/webview-ui/src/i18n/locales/zh-CN/settings.json
+++ b/webview-ui/src/i18n/locales/zh-CN/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "返回任务视图",
+	"search": {
+		"placeholder": "查找设置...",
+		"noResults": "未找到与 \"{{query}}\" 匹配的结果"
+	},
 	"common": {
 		"save": "保存",
 		"done": "完成",
diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json
index 01ca8e8d5e..6fca989df1 100644
--- a/webview-ui/src/i18n/locales/zh-TW/settings.json
+++ b/webview-ui/src/i18n/locales/zh-TW/settings.json
@@ -1,4 +1,9 @@
 {
+	"back": "返回工作檢視",
+	"search": {
+		"placeholder": "搜尋設定...",
+		"noResults": "沒有找到與 \"{{query}}\" 相符的結果"
+	},
 	"common": {
 		"save": "儲存",
 		"done": "完成",