diff --git a/web/src/lib/components/Shell.svelte b/web/src/lib/components/Shell.svelte
index 6d505911..4633ec59 100644
--- a/web/src/lib/components/Shell.svelte
+++ b/web/src/lib/components/Shell.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { page } from '$app/state';
   import { goto } from '$app/navigation';
+  import { ChevronDown } from 'lucide-svelte';
   import { user, logout } from '$lib/auth/store.svelte';
   import { player } from '$lib/player/store.svelte';
   import PlayerBar from './PlayerBar.svelte';
@@ -64,10 +65,18 @@
       <button
         bind:this={menuButtonRef}
         type="button"
-        class="rounded px-3 py-1 hover:bg-surface-hover"
+        class="flex items-center gap-1.5 rounded px-3 py-1 hover:bg-surface-hover focus-visible:ring-2 focus-visible:ring-accent"
+        aria-haspopup="menu"
+        aria-expanded={menuOpen}
         onclick={() => (menuOpen = !menuOpen)}
       >
-        {user.value?.username ?? ''}
+        <span>{user.value?.username ?? ''}</span>
+        <ChevronDown
+          size={16}
+          strokeWidth={1}
+          class="transition-transform {menuOpen ? 'rotate-180' : ''}"
+          aria-hidden="true"
+        />
       </button>
       {#if menuOpen}
         <div