diff --git a/src/components/Hamburger.astro b/src/components/Hamburger.astro
index 2990b3ca..9a06e6cc 100644
--- a/src/components/Hamburger.astro
+++ b/src/components/Hamburger.astro
@@ -10,7 +10,6 @@ const { props } = Astro
     position: relative;
     transform: rotate(0deg);
     cursor: pointer;
-    margin-top: calc(var(--spacer) / 2);
   }
 
   .line {
@@ -57,11 +56,7 @@ const { props } = Astro
   }
 
   .button {
-    padding: calc(var(--spacer) / 2);
-    vertical-align: middle;
-    display: inline-block;
-    margin: 0;
-    margin-right: -1rem;
+    margin-bottom: -0.4rem;
   }
 
   .button:hover,
diff --git a/src/components/Header/index.module.css b/src/components/Header/index.module.css
index 42633b44..ff6a4a67 100644
--- a/src/components/Header/index.module.css
+++ b/src/components/Header/index.module.css
@@ -56,5 +56,23 @@
 }
 
 .nav {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+}
+
+.nav > div,
+.nav > button {
+  padding: calc(var(--spacer) / 2);
+}
+
+.nav > div,
+.nav > button,
+.nav > div > label,
+.nav > div > label > div {
+  display: inline-flex;
+  align-items: center;
+}
+
+.nav > button:last-of-type {
+  padding-right: 0;
 }
diff --git a/src/components/ThemeSwitch/index.module.css b/src/components/ThemeSwitch/index.module.css
index ab8a11c0..74ec7fd2 100644
--- a/src/components/ThemeSwitch/index.module.css
+++ b/src/components/ThemeSwitch/index.module.css
@@ -1,8 +1,5 @@
 .themeSwitch {
   position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  margin-right: calc(var(--spacer) / 4);
 }
 
 .themeSwitch svg {
@@ -19,7 +16,6 @@
 .checkbox {
   position: relative;
   cursor: pointer;
-  padding: calc(var(--spacer) / 2);
   display: block;
 }
 
diff --git a/src/features/Search/index.astro b/src/features/Search/index.astro
index 36943270..21b3646b 100644
--- a/src/features/Search/index.astro
+++ b/src/features/Search/index.astro
@@ -21,14 +21,6 @@ import Search from './Search.tsx'
 </script>
 
 <style>
-  .searchButton {
-    padding: calc(var(--spacer) / 2);
-    vertical-align: middle;
-    display: inline-block;
-    margin: 0;
-    margin-right: calc(var(--spacer) / 4);
-  }
-
   .searchButton:focus {
     outline: 0;
   }
diff --git a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png
index 0c05ab24..e806cec0 100644
Binary files a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png and b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png differ
diff --git a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png
index 42c57076..ded574bf 100644
Binary files a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png and b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png differ
diff --git a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png
index 0255c62c..e405f8a4 100644
Binary files a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png and b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png differ
diff --git a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png
index 018afb36..fa014bad 100644
Binary files a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png and b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png differ
diff --git a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png
index c980e1ae..befe55e5 100644
Binary files a/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png and b/test/e2e/404.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png differ
diff --git a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png
index e6073636..9a903221 100644
Binary files a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png and b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Chrome-darwin.png differ
diff --git a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png
index 75d62544..86b2c75f 100644
Binary files a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png and b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-Mobile-Safari-darwin.png differ
diff --git a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png
index a9681a18..fd50f4f5 100644
Binary files a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png and b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-chromium-darwin.png differ
diff --git a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png
index 3bd0bc5e..dde7cbb4 100644
Binary files a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png and b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-firefox-darwin.png differ
diff --git a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png
index 645e4fe4..9c7b30fa 100644
Binary files a/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png and b/test/e2e/header.spec.ts-snapshots/matches-screenshot-1-webkit-darwin.png differ