diff --git a/src/includes/site-header.ts b/src/includes/site-header.ts
index dd3a53b..7bf0d06 100644
--- a/src/includes/site-header.ts
+++ b/src/includes/site-header.ts
@@ -35,7 +35,7 @@ export const siteHeader = (config: PageConfig = {}) => html`
       </ul>
     </nav>
 
-    <div
+    <button
       id="theme-switch"
       class="theme-switch"
       role="switch"
@@ -44,11 +44,8 @@ export const siteHeader = (config: PageConfig = {}) => html`
       aria-label="Enable dark mode"
       aria-checked="false"
     >
-      <div class="switch">
-        <div class="icon sun"></div>
-        <div class="icon moon"></div>
-        <div class="handle"></div>
-      </div>
-    </div>
+      <div class="icon sun"></div>
+      <div class="icon moon"></div>
+    </button>
   </div>
 `;
diff --git a/src/static/assets/css/styles.css b/src/static/assets/css/styles.css
index 7a6e2a1..bee681f 100644
--- a/src/static/assets/css/styles.css
+++ b/src/static/assets/css/styles.css
@@ -562,91 +562,54 @@ h3 {
 
 /* Theme switch */
 .theme-switch {
-  font-size: 0.8rem;
-  box-sizing: content-box;
-
-  --switch-width: 7.4em;
-  --switch-height: 3.5em;
-  --switch-border-size: 0.2em;
-  --switch-handle-offset: 0.24em;
-  --switch-handle-size: calc(
-    var(--switch-height) - (var(--switch-handle-offset) * 4)
-  );
-  --switch-extra-click-area: 0.4em;
-  --switch-transition-duration: 250ms;
+  --theme-switch-size: 2.8rem;
+  --theme-switch-extra-click-area: 0.3rem;
 
-  display: block;
-  width: var(--switch-width);
-  height: var(--switch-height);
-  padding: var(
-    --switch-extra-click-area
-  ); /* Visual spacing as well as increased click area for the switch */
+  all: unset;
+  display: none;
+  position: relative;
+  width: var(--theme-switch-size);
+  height: var(--theme-switch-size);
+  padding: var(--theme-switch-extra-click-area);
+  border-radius: 50%;
+  box-sizing: content-box;
+  cursor: pointer;
 }
 
-.theme-switch:not(.loaded) .switch * {
-  display: none !important;
+.theme-switch.loaded {
+  display: block;
 }
 
 .theme-switch:focus-visible {
-  border-radius: calc(var(--switch-height) + var(--switch-extra-click-area));
   outline: 0.2rem dashed var(--color-highlight);
 }
 
-.theme-switch .switch {
-  position: relative;
-  display: block;
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  border: var(--switch-border-size) solid var(--color-font);
-  border-radius: calc(var(--switch-height) / 2);
-}
-
 .theme-switch .icon {
   position: absolute;
   display: block;
-  top: 0;
-  width: calc(var(--switch-height) - (var(--switch-border-size) * 2));
-  height: calc(var(--switch-height) - (var(--switch-border-size) * 2));
+  top: var(--theme-switch-extra-click-area);
+  width: var(--theme-switch-size);
+  height: var(--theme-switch-size);
   background-color: transparent;
   background-repeat: no-repeat;
   background-size: 100%;
   background-position: 50%;
   transform: rotate(50deg);
   transition:
-    opacity var(--switch-transition-duration),
+    opacity 250ms,
     transform 1s;
 }
 
 .theme-switch .icon.sun {
-  top: 0.1em; /* The icon looks slightly better aligned this way */
-  right: calc(var(--switch-border-size) + 0.1em);
   background-image: url('data:image/svg+xml;utf8,<svg viewBox="0 0 32 32" focusable="false" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"><path fill="%23181616" d="M6.30762,8.429A1.5,1.5,0,0,1,8.429,6.30762L9.934,7.81268A9.54027,9.54027,0,0,0,7.81268,9.934ZM17,6.12976V4a1.5,1.5,0,0,0-3,0V6.12976a8.73473,8.73473,0,0,1,3,0ZM6,15.5A9.52149,9.52149,0,0,1,6.12976,14H4a1.5,1.5,0,0,0,0,3H6.12976A9.52149,9.52149,0,0,1,6,15.5ZM23.18732,9.934,24.69238,8.429A1.5,1.5,0,0,0,22.571,6.30762L21.066,7.81268A9.54027,9.54027,0,0,1,23.18732,9.934ZM27,14H24.87024a8.73473,8.73473,0,0,1,0,3H27a1.5,1.5,0,0,0,0-3ZM7.81268,21.066,6.30762,22.571A1.5,1.5,0,0,0,8.429,24.69238L9.934,23.18732A9.54027,9.54027,0,0,1,7.81268,21.066Zm15.37464,0A9.54027,9.54027,0,0,1,21.066,23.18732L22.571,24.69238A1.5,1.5,0,0,0,24.69238,22.571ZM14,24.87024V27a1.5,1.5,0,0,0,3,0V24.87024a8.73473,8.73473,0,0,1-3,0ZM23,15.5A7.5,7.5,0,1,1,15.5,8,7.5082,7.5082,0,0,1,23,15.5Zm-3,0A4.5,4.5,0,1,0,15.5,20,4.50491,4.50491,0,0,0,20,15.5Z"/></svg>');
   opacity: 1;
 }
 
 .theme-switch .icon.moon {
-  left: calc(var(--switch-border-size) + 0.1em);
   background-image: url('data:image/svg+xml;utf8,<svg viewBox="0 0 32 32" focusable="false" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"><path fill="%23ebc45d" d="M25.29614,20.86829a1.04839,1.04839,0,0,0-.15277.01129A11.28987,11.28987,0,0,1,23.5,21a11.44774,11.44774,0,0,1-2.25989-.22675,11.56691,11.56691,0,0,1-9.096-9.44781,11.44715,11.44715,0,0,1,.32422-5.05811,1.01029,1.01029,0,0,0-.9494-1.30255.98825.98825,0,0,0-.40515.0885A11.99168,11.99168,0,0,0,15.16528,27.9715c.28.019.55884.0285.83478.0285a11.985,11.985,0,0,0,10.1485-5.621A.99379.99379,0,0,0,25.29614,20.86829ZM16.00006,25c-.20856,0-.41925-.00714-.63092-.02155A8.98582,8.98582,0,0,1,9.02332,10.33319q.0422.72793.15734,1.45929A14.53714,14.53714,0,0,0,20.63574,23.71179,8.93408,8.93408,0,0,1,16.00006,25Z"/></svg>');
   opacity: 0;
 }
 
-.theme-switch .handle {
-  display: block;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: var(--switch-handle-size);
-  height: var(--switch-handle-size);
-  margin: auto 0;
-  background-color: var(--color-font);
-  border-radius: 50%;
-  transform: translateX(var(--switch-handle-offset));
-  transition: transform var(--switch-transition-duration);
-}
-
 .theme-switch[checked] .icon {
   transform: rotate(10deg);
 }
@@ -659,15 +622,6 @@ h3 {
   opacity: 1;
 }
 
-.theme-switch[checked] .handle {
-  transform: translateX(
-    calc(
-      var(--switch-width) - var(--switch-handle-size) -
-        (var(--switch-handle-offset) * 4) + var(--switch-border-size)
-    )
-  );
-}
-
 /* Misc. styles */
 
 .page h1 {