good stuff

frontend/src/components/ui/Header.tsx

@@ -159,13 +159,6 @@ export default function Header({
                 >
                   Invite
                 </a>
-                <a
-                  href={PAGE_PATHS.account}
-                  className={tabClass('account')}
-                  onClick={(e) => navLink('account', e)}
-                >
-                  Account
-                </a>
               </>
             )}
             <a
@@ -245,7 +238,7 @@ export default function Header({
         {!isMobile && (
           <>
             {user ? (
-              <UserMenu user={user} onLogout={onLogout} />
+              <UserMenu user={user} theme={theme} onToggleTheme={onToggleTheme} onLogout={onLogout} />
             ) : (
               <>
                 <button
@@ -275,8 +268,8 @@ export default function Header({
           </button>
         )}
 
-        {/* Theme toggle (desktop only) */}
-        {!isMobile && (
+        {/* Theme toggle (desktop, logged-out only — logged-in users use UserMenu) */}
+        {!isMobile && !user && (
           <button
             onClick={onToggleTheme}
             className="flex items-center justify-center w-8 h-8 rounded bg-navy-800 hover:bg-navy-700 transition-colors"

frontend/src/components/ui/UserMenu.tsx

@@ -1,7 +1,19 @@
 import { useState, useRef, useEffect } from 'react';
 import type { AuthUser } from '../../hooks/useAuth';
+import { SunIcon } from './icons/SunIcon';
+import { MoonIcon } from './icons/MoonIcon';
 
-export default function UserMenu({ user, onLogout }: { user: AuthUser; onLogout: () => void }) {
+export default function UserMenu({
+  user,
+  theme,
+  onToggleTheme,
+  onLogout,
+}: {
+  user: AuthUser;
+  theme: 'light' | 'dark';
+  onToggleTheme: () => void;
+  onLogout: () => void;
+}) {
   const [open, setOpen] = useState(false);
   const menuRef = useRef<HTMLDivElement>(null);
 
@@ -48,6 +60,17 @@ export default function UserMenu({ user, onLogout }: { user: AuthUser; onLogout:
             </div>
           </div>
           <div className="p-1">
+            <button
+              onClick={onToggleTheme}
+              className="w-full flex items-center gap-2 px-3 py-2 text-sm text-warm-700 dark:text-warm-300 hover:bg-warm-50 dark:hover:bg-warm-700 rounded"
+            >
+              {theme === 'light' ? (
+                <SunIcon className="w-4 h-4" />
+              ) : (
+                <MoonIcon className="w-4 h-4" />
+              )}
+              Theme: {theme === 'light' ? 'Light' : 'Dark'}
+            </button>
             <a
               href="/account"
               onClick={() => setOpen(false)}