diff --git a/packages/app/e2e/regression/workspaces.spec.ts b/packages/app/e2e/regression/workspaces.spec.ts
index d0c90767b62..80fbd5b7aed 100644
--- a/packages/app/e2e/regression/workspaces.spec.ts
+++ b/packages/app/e2e/regression/workspaces.spec.ts
@@ -96,6 +96,22 @@ test("lists and manually deletes workspaces from settings", async ({ page }) =>
     sessions: [],
     pageMessages: () => ({ items: [] }),
   })
+  let releaseSessions = () => {}
+  const sessionsReady = new Promise<void>((resolve) => {
+    releaseSessions = resolve
+  })
+  await page.route("**/session?**", async (route) => {
+    const url = new URL(route.request().url())
+    if (route.request().method() !== "GET" || url.pathname !== "/session" || url.searchParams.get("limit") !== "1000")
+      return route.fallback()
+    await sessionsReady
+    await route.fulfill({
+      status: 200,
+      contentType: "application/json",
+      headers: { "access-control-allow-origin": "*" },
+      body: "[]",
+    })
+  })
   await page.route("**/experimental/worktree**", async (route) => {
     if (route.request().method() === "OPTIONS") {
       await route.fulfill({
@@ -125,6 +141,9 @@ test("lists and manually deletes workspaces from settings", async ({ page }) =>
   await page.goto(`/new-session?draftId=${draftID}`)
   await transport.waitForConnection()
   await expectAppVisible(page.locator('[data-component="prompt-input"]'))
+
+  const app = page.locator('[data-component="session-new-design"]')
+  const appNode = await app.elementHandle()
   await page.getByRole("button", { name: /local|new workspace/i }).click()
   const workspacesTrigger = page.getByRole("menuitem", { name: /Workspace/ })
   if (await workspacesTrigger.isVisible()) await workspacesTrigger.hover()
@@ -132,6 +151,8 @@ test("lists and manually deletes workspaces from settings", async ({ page }) =>
 
   const settings = page.locator(".settings-v2-dialog")
   await expect(settings.getByRole("tab", { name: "Workspaces" })).toHaveAttribute("data-selected")
+  expect(await appNode?.evaluate((node) => node.isConnected)).toBe(true)
+  releaseSessions()
   await expect(settings.getByText(cleanWorkspace, { exact: true })).toBeVisible()
 
   await settings.getByRole("button", { name: 'Delete workspace "feature-clean"?' }).click()
diff --git a/packages/app/src/components/settings-v2/dialog-settings-v2.tsx b/packages/app/src/components/settings-v2/dialog-settings-v2.tsx
index 1e0443d26e6..df7c37b6845 100644
--- a/packages/app/src/components/settings-v2/dialog-settings-v2.tsx
+++ b/packages/app/src/components/settings-v2/dialog-settings-v2.tsx
@@ -1,7 +1,7 @@
 import { Component, createMemo, createSignal, startTransition } from "solid-js"
 import { Dialog } from "@opencode-ai/ui/v2/dialog-v2"
 import { TabsV2 } from "@opencode-ai/ui/v2/tabs-v2"
-import { Icon } from "@opencode-ai/ui/v2/icon"
+import { Icon } from "@opencode-ai/ui/icon"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { SettingsGeneralV2 } from "./general"
@@ -56,11 +56,11 @@ export const DialogSettings: Component<{
                   <TabsV2.SectionTitle>{language.t("settings.section.desktop")}</TabsV2.SectionTitle>
                   <div class="flex flex-col gap-1.5 w-full">
                     <TabsV2.Trigger value="general">
-                      <Icon name="sliders" />
+                      <Icon name="sliders" size="small" />
                       {language.t("settings.tab.general")}
                     </TabsV2.Trigger>
                     <TabsV2.Trigger value="shortcuts">
-                      <Icon name="keyboard" />
+                      <Icon name="keyboard" size="small" />
                       {language.t("settings.tab.shortcuts")}
                     </TabsV2.Trigger>
                   </div>
@@ -70,19 +70,19 @@ export const DialogSettings: Component<{
                   <TabsV2.SectionTitle>{language.t("settings.section.server")}</TabsV2.SectionTitle>
                   <div class="flex flex-col gap-1.5 w-full">
                     <TabsV2.Trigger value="workspaces">
-                      <Icon name="workspace-isolated" />
+                      <Icon name="workspace-isolated" size="small" />
                       {language.t("settings.tab.workspaces")}
                     </TabsV2.Trigger>
                     <TabsV2.Trigger value="servers">
-                      <Icon name="server" />
+                      <Icon name="server" size="small" />
                       {language.t("status.popover.tab.servers")}
                     </TabsV2.Trigger>
                     <TabsV2.Trigger value="providers">
-                      <Icon name="providers" />
+                      <Icon name="providers" size="small" />
                       {language.t("settings.providers.title")}
                     </TabsV2.Trigger>
                     <TabsV2.Trigger value="models">
-                      <Icon name="models" />
+                      <Icon name="models" size="small" />
                       {language.t("settings.models.title")}
                     </TabsV2.Trigger>
                   </div>
diff --git a/packages/app/src/components/settings-v2/workspaces.tsx b/packages/app/src/components/settings-v2/workspaces.tsx
index cc974bdd68b..3202fe5a024 100644
--- a/packages/app/src/components/settings-v2/workspaces.tsx
+++ b/packages/app/src/components/settings-v2/workspaces.tsx
@@ -88,7 +88,10 @@ export const SettingsWorkspacesV2: Component<{ activeDirectory?: string }> = (pr
     queryFn: () => loadSessions(),
     refetchOnMount: "always",
   }))
-  const workspaceSessions = (workspace: Workspace) => sessionsForWorkspace(sessionQuery.data ?? [], workspace.directory)
+  const workspaceSessions = (workspace: Workspace) => {
+    if (!sessionQuery.isSuccess) return []
+    return sessionsForWorkspace(sessionQuery.data ?? [], workspace.directory)
+  }
   const sessionCount = (workspace: Workspace) => {
     if (sessionQuery.isPending) return language.t("session.messages.loading")
     if (sessionQuery.isError) return language.t("common.requestFailed")
diff --git a/packages/ui/src/components/icon.tsx b/packages/ui/src/components/icon.tsx
index a16fad0c32a..babca7c864e 100644
--- a/packages/ui/src/components/icon.tsx
+++ b/packages/ui/src/components/icon.tsx
@@ -10,6 +10,7 @@ const icons = {
   prompt: `<path d="M14.5841 12.0807H17.9193V2.91406H5.6276V6.2474M14.5859 6.2474H2.08594V15.4141H5.0026V17.4974L8.7526 15.4141H14.5859V6.2474Z" stroke="currentColor" stroke-linecap="square"/>`,
   brain: `<path d="M13.332 8.7487C11.4911 8.7487 9.9987 7.25631 9.9987 5.41536M6.66536 11.2487C8.50631 11.2487 9.9987 12.7411 9.9987 14.582M9.9987 2.78209L9.9987 17.0658M16.004 15.0475C17.1255 14.5876 17.9154 13.4849 17.9154 12.1978C17.9154 11.3363 17.5615 10.5575 16.9913 9.9987C17.5615 9.43991 17.9154 8.66108 17.9154 7.79962C17.9154 6.21199 16.7136 4.90504 15.1702 4.73878C14.7858 3.21216 13.4039 2.08203 11.758 2.08203C11.1171 2.08203 10.5162 2.25337 9.9987 2.55275C9.48117 2.25337 8.88032 2.08203 8.23944 2.08203C6.59353 2.08203 5.21157 3.21216 4.82722 4.73878C3.28377 4.90504 2.08203 6.21199 2.08203 7.79962C2.08203 8.66108 2.43585 9.43991 3.00609 9.9987C2.43585 10.5575 2.08203 11.3363 2.08203 12.1978C2.08203 13.4849 2.87191 14.5876 3.99339 15.0475C4.46688 16.7033 5.9917 17.9154 7.79962 17.9154C8.61335 17.9154 9.36972 17.6698 9.9987 17.2488C10.6277 17.6698 11.384 17.9154 12.1978 17.9154C14.0057 17.9154 15.5305 16.7033 16.004 15.0475Z" stroke="currentColor"/>`,
   fork: `<path d="M2.91602 7.91406L2.91602 2.91406H7.91602M12.0827 2.91406H17.0827L17.0827 7.91406M9.99935 9.9974L9.99935 17.0807M9.99935 9.9974L3.33268 3.33073M9.99935 9.9974L16.666 3.33073" stroke="currentColor" stroke-linecap="square"/>`,
+  "workspace-isolated": `<g transform="translate(2 2)"><path d="M10.5 10.5V5.5H5.5V10.5H10.5Z" fill="currentColor"/><rect x="2.5" y="2.5" width="11" height="11" stroke="currentColor"/></g>`,
   "bullet-list": `<path d="M9.58329 13.7497H17.0833M9.58329 6.24967H17.0833M6.24996 6.24967C6.24996 7.17015 5.50377 7.91634 4.58329 7.91634C3.66282 7.91634 2.91663 7.17015 2.91663 6.24967C2.91663 5.3292 3.66282 4.58301 4.58329 4.58301C5.50377 4.58301 6.24996 5.3292 6.24996 6.24967ZM6.24996 13.7497C6.24996 14.6701 5.50377 15.4163 4.58329 15.4163C3.66282 15.4163 2.91663 14.6701 2.91663 13.7497C2.91663 12.8292 3.66282 12.083 4.58329 12.083C5.50377 12.083 6.24996 12.8292 6.24996 13.7497Z" stroke="currentColor" stroke-linecap="square"/>`,
   "check-small": `<path d="M6.5 11.4412L8.97059 13.5L13.5 6.5" stroke="currentColor" stroke-linecap="square"/>`,
   "chevron-down": `<path d="M6.6665 8.33325L9.99984 11.6666L13.3332 8.33325" stroke="currentColor" stroke-linecap="square"/>`,