diff --git a/packages/app/src/components/dialog-edit-project.tsx b/packages/app/src/components/dialog-edit-project.tsx
index 8d389cef7c..5fa1f2ceeb 100644
--- a/packages/app/src/components/dialog-edit-project.tsx
+++ b/packages/app/src/components/dialog-edit-project.tsx
@@ -8,7 +8,7 @@ import { createMemo, createSignal, For, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { type LocalProject, getAvatarColors } from "@/context/layout"
-import { ProjectIcon, isValidImageFile } from "@/components/project-icon"
+import { ProjectAvatar, isValidImageFile } from "@/components/project-avatar"
 
 const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] as const
 
@@ -111,7 +111,7 @@ export function DialogEditProject(props: { project: LocalProject }) {
                   onDragLeave={handleDragLeave}
                   onClick={() => document.getElementById("icon-upload")?.click()}
                 >
-                  <ProjectIcon
+                  <ProjectAvatar
                     name={store.name || defaultName()}
                     projectId={props.project.id}
                     iconUrl={store.iconUrl}
diff --git a/packages/app/src/components/project-icon.tsx b/packages/app/src/components/project-avatar.tsx
similarity index 91%
rename from packages/app/src/components/project-icon.tsx
rename to packages/app/src/components/project-avatar.tsx
index 8b3927bdae..0dd907c72c 100644
--- a/packages/app/src/components/project-icon.tsx
+++ b/packages/app/src/components/project-avatar.tsx
@@ -5,7 +5,7 @@ import { getAvatarColors } from "@/context/layout"
 const OPENCODE_PROJECT_ID = "4b0ea68d7af9a6031a7ffda7ad66e0cb83315750"
 const OPENCODE_FAVICON_URL = "https://opencode.ai/favicon.svg"
 
-export interface ProjectIconProps extends Omit<ComponentProps<"div">, "children"> {
+export interface ProjectAvatarProps extends Omit<ComponentProps<"div">, "children"> {
   name: string
   iconUrl?: string
   iconColor?: string
@@ -36,7 +36,7 @@ export const isValidImageFile = (file: File): boolean => {
   return true
 }
 
-export const ProjectIcon = (props: ProjectIconProps) => {
+export const ProjectAvatar = (props: ProjectAvatarProps) => {
   const [local, rest] = splitProps(props, [
     "name",
     "iconUrl",
diff --git a/packages/app/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index 67eed26d10..3282fa614d 100644
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -53,7 +53,7 @@ import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme"
 import { DialogSelectProvider } from "@/components/dialog-select-provider"
 import { DialogSelectServer } from "@/components/dialog-select-server"
 import { useCommand, type CommandOption } from "@/context/command"
-import { ProjectIcon } from "@/components/project-icon"
+import { ProjectAvatar } from "@/components/project-avatar"
 import { ConstrainDragXAxis } from "@/utils/solid-dnd"
 import { navStart } from "@/utils/perf"
 import { DialogSelectDirectory } from "@/components/dialog-select-directory"
@@ -813,27 +813,24 @@ export default function Layout(props: ParentProps) {
     const hasError = createMemo(() => notifications().some((n) => n.type === "error"))
     const name = createMemo(() => props.project.name || getFilename(props.project.worktree))
     const mask = "radial-gradient(circle 6px at calc(100% - 3px) 3px, transparent 6px, black 6.5px)"
-    const opencode = "4b0ea68d7af9a6031a7ffda7ad66e0cb83315750"
 
     return (
-      <div class="relative size-5 shrink-0 rounded-sm">
-        <ProjectIcon
-          name={name()}
-          projectId={props.project.id}
-          iconUrl={props.project.icon?.url}
-          iconColor={props.project.icon?.color}
-          size="small"
-          class={`size-full ${props.class ?? ""}`}
-          style={
-            notifications().length > 0 && props.notify ? { "-webkit-mask-image": mask, "mask-image": mask } : undefined
-          }
-        />
-        <Show when={props.expandable}>
-          <Icon
-            name="chevron-right"
-            size="normal"
-            class="hidden size-full items-center justify-center text-text-subtle group-hover/session:flex group-data-[expanded]/trigger:rotate-90 transition-transform duration-50"
+      <div class={`relative size-8 shrink-0 rounded-sm ${props.class ?? ""}`}>
+        <div class="size-full rounded-sm overflow-clip">
+          <ProjectAvatar
+            name={name()}
+            projectId={props.project.id}
+            iconUrl={props.project.icon?.url}
+            iconColor={props.project.icon?.color}
+            size="small"
+            class={`size-full ${props.class ?? ""}`}
+            style={
+              notifications().length > 0 && props.notify
+                ? { "-webkit-mask-image": mask, "mask-image": mask }
+                : undefined
+            }
           />
+        </div>
         <Show when={notifications().length > 0 && props.notify}>
           <div
             classList={{