diff --git a/packages/components/bolt-icon/src/icon.twig b/packages/components/bolt-icon/src/icon.twig
index defe379f8f..040df2b915 100644
--- a/packages/components/bolt-icon/src/icon.twig
+++ b/packages/components/bolt-icon/src/icon.twig
@@ -18,6 +18,13 @@
       {% include "@bolt-components-icons/#{name}.svg" %}
     {% endset %}
 
-    {{ svgIcon | replace({'<svg ': '<svg ' ~ 'class="' ~ attributes.class ~ '"'}) }}
+    {{ svgIcon
+      | replace('/fill="((?!.*(none|#FFFFFF))[^"]+)"/', 'fill="var(--bolt-theme-icon, currentColor)"')
+      | replace('fill="#FFFFFF', 'fill="rgba(var(--bolt-theme-background), 1)"')
+      | replace('<svg ', '<svg ' ~ 'class="' ~ attributes.class ~ '"')
+      | replace('/<!--(.*)-->/Uis', '')
+      | replace('/height="([^"]+)"/', '')
+      | replace('/width="([^"]+)"/', '')
+    }}
   {% endif %}
 </bolt-icon>