diff --git a/canon-docs/src/app/opengraph-image.jpg b/canon-docs/src/app/opengraph-image.jpg
new file mode 100644
index 0000000000..4dc9025ec5
Binary files /dev/null and b/canon-docs/src/app/opengraph-image.jpg differ
diff --git a/canon-docs/src/components/Toolbar/theme-name.module.css b/canon-docs/src/components/Toolbar/theme-name.module.css
index 807f22d343..6f2ceb427f 100644
--- a/canon-docs/src/components/Toolbar/theme-name.module.css
+++ b/canon-docs/src/components/Toolbar/theme-name.module.css
@@ -4,7 +4,7 @@
   align-items: center;
   justify-content: space-between;
   gap: 0.75rem;
-  height: 2.5rem;
+  height: 2rem;
   padding-left: 0.875rem;
   padding-right: 0.75rem;
   margin: 0;
@@ -30,6 +30,15 @@
   display: flex;
 }
 
+.SelectValue {
+  font-size: var(--canon-font-size-body);
+  font-weight: var(--canon-font-weight-regular);
+}
+
+.Positioner {
+  z-index: 20;
+}
+
 .Popup {
   box-sizing: border-box;
   padding-block: 0.25rem;
@@ -37,7 +46,7 @@
   background-color: canvas;
   color: var(--color-gray-900);
   border: 1px solid var(--canon-border-base);
-
+  padding-inline: 0.25rem;
   transform-origin: var(--transform-origin);
   transition: transform 150ms, opacity 150ms;
 
@@ -81,6 +90,9 @@
   grid-template-columns: 0.75rem 1fr;
   cursor: default;
   user-select: none;
+  border-radius: 0.25rem;
+  cursor: pointer;
+  transition: background-color 0.2s ease-in-out;
 
   [data-side='none'] & {
     font-size: 1rem;
@@ -92,6 +104,7 @@
     z-index: 0;
     position: relative;
     color: var(--color-gray-50);
+    background-color: var(--canon-surface-2);
   }
 
   &[data-highlighted]::before {
@@ -107,6 +120,10 @@
 
 .ItemIndicator {
   grid-column-start: 1;
+  width: 1rem;
+  height: 1rem;
+  display: flex;
+  align-items: center;
 }
 
 .ItemIndicatorIcon {
@@ -118,12 +135,3 @@
 .ItemText {
   grid-column-start: 2;
 }
-
-.SelectValue {
-  font-size: var(--canon-font-size-body);
-  font-weight: var(--canon-font-weight-bold);
-}
-
-.Positioner {
-  z-index: 20;
-}
diff --git a/canon-docs/src/components/Toolbar/theme.module.css b/canon-docs/src/components/Toolbar/theme.module.css
index d61b0e09f9..2d17ffbac2 100644
--- a/canon-docs/src/components/Toolbar/theme.module.css
+++ b/canon-docs/src/components/Toolbar/theme.module.css
@@ -6,7 +6,7 @@
 }
 
 .tabsTheme {
-  width: 120px;
+  width: 100px;
   border-radius: 0.375rem;
   background-color: var(--canon-surface-2);
   transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
@@ -16,7 +16,7 @@
   display: flex;
   position: relative;
   z-index: 0;
-  padding-inline: 0.375rem;
+  padding-inline: 0.25rem;
   gap: 0.25rem;
 }
 
@@ -31,7 +31,7 @@
   appearance: none;
   color: var(--canon-text-secondary);
   user-select: none;
-  height: 40px;
+  height: 2rem;
   flex: 1;
   cursor: pointer;
 
@@ -74,7 +74,7 @@
   top: 50%;
   translate: var(--active-tab-left) -50%;
   width: var(--active-tab-width);
-  height: 1.8rem;
+  height: 1.5rem;
   border-radius: 0.25rem;
   background-color: var(--canon-surface-1);
   transition-property: translate, width, background-color;