diff --git a/src/core/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap b/src/core/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
index b02ff2ce35..3faf92dc86 100644
--- a/src/core/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
+++ b/src/core/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
@@ -283,9 +283,9 @@ exports[`calling render with the same component on the same container does not r
       <svg
         aria-hidden="true"
         class="fi-breadcrumb_icon c6"
+        fill="hsl(0, 0%, 16%)"
         focusable="false"
         height="1em"
-        style="fill: hsl(202, 7%, 40%);"
         viewBox="0 0 24 24"
         width="1em"
       >
@@ -306,9 +306,9 @@ exports[`calling render with the same component on the same container does not r
       <svg
         aria-hidden="true"
         class="fi-breadcrumb_icon c6"
+        fill="hsl(0, 0%, 16%)"
         focusable="false"
         height="1em"
-        style="fill: hsl(202, 7%, 40%);"
         viewBox="0 0 24 24"
         width="1em"
       >
diff --git a/src/core/Form/SearchInput/__snapshots__/SearchInput.test.tsx.snap b/src/core/Form/SearchInput/__snapshots__/SearchInput.test.tsx.snap
index 1e4a53abe0..53373420be 100644
--- a/src/core/Form/SearchInput/__snapshots__/SearchInput.test.tsx.snap
+++ b/src/core/Form/SearchInput/__snapshots__/SearchInput.test.tsx.snap
@@ -208,9 +208,9 @@ exports[`calling render with the same component on the same container does not r
     <svg
       aria-hidden="true"
       class="fi-search-input_icon c5"
+      fill="hsl(202, 7%, 40%)"
       focusable="false"
       height="1em"
-      style="fill: hsl(202, 7%, 40%);"
       viewBox="0 0 24 24"
       width="1em"
     >
diff --git a/src/core/Icon/__snapshots__/Icon.test.tsx.snap b/src/core/Icon/__snapshots__/Icon.test.tsx.snap
index b19ae1be7e..e2c7da5f43 100644
--- a/src/core/Icon/__snapshots__/Icon.test.tsx.snap
+++ b/src/core/Icon/__snapshots__/Icon.test.tsx.snap
@@ -11,9 +11,9 @@ exports[`calling render with the same component on the same container does not r
     aria-label="Test label"
     class="my-icon--test c0"
     data-testid="icon"
+    fill="hsl(202, 7%, 40%)"
     height="1em"
     role="img"
-    style="fill: hsl(202, 7%, 40%);"
     viewBox="0 0 24 24"
     width="1em"
   >
@@ -24,9 +24,9 @@ exports[`calling render with the same component on the same container does not r
   <svg
     aria-hidden="true"
     class="c0"
+    fill="hsl(202, 7%, 40%)"
     focusable="false"
     height="1em"
-    style="fill: hsl(202, 7%, 40%);"
     viewBox="0 0 24 24"
     width="1em"
   >
diff --git a/src/core/Link/__snapshots__/LinkExternal.test.tsx.snap b/src/core/Link/__snapshots__/LinkExternal.test.tsx.snap
index 6d41877752..a381e6c838 100644
--- a/src/core/Link/__snapshots__/LinkExternal.test.tsx.snap
+++ b/src/core/Link/__snapshots__/LinkExternal.test.tsx.snap
@@ -161,9 +161,9 @@ exports[`calling render with the same component on the same container does not r
   <svg
     aria-hidden="true"
     class="fi-link_icon c5"
+    fill="currentColor"
     focusable="false"
     height="1em"
-    style="fill: hsl(202, 7%, 40%);"
     viewBox="0 0 24 24"
     width="1em"
   >
diff --git a/src/core/Panel/__snapshots__/PanelExpansion.test.tsx.snap b/src/core/Panel/__snapshots__/PanelExpansion.test.tsx.snap
index bb107bddbc..21f3b8ebc4 100644
--- a/src/core/Panel/__snapshots__/PanelExpansion.test.tsx.snap
+++ b/src/core/Panel/__snapshots__/PanelExpansion.test.tsx.snap
@@ -262,9 +262,9 @@ exports[`calling render with the same component on the same container does not r
     <svg
       aria-hidden="true"
       class="fi-panel-expansion_title-icon c5"
+      fill="hsl(212, 63%, 45%)"
       focusable="false"
       height="1em"
-      style="fill: hsl(202, 7%, 40%);"
       viewBox="0 0 24 24"
       width="1em"
     >
diff --git a/src/core/theme/__snapshots__/tokens.test.tsx.snap b/src/core/theme/__snapshots__/tokens.test.tsx.snap
index b431675a73..ba66a96451 100644
--- a/src/core/theme/__snapshots__/tokens.test.tsx.snap
+++ b/src/core/theme/__snapshots__/tokens.test.tsx.snap
@@ -396,9 +396,9 @@ exports[`snapshot testing 1`] = `
         <svg
           aria-hidden="true"
           class="fi-panel-expansion_title-icon c8"
+          fill="hsl(212, 63%, 45%)"
           focusable="false"
           height="1em"
-          style="fill: hsl(202, 7%, 40%);"
           viewBox="0 0 24 24"
           width="1em"
         >
@@ -429,9 +429,9 @@ exports[`snapshot testing 1`] = `
         <svg
           aria-hidden="true"
           class="fi-panel-expansion_title-icon c8"
+          fill="hsl(212, 63%, 45%)"
           focusable="false"
           height="1em"
-          style="fill: hsl(202, 7%, 40%);"
           viewBox="0 0 24 24"
           width="1em"
         >
@@ -462,9 +462,9 @@ exports[`snapshot testing 1`] = `
         <svg
           aria-hidden="true"
           class="fi-panel-expansion_title-icon c8"
+          fill="hsl(212, 63%, 45%)"
           focusable="false"
           height="1em"
-          style="fill: hsl(202, 7%, 40%);"
           viewBox="0 0 24 24"
           width="1em"
         >