diff --git a/app/assets/javascripts/discourse/app/components/d-toggle-switch.gjs b/app/assets/javascripts/discourse/app/components/d-toggle-switch.gjs
new file mode 100644
index 00000000000..a1487a5bb63
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/d-toggle-switch.gjs
@@ -0,0 +1,42 @@
+import Component from "@glimmer/component";
+import I18n from "I18n";
+import icon from "discourse-common/helpers/d-icon";
+
+export default class DToggleSwitch extends Component {
+  <template>
+    <div class="d-toggle-switch">
+      <label class="d-toggle-switch--label">
+        {{! template-lint-disable no-redundant-role }}
+        <button
+          class="d-toggle-switch__checkbox"
+          type="button"
+          role="switch"
+          aria-checked={{this.checked}}
+          ...attributes
+        ></button>
+        {{! template-lint-enable no-redundant-role }}
+
+        <span class="d-toggle-switch__checkbox-slider">
+          {{#if @state}}
+            {{icon "check"}}
+          {{/if}}
+        </span>
+      </label>
+
+      <span class="d-toggle-switch__checkbox-label">
+        {{this.computedLabel}}
+      </span>
+    </div>
+  </template>
+
+  get computedLabel() {
+    if (this.args.label) {
+      return I18n.t(this.args.label);
+    }
+    return this.args.translatedLabel;
+  }
+
+  get checked() {
+    return this.args.state ? "true" : "false";
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-toggle-switch.hbs b/app/assets/javascripts/discourse/app/components/d-toggle-switch.hbs
deleted file mode 100644
index bb04752856c..00000000000
--- a/app/assets/javascripts/discourse/app/components/d-toggle-switch.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="d-toggle-switch">
-  <label class="d-toggle-switch--label">
-    {{! template-lint-disable no-redundant-role }}
-    <button
-      class="d-toggle-switch__checkbox"
-      type="button"
-      role="switch"
-      aria-checked={{this.checked}}
-      ...attributes
-    ></button>
-    {{! template-lint-enable no-redundant-role }}
-
-    <span class="d-toggle-switch__checkbox-slider">
-      {{#if @state}}
-        {{d-icon "check"}}
-      {{/if}}
-    </span>
-  </label>
-
-  <span class="d-toggle-switch__checkbox-label">
-    {{this.computedLabel}}
-  </span>
-</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-toggle-switch.js b/app/assets/javascripts/discourse/app/components/d-toggle-switch.js
deleted file mode 100644
index 0bd175dd11d..00000000000
--- a/app/assets/javascripts/discourse/app/components/d-toggle-switch.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import Component from "@glimmer/component";
-import I18n from "I18n";
-
-export default class DToggleSwitch extends Component {
-  get computedLabel() {
-    if (this.args.label) {
-      return I18n.t(this.args.label);
-    }
-    return this.args.translatedLabel;
-  }
-
-  get checked() {
-    return this.args.state ? "true" : "false";
-  }
-}
diff --git a/app/assets/stylesheets/common/components/d-toggle-switch.scss b/app/assets/stylesheets/common/components/d-toggle-switch.scss
index 586985da1eb..d97cd9e32ca 100644
--- a/app/assets/stylesheets/common/components/d-toggle-switch.scss
+++ b/app/assets/stylesheets/common/components/d-toggle-switch.scss
@@ -5,6 +5,7 @@
   &:focus {
     .d-toggle-switch__checkbox-slider {
       outline: 2px solid var(--tertiary);
+      outline-offset: 2px;
     }
   }
 
@@ -21,6 +22,7 @@
 
   display: flex;
   align-items: center;
+  gap: 0.5rem;
 
   &__label {
     position: relative;
@@ -30,7 +32,23 @@
 
   &__checkbox {
     position: absolute;
-    visibility: hidden;
+    border: 0;
+    padding: 0;
+    background: transparent;
+
+    &:focus {
+      + .d-toggle-switch__checkbox-slider {
+        outline: 2px solid var(--tertiary);
+        outline-offset: 2px;
+      }
+
+      // Outline should show only when tabbing, not clicking
+      &:not(:focus-visible) {
+        + .d-toggle-switch__checkbox-slider {
+          outline: none;
+        }
+      }
+    }
   }
 
   &__checkbox[aria-checked="true"] + .d-toggle-switch__checkbox-slider {
@@ -57,7 +75,6 @@
     border-radius: var(--toggle-switch-height);
     width: var(--toggle-switch-width);
     height: var(--toggle-switch-height);
-    margin-right: 0.5em;
     position: relative;
     vertical-align: middle;
     transition: background 0.25s;
@@ -87,5 +104,9 @@
     top: calc(var(--toggle-switch-height) * 0.125);
     left: calc(var(--toggle-switch-height) * 0.125);
     transition: left 0.25s;
+
+    @media (prefers-reduced-motion: reduce) {
+      transition-duration: 0ms;
+    }
   }
 }