diff --git a/assets/styling/shadcn.css b/assets/styling/shadcn.css
index acfa02e..6c4ca90 100644
--- a/assets/styling/shadcn.css
+++ b/assets/styling/shadcn.css
@@ -118,6 +118,34 @@
     background-color: hsl(var(--muted));
 }
 
+.ui-button[data-variant="icon"] {
+    background-color: transparent;
+    border-color: transparent;
+    color: hsl(var(--foreground));
+    padding: 0;
+}
+
+.ui-button[data-variant="icon"]:hover {
+    background-color: hsl(var(--muted));
+}
+
+.sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    white-space: nowrap;
+    border: 0;
+}
+
+.theme-toggle-icon {
+    width: 1.25rem;
+    height: 1.25rem;
+}
+
 .ui-button[data-variant="link"] {
     background-color: transparent;
     border-color: transparent;
diff --git a/src/components/ui/button.rs b/src/components/ui/button.rs
index 637be42..e5d6752 100644
--- a/src/components/ui/button.rs
+++ b/src/components/ui/button.rs
@@ -9,6 +9,7 @@ pub enum ButtonVariant {
     Outline,
     Ghost,
     Link,
+    Icon,
 }
 
 impl ButtonVariant {
@@ -20,6 +21,7 @@ impl ButtonVariant {
             ButtonVariant::Outline => "outline",
             ButtonVariant::Ghost => "ghost",
             ButtonVariant::Link => "link",
+            ButtonVariant::Icon => "icon",
         }
     }
 }
diff --git a/src/views/navbar.rs b/src/views/navbar.rs
index 905658b..c8ed4b6 100644
--- a/src/views/navbar.rs
+++ b/src/views/navbar.rs
@@ -1,8 +1,9 @@
 use crate::{
     components::ui::{
-        Avatar, Button, ButtonVariant, Sidebar, SidebarContent, SidebarFooter, SidebarGroup,
-        SidebarGroupContent, SidebarGroupLabel, SidebarHeader, SidebarInset, SidebarLayout,
-        SidebarMenu, SidebarMenuButton, SidebarMenuItem, SidebarRail, SidebarSeparator,
+        Avatar, Button, ButtonSize, ButtonVariant, Sidebar, SidebarContent, SidebarFooter,
+        SidebarGroup, SidebarGroupContent, SidebarGroupLabel, SidebarHeader, SidebarInset,
+        SidebarLayout, SidebarMenu, SidebarMenuButton, SidebarMenuItem, SidebarRail,
+        SidebarSeparator,
     },
     Route,
 };
@@ -25,7 +26,7 @@ pub fn Navbar() -> Element {
         "ui-shell shadcn"
     };
 
-    let title = page_title(&current_route);
+    let _title = page_title(&current_route);
     let is_dashboard = matches!(current_route, Route::Home { .. });
     let is_components = matches!(current_route, Route::Components { .. });
 
@@ -138,7 +139,8 @@ pub fn Navbar() -> Element {
                         }
                         div { class: "admin-shell-actions",
                             Button {
-                                variant: ButtonVariant::Secondary,
+                                variant: ButtonVariant::Icon,
+                                size: ButtonSize::Icon,
                                 class: Some("admin-shell-theme".to_string()),
                                 r#type: "button".to_string(),
                                 on_click: move |_| {
@@ -146,7 +148,12 @@ pub fn Navbar() -> Element {
                                     let current = handle();
                                     handle.set(!current);
                                 },
-                                "{theme_label()}"
+                                if is_dark() {
+                                    SunIcon {}
+                                } else {
+                                    MoonIcon {}
+                                }
+                                span { class: "sr-only", "{theme_label()}" }
                             }
                         }
                     }
@@ -159,3 +166,45 @@ pub fn Navbar() -> Element {
         }
     }
 }
+
+#[component]
+fn SunIcon() -> Element {
+    rsx! {
+        svg {
+            class: "theme-toggle-icon",
+            xmlns: "http://www.w3.org/2000/svg",
+            view_box: "0 0 24 24",
+            fill: "none",
+            stroke: "currentColor",
+            stroke_width: "1.5",
+            stroke_linecap: "round",
+            stroke_linejoin: "round",
+            circle { cx: "12", cy: "12", r: "4" }
+            path { d: "M12 2v2" }
+            path { d: "M12 20v2" }
+            path { d: "M4.93 4.93l1.41 1.41" }
+            path { d: "M17.66 17.66l1.41 1.41" }
+            path { d: "M2 12h2" }
+            path { d: "M20 12h2" }
+            path { d: "M6.34 17.66l-1.41 1.41" }
+            path { d: "M17.66 6.34l1.41-1.41" }
+        }
+    }
+}
+
+#[component]
+fn MoonIcon() -> Element {
+    rsx! {
+        svg {
+            class: "theme-toggle-icon",
+            xmlns: "http://www.w3.org/2000/svg",
+            view_box: "0 0 24 24",
+            fill: "none",
+            stroke: "currentColor",
+            stroke_width: "1.5",
+            stroke_linecap: "round",
+            stroke_linejoin: "round",
+            path { d: "M21 12.79A9 9 0 0 1 11.21 3 7 7 0 1 0 21 12.79z" }
+        }
+    }
+}