diff --git a/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
index e1cc43ab08..2b9090e237 100644
--- a/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
@@ -78,23 +78,12 @@ exports[`Initial Theme Selection > should use the theme from settings even if te
 exports[`ThemeDialog Snapshots > should render correctly in scope selector mode 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
 │                                                                                                  │
-│ > Select Theme                               Preview                                             │
-│ ▲                                            ┌─────────────────────────────────────────────────┐ │
-│ ●  1. ANSI Dark (Matches terminal)           │                                                 │ │
-│    2. Atom One Dark                          │ 1 # function                                    │ │
-│    3. Ayu Dark                               │ 2 def fibonacci(n):                             │ │
-│    4. Default Dark                           │ 3     a, b = 0, 1                               │ │
-│    5. Dracula Dark                           │ 4     for _ in range(n):                        │ │
-│    6. GitHub Dark                            │ 5         a, b = b, a + b                       │ │
-│    7. Holiday Dark                           │ 6     return a                                  │ │
-│    8. Shades Of Purple Dark                  │                                                 │ │
-│    9. Solarized Dark                         │ 1 - print("Hello, " + name)                     │ │
-│   10. Tokyo Night Dark                       │ 1 + print(f"Hello, {name}!")                    │ │
-│   11. ANSI Light                             │                                                 │ │
-│   12. Ayu Light                              └─────────────────────────────────────────────────┘ │
-│ ▼                                                                                                │
+│ > Apply To                                                                                       │
+│ ● 1. User Settings                                                                               │
+│   2. Workspace Settings                                                                          │
+│   3. System Settings                                                                             │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope, Esc to close)                                      │
+│ (Use Enter to apply scope, Tab to select theme, Esc to close)                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
 "
diff --git a/packages/cli/src/ui/components/messages/__snapshots__/ShellToolMessage.test.tsx.snap b/packages/cli/src/ui/components/messages/__snapshots__/ShellToolMessage.test.tsx.snap
index 38700b92de..d88b152a48 100644
--- a/packages/cli/src/ui/components/messages/__snapshots__/ShellToolMessage.test.tsx.snap
+++ b/packages/cli/src/ui/components/messages/__snapshots__/ShellToolMessage.test.tsx.snap
@@ -18,10 +18,7 @@ exports[`<ShellToolMessage /> > Height Constraints > defaults to ACTIVE_SHELL_MA
 `;
 
 exports[`<ShellToolMessage /> > Height Constraints > fully expands in alternate buffer mode when constrainHeight is false and isExpandable is true 1`] = `
-"╭──────────────────────────────────────────────────────────────────────────────╮
-│ ✓  Shell Command A shell command                                             │
-│                                                                              │
-│ Line 1                                                                       │
+"│ Line 1                                                                       │
 │ Line 2                                                                       │
 │ Line 3                                                                       │
 │ Line 4                                                                       │
@@ -276,7 +273,7 @@ exports[`<ShellToolMessage /> > Height Constraints > uses full availableTerminal
 
 exports[`<ShellToolMessage /> > Snapshots > renders in Alternate Buffer mode while focused 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────╮
-│ ⊶  Shell Command A shell command                      (Shift+Tab to unfocus) │
+│ ⊶  Shell Command A shell command                                             │
 │                                                                              │
 │ Test result                                                                  │
 "