diff --git a/app/lib/frontend/templates/views/shared/site_header.dart b/app/lib/frontend/templates/views/shared/site_header.dart
index fddec6bb3..d45de6f74 100644
--- a/app/lib/frontend/templates/views/shared/site_header.dart
+++ b/app/lib/frontend/templates/views/shared/site_header.dart
@@ -111,9 +111,9 @@ d.Node siteHeaderNode({
           _foldableMobileLinks('Dart', _dartLinks),
           if (userSession != null && userSession.isAuthenticated)
             _userBlock(userSession),
-          _themeSwitcher(),
         ],
       ),
+      _themeSwitcher(),
     ],
   );
 }
diff --git a/pkg/web_css/lib/src/_site_header.scss b/pkg/web_css/lib/src/_site_header.scss
index ef5d7566b..ebf5c5180 100644
--- a/pkg/web_css/lib/src/_site_header.scss
+++ b/pkg/web_css/lib/src/_site_header.scss
@@ -69,8 +69,9 @@
     display: block;
     background-color: transparent;
     width: 24px;
+    height: 24px;
     background-position: center;
-    margin: 0 18px;
+    margin: 0 0 0 18px;
     background-image: url("../img/dark-mode-symbol-888888.svg");
     background-size: 100%;
     background-repeat: no-repeat;