diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79003594..4bf58f56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Moved `SvgIcons` argument from global scope to frontend and adminthtml scope
+
 ## [2.1.2] - 2024-10-07
 ### Changed
 - Update Lucide icons to v0.446
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100644
index 00000000..be26a0d1
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"
+>
+    <type name="Hyva\Theme\ViewModel\SvgIcons">
+        <arguments>
+            <argument name="pathPrefixMapping" xsi:type="array">
+                <item name="lucide" xsi:type="string">Siteation_HyvaIconsLucide::svg/lucide</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/etc/di.xml b/etc/di.xml
index 65ae7a60..c19292ac 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -8,11 +8,4 @@
             <argument name="iconPathPrefix" xsi:type="string">Siteation_HyvaIconsLucide::svg/lucide</argument>
         </arguments>
     </type>
-    <type name="Hyva\Theme\ViewModel\SvgIcons">
-        <arguments>
-            <argument name="pathPrefixMapping" xsi:type="array">
-                <item name="lucide" xsi:type="string">Siteation_HyvaIconsLucide::svg/lucide</item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
new file mode 100644
index 00000000..be26a0d1
--- /dev/null
+++ b/etc/frontend/di.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"
+>
+    <type name="Hyva\Theme\ViewModel\SvgIcons">
+        <arguments>
+            <argument name="pathPrefixMapping" xsi:type="array">
+                <item name="lucide" xsi:type="string">Siteation_HyvaIconsLucide::svg/lucide</item>
+            </argument>
+        </arguments>
+    </type>
+</config>