diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index 298c6b0..59c9032 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -501,10 +501,10 @@ export function Sidebar({
       onKeyDown={handleKeyboardActivate}
       onClick={onClick}
     >
-      <span className="text-muted-foreground" aria-hidden="true">
+      <span className="sidebar-tool-icon text-muted-foreground" aria-hidden="true">
         {icon}
       </span>
-      <span className="flex-1 truncate text-muted-foreground">{label}</span>
+      <span className="sidebar-tool-label flex-1 truncate text-muted-foreground">{label}</span>
     </div>
   );
 
diff --git a/frontend/src/components/StatusBar.tsx b/frontend/src/components/StatusBar.tsx
index 76660b4..ec3fd1f 100644
--- a/frontend/src/components/StatusBar.tsx
+++ b/frontend/src/components/StatusBar.tsx
@@ -155,9 +155,9 @@ export function StatusBar({
         aria-label={currentTheme === 'light' ? 'Switch to classic theme' : 'Switch to light theme'}
       >
         {currentTheme === 'light' ? (
-          <Sun className="h-4 w-4" aria-hidden="true" />
-        ) : (
           <Moon className="h-4 w-4" aria-hidden="true" />
+        ) : (
+          <Sun className="h-4 w-4" aria-hidden="true" />
         )}
       </button>
     </header>
diff --git a/frontend/src/themes.css b/frontend/src/themes.css
index 0d8c54b..ccd3a7b 100644
--- a/frontend/src/themes.css
+++ b/frontend/src/themes.css
@@ -49,6 +49,10 @@
   --overlay: 220 20% 10%;
 }
 
+:root[data-theme='light'] .sidebar-tool-label {
+  color: hsl(var(--foreground));
+}
+
 /* ── Cyberpunk ("Neon Bleed") ──────────────────────────────── */
 :root[data-theme='cyberpunk'] {
   --background: 210 18% 3%;