diff --git a/adev/src/app/core/layout/navigation/mini-menu.scss b/adev/src/app/core/layout/navigation/mini-menu.scss
index bb70214c65e..02ca0b3130e 100644
--- a/adev/src/app/core/layout/navigation/mini-menu.scss
+++ b/adev/src/app/core/layout/navigation/mini-menu.scss
@@ -11,6 +11,14 @@
   z-index: var(--z-index-mini-menu);
   box-shadow: 10px 4px 40px 0 rgba(0, 0, 0, 0.075);
 
+  // Animation for mini-menu appearance
+  animation: menuFadeIn 0.2s ease-out forwards;
+  transform-origin: left center;
+
+  @media (prefers-reduced-motion: reduce) {
+    animation: none;
+  }
+
   @include mq.for-tablet {
     top: 75px;
     left: 5px;
@@ -98,3 +106,32 @@
     bottom: auto;
   }
 }
+
+// Icon transition animation
+.adev-theme-icon {
+  transition: transform 0.3s ease;
+
+  &:hover {
+    transform: rotate(20deg) scale(1.1);
+  }
+
+  @media (prefers-reduced-motion: reduce) {
+    transition: none;
+
+    &:hover {
+      transform: none;
+    }
+  }
+}
+
+// Keyframe animations
+@keyframes menuFadeIn {
+  from {
+    opacity: 0;
+    transform: translateX(-10px) scale(0.95);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0) scale(1);
+  }
+}
diff --git a/adev/src/app/core/layout/navigation/navigation.component.html b/adev/src/app/core/layout/navigation/navigation.component.html
index d38a0b0ae8a..8786877d73c 100644
--- a/adev/src/app/core/layout/navigation/navigation.component.html
+++ b/adev/src/app/core/layout/navigation/navigation.component.html
@@ -177,7 +177,7 @@
                   type="button"
                   cdkMenuItem
                   [href]="item.url"
-                  [attr.aria-label]="item.displayName"
+                  [aria-label]="item.displayName"
                 >
                   <span>{{ item.displayName }}</span>
               </a>
@@ -209,7 +209,7 @@
           </svg>
           <span
             class="adev-nav-item__label adev-search-desktop"
-            [attr.aria-label]="'Open search dialog with ' + searchTitle"
+            [aria-label]="'Open search dialog with ' + searchTitle"
           >
             <kbd>{{ searchLabel }}</kbd>
             <kbd>K</kbd>
@@ -446,17 +446,20 @@
           </ul>
         </ng-template>
       </div>
-      <!-- TODO: Refactor this and make it better. Accessible, animated, etc. -->
+      <!-- Theme Picker -->
       <div class="adev-nav-item" [class.adev-nav-item--active]="openedMenu() === 'theme-picker'">
         <button
           type="button"
           [cdkMenuTriggerFor]="themeMiniMenu"
           [cdkMenuPosition]="miniMenuPositions"
-          aria-label="Open theme picker"
+          [aria-label]="'Change theme. Current theme: ' + theme()"
+          aria-controls="theme-mini-menu"
+          [aria-expanded]="openedMenu() === 'theme-picker'"
+          aria-haspopup="menu"
           (cdkMenuClosed)="closeMenu()"
           (cdkMenuOpened)="openMenu('theme-picker')"
         >
-          <docs-icon role="presentation">
+          <docs-icon role="presentation" class="adev-theme-icon">
             @switch (theme()) {
               @case ('light') {
                 {{ 'light_mode' }}
@@ -472,37 +475,49 @@
         </button>
 
         <ng-template #themeMiniMenu>
-          <ul class="adev-mini-menu" cdkMenu>
-            <li>
+          <ul
+            class="adev-mini-menu"
+            cdkMenu
+            id="theme-mini-menu"
+            role="menu"
+            aria-label="Theme options"
+          >
+            <li role="none">
               <button
                 type="button"
                 cdkMenuItem
+                role="menuitemradio"
+                [aria-checked]="theme() === 'auto'"
                 (click)="setTheme('auto')"
                 aria-label="Set default system theme"
               >
-                <docs-icon class="docs-icon_high-contrast">routine</docs-icon>
+                <docs-icon class="docs-icon_high-contrast" aria-hidden="true">routine</docs-icon>
                 <span>System</span>
               </button>
             </li>
-            <li>
+            <li role="none">
               <button
                 type="button"
                 cdkMenuItem
+                role="menuitemradio"
+                [aria-checked]="theme() === 'dark'"
                 (click)="setTheme('dark')"
                 aria-label="Set dark theme"
               >
-                <docs-icon class="docs-icon_high-contrast">dark_mode</docs-icon>
+                <docs-icon class="docs-icon_high-contrast" aria-hidden="true">dark_mode</docs-icon>
                 <span>Dark</span>
               </button>
             </li>
-            <li>
+            <li role="none">
               <button
                 type="button"
                 cdkMenuItem
+                role="menuitemradio"
+                [aria-checked]="theme() === 'light'"
                 (click)="setTheme('light')"
                 aria-label="Set light theme"
               >
-                <docs-icon class="docs-icon_high-contrast">light_mode</docs-icon>
+                <docs-icon class="docs-icon_high-contrast" aria-hidden="true">light_mode</docs-icon>
                 <span>Light</span>
               </button>
             </li>
diff --git a/adev/src/app/core/layout/navigation/navigation.component.spec.ts b/adev/src/app/core/layout/navigation/navigation.component.spec.ts
index 7b9361a81c8..71fb6e2024a 100644
--- a/adev/src/app/core/layout/navigation/navigation.component.spec.ts
+++ b/adev/src/app/core/layout/navigation/navigation.component.spec.ts
@@ -85,7 +85,7 @@ describe('Navigation', () => {
 
   it('should call themeManager.setTheme(dark) when user tries to set dark theme', () => {
     const openThemePickerButton = fixture.debugElement.query(
-      By.css('button[aria-label^="Open theme picker"]'),
+      By.css('button[aria-label^="Change theme. Current theme:"]'),
     ).nativeElement;
     const setThemeSpy = spyOn(fakeThemeManager, 'setTheme');