diff --git a/scss/forms/_basics.scss b/scss/forms/_basics.scss
index 060af840..39fbe1e5 100644
--- a/scss/forms/_basics.scss
+++ b/scss/forms/_basics.scss
@@ -407,6 +407,7 @@
       option {
         &:checked {
           background: var(#{$css-var-prefix}form-element-selected-background-color);
+          color: var(#{$css-var-prefix}form-element-color);
         }
       }
     }
diff --git a/scss/forms/_checkbox-radio-switch.scss b/scss/forms/_checkbox-radio-switch.scss
index 2328e818..0bc7ed2a 100644
--- a/scss/forms/_checkbox-radio-switch.scss
+++ b/scss/forms/_checkbox-radio-switch.scss
@@ -126,7 +126,9 @@
       background-image: none;
 
       &::before {
-        margin-inline-start: calc(#{$switch-width * 0.5} - var(#{$css-var-prefix}border-width));
+        margin-inline-start: calc(
+          #{$switch-width} - #{$switch-height} / 2 - var(#{$css-var-prefix}border-width) * 3
+        );
       }
     }