diff --git a/packages/webawesome/src/components/radio/radio.css b/packages/webawesome/src/components/radio/radio.css
index bfc414331..e025190fe 100644
--- a/packages/webawesome/src/components/radio/radio.css
+++ b/packages/webawesome/src/components/radio/radio.css
@@ -7,7 +7,7 @@
   --border-width: var(--wa-form-control-border-width);
   --box-shadow: none;
   --checked-icon-color: var(--wa-form-control-activated-color);
-  --checked-icon-scale: 0.75;
+  --checked-icon-scale: 0.7;
   --toggle-size: var(--wa-form-control-toggle-size);
 
   color: var(--wa-form-control-value-color);
diff --git a/packages/webawesome/src/components/switch/switch.css b/packages/webawesome/src/components/switch/switch.css
index 7651f5cee..8289e89ad 100644
--- a/packages/webawesome/src/components/switch/switch.css
+++ b/packages/webawesome/src/components/switch/switch.css
@@ -6,7 +6,7 @@
   --border-style: var(--wa-form-control-border-style);
   --border-width: var(--wa-form-control-border-width);
   --box-shadow: initial;
-  --height: calc(1em * var(--wa-form-control-value-line-height));
+  --height: var(--wa-form-control-toggle-size);
   --thumb-color: var(--wa-form-control-border-color);
   --thumb-color-checked: var(--wa-form-control-background-color);
   --thumb-shadow: initial;
@@ -14,6 +14,7 @@
   --width: calc(var(--height) * 1.75);
 
   display: inline-flex;
+  line-height: var(--wa-form-control-value-line-height);
 }
 
 label {
diff --git a/packages/webawesome/src/styles/themes/default/groups.css b/packages/webawesome/src/styles/themes/default/groups.css
index e9055fea1..f6d22786e 100644
--- a/packages/webawesome/src/styles/themes/default/groups.css
+++ b/packages/webawesome/src/styles/themes/default/groups.css
@@ -40,10 +40,7 @@
     --wa-form-control-padding-block: 0.75em;
     --wa-form-control-padding-inline: 1em;
     --wa-form-control-height: round(
-      calc(
-        2 * var(--wa-form-control-padding-block) + var(--wa-form-control-padding-inline) *
-          var(--wa-form-control-value-line-height)
-      ),
+      calc(2 * var(--wa-form-control-padding-block) + 1em * var(--wa-form-control-value-line-height)),
       1px
     );
     --wa-form-control-toggle-size: round(1lh, 1px);