diff --git a/canvas/src/components/ThemeToggle.tsx b/canvas/src/components/ThemeToggle.tsx
index c99519b8..322ff3df 100644
--- a/canvas/src/components/ThemeToggle.tsx
+++ b/canvas/src/components/ThemeToggle.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useTheme, type ThemePreference } from "@/lib/theme-provider";
+import { useCallback } from "react";
 
 const OPTIONS: { value: ThemePreference; label: string; icon: string }[] = [
   // Sun: explicit light
@@ -33,17 +34,47 @@ const OPTIONS: { value: ThemePreference; label: string; icon: string }[] = [
  *
  * Aligned with molecule-app/components/theme-toggle.tsx so the picker
  * behaves identically across surfaces.
+ *
+ * WCAG 2.4.7: focus-visible rings on all three icon buttons.
+ * ARIA radiogroup pattern (2.1.1): Left/Right arrow keys move focus
+ * between options and update selection; Home/End jump to first/last.
  */
 export function ThemeToggle({ className = "" }: { className?: string }) {
   const { theme, setTheme } = useTheme();
 
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLButtonElement>, index: number) => {
+      let next = index;
+      if (e.key === "ArrowRight" || e.key === "ArrowDown") {
+        e.preventDefault();
+        next = (index + 1) % OPTIONS.length;
+      } else if (e.key === "ArrowLeft" || e.key === "ArrowUp") {
+        e.preventDefault();
+        next = (index - 1 + OPTIONS.length) % OPTIONS.length;
+      } else if (e.key === "Home") {
+        e.preventDefault();
+        next = 0;
+      } else if (e.key === "End") {
+        e.preventDefault();
+        next = OPTIONS.length - 1;
+      } else {
+        return;
+      }
+      setTheme(OPTIONS[next].value);
+      // Move focus to the new button so arrow-key navigation is continuous
+      const btns = (e.currentTarget.closest("[role=radiogroup]") as HTMLElement)?.querySelectorAll<HTMLButtonElement>("[role=radio]");
+      btns?.[next]?.focus();
+    },
+    []
+  );
+
   return (
     <div
       role="radiogroup"
       aria-label="Theme preference"
       className={`inline-flex items-center gap-0.5 rounded-md border border-line bg-surface-sunken p-0.5 ${className}`}
     >
-      {OPTIONS.map((opt) => {
+      {OPTIONS.map((opt, index) => {
         const active = theme === opt.value;
         return (
           <button
@@ -53,11 +84,12 @@ export function ThemeToggle({ className = "" }: { className?: string }) {
             aria-checked={active}
             aria-label={opt.label}
             onClick={() => setTheme(opt.value)}
+            onKeyDown={(e) => handleKeyDown(e, index)}
             className={
-              "flex h-6 w-6 items-center justify-center rounded transition-colors " +
+              "flex h-6 w-6 items-center justify-center rounded transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface-sunken " +
               (active
                 ? "bg-surface-elevated text-ink shadow-sm"
-                : "text-ink-mid hover:text-ink-mid")
+                : "text-ink-mid hover:text-ink")
             }
           >
             <svg
diff --git a/canvas/src/components/__tests__/ThemeToggle.test.tsx b/canvas/src/components/__tests__/ThemeToggle.test.tsx
index 14e71603..4128d3d7 100644
--- a/canvas/src/components/__tests__/ThemeToggle.test.tsx
+++ b/canvas/src/components/__tests__/ThemeToggle.test.tsx
@@ -3,10 +3,11 @@
  * Tests for ThemeToggle component.
  *
  * Covers: renders all three options, aria radiogroup semantics,
- * aria-checked per option, setTheme calls on click, custom className prop.
+ * aria-checked per option, setTheme calls on click, keyboard navigation
+ * (arrow keys, Home/End), focus-visible rings, custom className prop.
  */
 import React from "react";
-import { render, screen, fireEvent, cleanup } from "@testing-library/react";
+import { render, screen, fireEvent, cleanup, act } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { ThemeToggle } from "../ThemeToggle";
 import * as themeProvider from "@/lib/theme-provider";
@@ -131,6 +132,86 @@ describe("ThemeToggle — interaction", () => {
   });
 });
 
+describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", () => {
+  beforeEach(() => {
+    vi.mocked(themeProvider.useTheme).mockReturnValue({
+      theme: "dark",
+      resolvedTheme: "dark",
+      setTheme: mockSetTheme,
+    });
+  });
+
+  it("moves to the next option on ArrowRight and wraps around", () => {
+    render(<ThemeToggle />);
+    const radios = screen.getAllByRole("radio");
+    // dark (index 2) is current; ArrowRight should wrap to light (index 0)
+    act(() => { radios[2].focus(); });
+    fireEvent.keyDown(radios[2], { key: "ArrowRight" });
+    expect(mockSetTheme).toHaveBeenCalledWith("light");
+  });
+
+  it("moves to the previous option on ArrowLeft", () => {
+    vi.mocked(themeProvider.useTheme).mockReturnValue({
+      theme: "light",
+      resolvedTheme: "light",
+      setTheme: mockSetTheme,
+    });
+    render(<ThemeToggle />);
+    const radios = screen.getAllByRole("radio");
+    // light (index 0) is current; ArrowLeft should go to dark (index 2)
+    act(() => { radios[0].focus(); });
+    fireEvent.keyDown(radios[0], { key: "ArrowLeft" });
+    expect(mockSetTheme).toHaveBeenCalledWith("dark");
+  });
+
+  it("moves to the next option on ArrowDown", () => {
+    vi.mocked(themeProvider.useTheme).mockReturnValue({
+      theme: "light",
+      resolvedTheme: "light",
+      setTheme: mockSetTheme,
+    });
+    render(<ThemeToggle />);
+    const radios = screen.getAllByRole("radio");
+    // light (index 0) is current; ArrowDown should go to system (index 1)
+    act(() => { radios[0].focus(); });
+    fireEvent.keyDown(radios[0], { key: "ArrowDown" });
+    expect(mockSetTheme).toHaveBeenCalledWith("system");
+  });
+
+  it("jumps to the first option on Home", () => {
+    vi.mocked(themeProvider.useTheme).mockReturnValue({
+      theme: "dark",
+      resolvedTheme: "dark",
+      setTheme: mockSetTheme,
+    });
+    render(<ThemeToggle />);
+    const radios = screen.getAllByRole("radio");
+    act(() => { radios[2].focus(); });
+    fireEvent.keyDown(radios[2], { key: "Home" });
+    expect(mockSetTheme).toHaveBeenCalledWith("light");
+  });
+
+  it("jumps to the last option on End", () => {
+    vi.mocked(themeProvider.useTheme).mockReturnValue({
+      theme: "light",
+      resolvedTheme: "light",
+      setTheme: mockSetTheme,
+    });
+    render(<ThemeToggle />);
+    const radios = screen.getAllByRole("radio");
+    act(() => { radios[0].focus(); });
+    fireEvent.keyDown(radios[0], { key: "End" });
+    expect(mockSetTheme).toHaveBeenCalledWith("dark");
+  });
+
+  it("does nothing on unrelated keys", () => {
+    render(<ThemeToggle />);
+    const radios = screen.getAllByRole("radio");
+    fireEvent.keyDown(radios[0], { key: "Enter" });
+    expect(mockSetTheme).not.toHaveBeenCalled();
+  });
+});
+
 describe("ThemeToggle — className prop", () => {
   it("passes custom className to the radiogroup", () => {
     render(<ThemeToggle className="my-custom-class" />);