diff --git a/scss/form/_check.scss b/scss/form/_check.scss
index 10a16ff..c0681a3 100644
--- a/scss/form/_check.scss
+++ b/scss/form/_check.scss
@@ -68,17 +68,17 @@
         border-color: color(check-background, form);
 
         &[type='radio'] {
-          @include field-icon($form-radio-icon, color(check-foreground, form));
+          @include field-icon($form-radio-icon, color(check-foreground, form, true));
         }
 
         &[type='checkbox'] {
-          @include field-icon($form-checkbox-icon, color(check-foreground, form));
+          @include field-icon($form-checkbox-icon, color(check-foreground, form, true));
         }
       }
 
       &:indeterminate {
         &[type='checkbox'] {
-          @include field-icon($form-checkbox-indeterminate-icon, color(check-foreground, form));
+          @include field-icon($form-checkbox-indeterminate-icon, color(check-foreground, form, true));
           background-color: color(check-background, form);
           border-color: color(check-background, form);
         }
diff --git a/scss/form/_control.scss b/scss/form/_control.scss
index f8e9796..6181a83 100644
--- a/scss/form/_control.scss
+++ b/scss/form/_control.scss
@@ -88,7 +88,7 @@
       }
 
       &--valid {
-        @include field-icon($form-valid-icon, map.get($colors, alert, success));
+        @include field-icon($form-valid-icon, color(success, alert, true));
         border-color: color(success, alert);
 
         &:focus {
@@ -100,7 +100,7 @@
       }
 
       &--invalid {
-        @include field-icon($form-invalid-icon, map.get($colors, alert, danger));
+        @include field-icon($form-invalid-icon, color(danger, alert, true));
         border-color: color(danger, alert);
 
         &:focus {
@@ -140,7 +140,7 @@
   @if ($has-select) {
     select#{$selector} {
       &:not([multiple]):not([size]) {
-        @include field-icon($select-icon, map.get($colors, form, select-foreground));
+        @include field-icon($select-icon, color(select-foreground, form, true));
         background-position: center right $select-icon-right-offset;
         background-repeat: no-repeat;
         background-size: $select-icon-width auto;
diff --git a/scss/form/_switch.scss b/scss/form/_switch.scss
index 317b2c4..a0593c1 100644
--- a/scss/form/_switch.scss
+++ b/scss/form/_switch.scss
@@ -37,7 +37,7 @@
 
   @at-root {
     #{$input} {
-      @include field-icon($form-switch-icon, color(border, form));
+      @include field-icon($form-switch-icon, color(border, form, true));
       appearance: none;
       background-color: color(background, form);
       background-position: left center;
@@ -63,7 +63,7 @@
       }
 
       &:checked {
-        @include field-icon($form-switch-icon, white);
+        @include field-icon($form-switch-icon, color(check-foreground, form, true));
         background-color: color(check-background, form);
         background-position: right center;
         border-color: color(check-background, form);