diff --git a/ui/src/components/Layout.tsx b/ui/src/components/Layout.tsx
index ca557c92..2651acc0 100644
--- a/ui/src/components/Layout.tsx
+++ b/ui/src/components/Layout.tsx
@@ -61,6 +61,12 @@ export function Layout() {
     setSelectedCompanyId,
   } = useCompany();
   const { theme, toggleTheme } = useTheme();
+  const THEME_CYCLE: Record<string, string> = {
+    "catppuccin-mocha": "Tokyo Night",
+    "tokyo-night": "Catppuccin Latte",
+    "catppuccin-latte": "Catppuccin Mocha",
+  };
+  const nextThemeLabel = THEME_CYCLE[theme] ?? "next theme";
   const { companyPrefix } = useParams<{ companyPrefix: string }>();
   const navigate = useNavigate();
   const location = useLocation();
@@ -339,8 +345,8 @@ export function Layout() {
                   size="icon-sm"
                   className="text-muted-foreground shrink-0"
                   onClick={toggleTheme}
-                  aria-label="Cycle theme"
-                  title="Cycle theme"
+                  aria-label={`Switch to ${nextThemeLabel}`}
+                  title={`Switch to ${nextThemeLabel}`}
                 >
                   {isDarkTheme ? <Sun className="h-4 w-4" /> : <Moon className="h-4 w-4" />}
                 </Button>
@@ -397,8 +403,8 @@ export function Layout() {
                   size="icon-sm"
                   className="text-muted-foreground shrink-0"
                   onClick={toggleTheme}
-                  aria-label="Cycle theme"
-                  title="Cycle theme"
+                  aria-label={`Switch to ${nextThemeLabel}`}
+                  title={`Switch to ${nextThemeLabel}`}
                 >
                   {isDarkTheme ? <Sun className="h-4 w-4" /> : <Moon className="h-4 w-4" />}
                 </Button>