diff --git a/.changeset/nervous-maps-double.md b/.changeset/nervous-maps-double.md
new file mode 100644
index 0000000000..218cb674ce
--- /dev/null
+++ b/.changeset/nervous-maps-double.md
@@ -0,0 +1,5 @@
+---
+"@marigold/theme-core": patch
+---
+
+fix: use component height token in `Switch`
diff --git a/themes/theme-core/src/components/Switch.styles.ts b/themes/theme-core/src/components/Switch.styles.ts
index 9d82103817..c679f057cb 100644
--- a/themes/theme-core/src/components/Switch.styles.ts
+++ b/themes/theme-core/src/components/Switch.styles.ts
@@ -3,10 +3,10 @@ import { ThemeComponent, cva } from '@marigold/system';
 export const Switch: ThemeComponent<'Switch'> = {
   container: cva('justify-start'),
   track: cva([
-    'h-[22px]',
+    'h-component',
     'bg-bg-inverted border-border-inverted border border-solid',
     'group-selected/switch:bg-bg-selected-input group-selected/switch:border-border-selected',
     'group-disabled/switch:bg-bg-base-disabled group-disabled/switch:border-border-base',
   ]),
-  thumb: cva(['size-5', 'bg-bg-base']),
+  thumb: cva(['size-[22px]', 'bg-bg-base']),
 };