From 1c5543c5137b0439ab1afacbfb4ff654b5223ec8 Mon Sep 17 00:00:00 2001
From: "middle:Duck" <d@evo.im>
Date: Wed, 25 Mar 2026 22:26:36 +0700
Subject: [PATCH 1/2] [FIX] Align theme switcher icon with settings toolbar
 markup.

---
 core/tests/Unit/Manager/ThemeToggleIconMarkupTest.php | 9 +++++++++
 manager/views/frame/1.blade.php                       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 core/tests/Unit/Manager/ThemeToggleIconMarkupTest.php

diff --git a/core/tests/Unit/Manager/ThemeToggleIconMarkupTest.php b/core/tests/Unit/Manager/ThemeToggleIconMarkupTest.php
new file mode 100644
index 0000000000..696894e5a4
--- /dev/null
+++ b/core/tests/Unit/Manager/ThemeToggleIconMarkupTest.php
@@ -0,0 +1,9 @@
+<?php
+
+test('theme toggle uses the shared settings icon wrapper', function () {
+    $view = file_get_contents(dirname(__DIR__, 4) . '/manager/views/frame/1.blade.php');
+
+    expect($view)->toContain('<li id="theme">')
+        ->and($view)->toContain('<a id="treeMenu_theme_dark" onclick="modx.tree.toggleTheme(event)" title="{{ManagerTheme::getLexicon(\'manager_theme_mode_title\')}}">')
+        ->and($view)->toContain('<span class="icon">{!! $_style[\'icon_theme\'] !!}</span>');
+});
diff --git a/manager/views/frame/1.blade.php b/manager/views/frame/1.blade.php
index 72cc0ae228..f2ff94e65e 100644
--- a/manager/views/frame/1.blade.php
+++ b/manager/views/frame/1.blade.php
@@ -315,7 +315,7 @@ function iconHtml($icon, $attrs = '') {
                         </li>
                         <li id="theme">
                             <a id="treeMenu_theme_dark" onclick="modx.tree.toggleTheme(event)" title="{{ManagerTheme::getLexicon('manager_theme_mode_title')}}">
-                                {!! $_style['icon_theme'] !!}
+                                <span class="icon">{!! $_style['icon_theme'] !!}</span>
                             </a>
                         </li>
                         @if (

From 25caa6af1dc700cac6abe258e7df15f0c5e21b85 Mon Sep 17 00:00:00 2001
From: "middle:Duck" <d@evo.im>
Date: Thu, 26 Mar 2026 00:20:48 +0700
Subject: [PATCH 2/2] [FIX] Keep the theme toggle darker on light hover.

---
 .../Unit/Manager/ThemeToggleLightHoverContrastTest.php | 10 ++++++++++
 manager/media/style/default/css/mainmenu.css           |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 core/tests/Unit/Manager/ThemeToggleLightHoverContrastTest.php

diff --git a/core/tests/Unit/Manager/ThemeToggleLightHoverContrastTest.php b/core/tests/Unit/Manager/ThemeToggleLightHoverContrastTest.php
new file mode 100644
index 0000000000..93e1c4c10c
--- /dev/null
+++ b/core/tests/Unit/Manager/ThemeToggleLightHoverContrastTest.php
@@ -0,0 +1,10 @@
+<?php
+
+test('lightness theme keeps the theme toggle darker on hover', function () {
+    $css = file_get_contents(dirname(__DIR__, 4) . '/manager/media/style/default/css/mainmenu.css');
+
+    expect($css)->toContain('.lightness #mainMenu #settings > #theme > a:hover')
+        ->and($css)->toContain('.lightness #mainMenu #settings > #theme > a:focus')
+        ->and($css)->toContain('.lightness #mainMenu #settings > #theme > a:active')
+        ->and($css)->toContain('color: #2f2f2f;');
+});
diff --git a/manager/media/style/default/css/mainmenu.css b/manager/media/style/default/css/mainmenu.css
index 866fd75041..2750fc3df2 100755
--- a/manager/media/style/default/css/mainmenu.css
+++ b/manager/media/style/default/css/mainmenu.css
@@ -769,6 +769,13 @@ body.sidebar-closed #bars .icon-collapse { display: none !important; }
     color: #fff;
     background-color: transparent;
 }
+.lightness #mainMenu #settings > #theme > a:hover,
+.lightness #mainMenu #settings > #theme > a:focus,
+.lightness #mainMenu #settings > #theme > a:active,
+.lightness #mainMenu.show #settings > #theme.hover > a {
+    color: #2f2f2f;
+    background-color: transparent;
+}
 /* light */
 .light #mainMenu {
     -webkit-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.3);