diff --git a/packages/uui-button/lib/uui-button.element.ts b/packages/uui-button/lib/uui-button.element.ts
index 74bd87743..b22a168c5 100644
--- a/packages/uui-button/lib/uui-button.element.ts
+++ b/packages/uui-button/lib/uui-button.element.ts
@@ -322,7 +322,6 @@ export class UUIButtonElement extends FormControlMixin(
       }
       #icon-check,
       #icon-wrong {
-        fill: currentColor;
         display: grid;
         place-items: center;
         width: 1.5em;
diff --git a/packages/uui-checkbox/lib/uui-checkbox.element.ts b/packages/uui-checkbox/lib/uui-checkbox.element.ts
index 40c828139..b88432f8e 100644
--- a/packages/uui-checkbox/lib/uui-checkbox.element.ts
+++ b/packages/uui-checkbox/lib/uui-checkbox.element.ts
@@ -100,7 +100,7 @@ export class UUICheckboxElement extends UUIBooleanInputElement {
         height: 1em;
         line-height: 0;
         transition: fill 120ms, opacity 120ms;
-        fill: var(--uui-color-selected-contrast);
+        color: var(--uui-color-selected-contrast);
         opacity: 0;
       }
 
@@ -166,13 +166,13 @@ export class UUICheckboxElement extends UUIBooleanInputElement {
         background-color: var(--uui-color-disabled);
       }
       :host([disabled]) #ticker #icon-check {
-        fill: var(--uui-color-disabled-contrast);
+        color: var(--uui-color-disabled-contrast);
       }
       :host([disabled]) label:active #ticker {
         animation: ${UUIHorizontalShakeAnimationValue};
       }
       :host([disabled]) input:checked + #ticker #icon-check {
-        fill: var(--uui-color-disabled-contrast);
+        color: var(--uui-color-disabled-contrast);
       }
     `,
   ];
diff --git a/packages/uui-color-swatch/lib/uui-color-swatch.element.ts b/packages/uui-color-swatch/lib/uui-color-swatch.element.ts
index aaa513631..262839616 100644
--- a/packages/uui-color-swatch/lib/uui-color-swatch.element.ts
+++ b/packages/uui-color-swatch/lib/uui-color-swatch.element.ts
@@ -110,7 +110,7 @@ export class UUIColorSwatchElement extends LabelMixin(
             this.value})"></div>
           <div
             class="color-swatch__check"
-            style="fill: var(--uui-swatch-color, ${this.color ?? this.value})">
+            style="color: var(--uui-swatch-color, ${this.color ?? this.value})">
             ${iconCheck}
           </div>
         </div>
diff --git a/packages/uui-toggle/lib/uui-toggle.element.ts b/packages/uui-toggle/lib/uui-toggle.element.ts
index 4e554449d..62f62335b 100644
--- a/packages/uui-toggle/lib/uui-toggle.element.ts
+++ b/packages/uui-toggle/lib/uui-toggle.element.ts
@@ -6,7 +6,7 @@ import { defineElement } from '@umbraco-ui/uui-base/lib/registration';
 import { UUIBooleanInputElement } from '@umbraco-ui/uui-boolean-input/lib';
 import {
   iconCheck,
-  iconWrong,
+  iconRemove,
 } from '@umbraco-ui/uui-icon-registry-essential/lib/svgs';
 import { css, html } from 'lit';
 
@@ -39,8 +39,8 @@ export class UUIToggleElement extends UUIBooleanInputElement {
   renderCheckbox() {
     return html`
       <div id="slider">
-        <div id="icon-check">${iconCheck}</div>
-        <div id="icon-wrong">${iconWrong}</div>
+        <div id="icon-checked">${iconCheck}</div>
+        <div id="icon-unchecked">${iconRemove}</div>
       </div>
     `;
   }
@@ -102,29 +102,29 @@ export class UUIToggleElement extends UUIBooleanInputElement {
         background-color: var(--uui-color-selected-emphasis);
       }
 
-      #icon-check,
-      #icon-wrong {
+      #icon-checked,
+      #icon-unchecked {
         position: absolute;
         vertical-align: middle;
         width: 1em;
         height: 1em;
         line-height: 0;
-        transition: fill 120ms;
+        transition: color 120ms;
       }
 
-      #icon-check {
+      #icon-checked {
         margin-left: -0.5em;
         left: calc(var(--uui-toggle-size) * 0.5);
-        fill: var(--uui-color-interactive);
+        color: var(--uui-color-interactive);
       }
 
-      #icon-wrong {
+      #icon-unchecked {
         margin-right: -0.5em;
         right: calc(var(--uui-toggle-size) * 0.5);
-        fill: var(--uui-color-interactive);
+        color: var(--uui-color-interactive);
       }
-      input:checked ~ #slider #icon-check {
-        fill: var(--uui-color-selected-contrast);
+      input:checked ~ #slider #icon-checked {
+        color: var(--uui-color-selected-contrast);
       }
 
       #slider::after {
@@ -164,14 +164,14 @@ export class UUIToggleElement extends UUIBooleanInputElement {
       :host([disabled]) #slider::after {
         background-color: var(--uui-color-disabled);
       }
-      :host([disabled]) #slider #icon-wrong {
-        fill: var(--uui-color-disabled-contrast);
+      :host([disabled]) #slider #icon-unchecked {
+        color: var(--uui-color-disabled-contrast);
       }
       :host([disabled]) label:active #slider {
         animation: ${UUIHorizontalShakeAnimationValue};
       }
-      :host([disabled]) input:checked #slider #icon-check {
-        fill: var(--uui-color-disabled-contrast);
+      :host([disabled]) input:checked #slider #icon-checked {
+        color: var(--uui-color-disabled-contrast);
       }
 
       :host(:not([pristine]):invalid) #slider,