diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Icons.html b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons_sprite.svg
similarity index 92%
rename from public/typo3conf/ext/ep_theme/Resources/Private/Partials/Icons.html
rename to public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons_sprite.svg
index 35bae81a..87f5f96a 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Icons.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons_sprite.svg
@@ -1,54 +1,54 @@
-<svg class="hidden">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Symbols -->
-    <symbol id="icon-menu" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></symbol>
-    <symbol id="icon-chevron-down" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></symbol>
-    <symbol id="icon-chevron-up" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7"></path></symbol>
-    <symbol id="icon-chevron-right" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path></symbol>
-    <symbol id="icon-chevron-left" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path></symbol>
-    <symbol id="icon-arrow-right" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 5l7 7m0 0l-7 7m7-7H3"></path></symbol>
-    <symbol id="icon-arrow-circle-right" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-8.707l-3-3a1 1 0 00-1.414 1.414L10.586 9H7a1 1 0 100 2h3.586l-1.293 1.293a1 1 0 101.414 1.414l3-3a1 1 0 000-1.414z" clip-rule="evenodd"></path></symbol>
-    <symbol id="icon-arrow-circle-left" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm.707-10.293a1 1 0 00-1.414-1.414l-3 3a1 1 0 000 1.414l3 3a1 1 0 001.414-1.414L9.414 11H13a1 1 0 100-2H9.414l1.293-1.293z" clip-rule="evenodd"></path></symbol>
-    <symbol id="icon-minus-circle" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z"></path></symbol>
-    <symbol id="icon-plus-circle" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-11a1 1 0 10-2 0v2H7a1 1 0 100 2h2v2a1 1 0 102 0v-2h2a1 1 0 100-2h-2V7z" clip-rule="evenodd"></path></symbol>
-    <symbol id="icon-info-circle" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></symbol>
-    <symbol id="icon-help-circle" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd"></path></symbol>
-    <symbol id="icon-home" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path></symbol>
-    <symbol id="icon-user" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path></symbol>
-    <symbol id="icon-user-group" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"></path></symbol>
-    <symbol id="icon-euro" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.121 15.536c-1.171 1.952-3.07 1.952-4.242 0-1.172-1.953-1.172-5.119 0-7.072 1.171-1.952 3.07-1.952 4.242 0M8 10.5h4m-4 3h4m9-1.5a9 9 0 11-18 0 9 9 0 0118 0z"></path></symbol>
-    <symbol id="icon-airplane" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 19l9 2-9-18-9 18 9-2zm0 0v-8"></path></symbol>
-    <symbol id="icon-search" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path></symbol>
-    <symbol id="icon-close" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path></symbol>
-    <symbol id="icon-check" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path></symbol>
-    <symbol id="icon-heart" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"></path></symbol>
-    <symbol id="icon-calendar" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path></symbol>
-    <symbol id="icon-phone" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5a2 2 0 012-2h3.28a1 1 0 01.948.684l1.498 4.493a1 1 0 01-.502 1.21l-2.257 1.13a11.042 11.042 0 005.516 5.516l1.13-2.257a1 1 0 011.21-.502l4.493 1.498a1 1 0 01.684.949V19a2 2 0 01-2 2h-1C9.716 21 3 14.284 3 6V5z"></path></symbol>
-    <symbol id="icon-email" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"></path></symbol>
-    <symbol id="icon-tag" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M17.707 9.293a1 1 0 010 1.414l-7 7a1 1 0 01-1.414 0l-7-7A.997.997 0 012 10V5a3 3 0 013-3h5c.256 0 .512.098.707.293l7 7zM5 6a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd"></path></symbol>
-    <symbol id="icon-faq" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></symbol>
+    <symbol id="icon-menu" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"/></symbol>
+    <symbol id="icon-chevron-down" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/></symbol>
+    <symbol id="icon-chevron-up" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 15l7-7 7 7"/></symbol>
+    <symbol id="icon-chevron-right" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/></symbol>
+    <symbol id="icon-chevron-left" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/></symbol>
+    <symbol id="icon-arrow-right" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 5l7 7m0 0l-7 7m7-7H3"/></symbol>
+    <symbol id="icon-arrow-circle-right" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-8.707l-3-3a1 1 0 00-1.414 1.414L10.586 9H7a1 1 0 100 2h3.586l-1.293 1.293a1 1 0 101.414 1.414l3-3a1 1 0 000-1.414z" clip-rule="evenodd"/></symbol>
+    <symbol id="icon-arrow-circle-left" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm.707-10.293a1 1 0 00-1.414-1.414l-3 3a1 1 0 000 1.414l3 3a1 1 0 001.414-1.414L9.414 11H13a1 1 0 100-2H9.414l1.293-1.293z" clip-rule="evenodd"/></symbol>
+    <symbol id="icon-minus-circle" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z"/></symbol>
+    <symbol id="icon-plus-circle" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-11a1 1 0 10-2 0v2H7a1 1 0 100 2h2v2a1 1 0 102 0v-2h2a1 1 0 100-2h-2V7z" clip-rule="evenodd"/></symbol>
+    <symbol id="icon-info-circle" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></symbol>
+    <symbol id="icon-help-circle" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd"/></symbol>
+    <symbol id="icon-home" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"/></symbol>
+    <symbol id="icon-user" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/></symbol>
+    <symbol id="icon-user-group" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"/></symbol>
+    <symbol id="icon-euro" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.121 15.536c-1.171 1.952-3.07 1.952-4.242 0-1.172-1.953-1.172-5.119 0-7.072 1.171-1.952 3.07-1.952 4.242 0M8 10.5h4m-4 3h4m9-1.5a9 9 0 11-18 0 9 9 0 0118 0z"/></symbol>
+    <symbol id="icon-airplane" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 19l9 2-9-18-9 18 9-2zm0 0v-8"/></symbol>
+    <symbol id="icon-search" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/></symbol>
+    <symbol id="icon-close" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></symbol>
+    <symbol id="icon-check" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"/></symbol>
+    <symbol id="icon-heart" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"/></symbol>
+    <symbol id="icon-calendar" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"/></symbol>
+    <symbol id="icon-phone" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 5a2 2 0 012-2h3.28a1 1 0 01.948.684l1.498 4.493a1 1 0 01-.502 1.21l-2.257 1.13a11.042 11.042 0 005.516 5.516l1.13-2.257a1 1 0 011.21-.502l4.493 1.498a1 1 0 01.684.949V19a2 2 0 01-2 2h-1C9.716 21 3 14.284 3 6V5z"/></symbol>
+    <symbol id="icon-email" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/></symbol>
+    <symbol id="icon-tag" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M17.707 9.293a1 1 0 010 1.414l-7 7a1 1 0 01-1.414 0l-7-7A.997.997 0 012 10V5a3 3 0 013-3h5c.256 0 .512.098.707.293l7 7zM5 6a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd"/></symbol>
+    <symbol id="icon-faq" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.228 9c.549-1.165 2.03-2 3.772-2 2.21 0 4 1.343 4 3 0 1.4-1.278 2.575-3.006 2.907-.542.104-.994.54-.994 1.093m0 3h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></symbol>
     <symbol id="icon-bed" fill="currentColor" stroke="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!-- Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M176 256c44.11 0 80-35.89 80-80s-35.89-80-80-80-80 35.89-80 80 35.89 80 80 80zm352-128H304c-8.84 0-16 7.16-16 16v144H64V80c0-8.84-7.16-16-16-16H16C7.16 64 0 71.16 0 80v352c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16v-48h512v48c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16V240c0-61.86-50.14-112-112-112z"/></symbol>
     <symbol id="icon-bus" fill="currentColor" stroke="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M488 128h-8V80c0-44.8-99.2-80-224-80S32 35.2 32 80v48h-8c-13.25 0-24 10.74-24 24v80c0 13.25 10.75 24 24 24h8v160c0 17.67 14.33 32 32 32v32c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-32h192v32c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-32h6.4c16 0 25.6-12.8 25.6-25.6V256h8c13.25 0 24-10.75 24-24v-80c0-13.26-10.75-24-24-24zM112 400c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32zm16-112c-17.67 0-32-14.33-32-32V128c0-17.67 14.33-32 32-32h256c17.67 0 32 14.33 32 32v128c0 17.67-14.33 32-32 32H128zm272 112c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32z"/></symbol>
-    <symbol id="icon-location-marker" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"></path><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"></path></symbol>
+    <symbol id="icon-location-marker" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"/><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"/></symbol>
     <symbol id="icon-ski" fill="currentColor" stroke="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M432 96c26.5 0 48-21.5 48-48S458.5 0 432 0s-48 21.5-48 48 21.5 48 48 48zm-312-4.4l-11.5 22.5c14.4 7.3 31.1 4.9 42.8-4.8L284 175.5l61.1-24.4 14.1 42.3c3.4 10.1 10.5 18.3 20.1 23.1l58.1 29c11.9 6 26.3 1.1 32.2-10.7 5.9-11.9 1.1-26.3-10.8-32.2L403.6 175l-18.1-54.4c-4.9-14.6-15.6-26.6-29.6-33.1-14-6.5-30.1-6.9-44.3-1.2l-74.5 29.8-72.2-35.8c.3-14.5-7.2-28.5-20.9-35.6l-11.1 21.7h-.3l-34.4-7c-1.8-.4-3.7.2-5 1.7-1.9 2.2-1.7 5.5.5 7.4L120 91.6zM505 452c-9.4-9.4-24.6-9.3-33.9 0-12.1 12.1-30.7 15.3-45.1 8.7l-143-73.9 49.7-74.6c10.6-15.8 8.5-37.1-5-50.5l-57.2-57.2-76.9-38.1c-1.6 16.6 3.8 33 15.7 44.9l79.8 79.8-49.1 73.6-205-106c-11.9-6.1-26.3-1.5-32.3 10.3-6.1 11.8-1.5 26.3 10.3 32.3l391.9 202.5c11.9 5.5 24.5 8.1 37.1 8.1 23.2 0 46.1-9 63-26 9.3-9.3 9.3-24.5 0-33.9z"/></symbol>
     <symbol id="icon-mountain" fill="currentColor" stroke="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!-- Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M634.92 462.7l-288-448C341.03 5.54 330.89 0 320 0s-21.03 5.54-26.92 14.7l-288 448a32.001 32.001 0 0 0-1.17 32.64A32.004 32.004 0 0 0 32 512h576c11.71 0 22.48-6.39 28.09-16.67a31.983 31.983 0 0 0-1.17-32.63zM61.31 464l131.77-204.98L256 321.94 329.94 248h109.9L578.7 464H61.31zM320 61.59L408.98 200h-98.92L256 254.06l-36.36-36.36L320 61.59z"/></symbol>
     <symbol id="icon-lift" fill="currentColor" stroke="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M112 128c26.5 0 48-21.5 48-48s-21.5-48-48-48-48 21.5-48 48 21.5 48 48 48zM256 0h-32v216l32-8V0zm-64.4 381.4c12.6-4.2 19.4-17.8 15.2-30.4-4.2-12.6-17.7-19.5-30.4-15.2L158 342c-19 6.4-40-2.5-48.7-20.7l-63.6-133c-5.7-11.9-20-17-32-11.3-12 5.7-17 20-11.3 32L66 342c15 31.2 46.4 50 79.5 50 12.6 0 17-.9 46.1-10.6zM488 288c-13.2 0-24 10.8-24 24 0 13.9-8.8 26.5-21.8 31.3L312 391.5V256c0-15.8-15-27-29.8-23.3l-93.5 23.4-39.7-85.5c-7.4-16-26.3-23.1-42.5-15.6-12.6 5.8-24.1 24.2-15.7 42.5l47.3 100.6c4.8 10.5 16.5 16.1 27.6 13.2l98.2-24.5v122.5l-152.3 56.3c-12.4 4.6-18.8 18.4-14.2 30.8 3.6 9.7 12.8 15.7 22.5 15.7 2.8 0 5.6-.5 8.3-1.5l330.5-122.1c31.8-11.8 53.2-42.5 53.2-76.4.1-13.3-10.7-24.1-23.9-24.1z"/></symbol>
-    <symbol id="icon-concept" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"></path></symbol>
-    <symbol id="icon-emoji-happy" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.828 14.828a4 4 0 01-5.656 0M9 10h.01M15 10h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></symbol>
-    <symbol id="icon-emoji-sad" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.172 16.172a4 4 0 015.656 0M9 10h.01M15 10h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></symbol>
+    <symbol id="icon-concept" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/></symbol>
+    <symbol id="icon-emoji-happy" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.828 14.828a4 4 0 01-5.656 0M9 10h.01M15 10h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></symbol>
+    <symbol id="icon-emoji-sad" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.172 16.172a4 4 0 015.656 0M9 10h.01M15 10h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></symbol>
     <symbol id="icon-spinner" fill="currentColor" stroke="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
         <g>
-            <path d="M109.25 55.5h-36l12-12a29.54 29.54 0 0 0-49.53 12H18.75A46.04 46.04 0 0 1 96.9 31.84l12.35-12.34v36zm-90.5 17h36l-12 12a29.54 29.54 0 0 0 49.53-12h16.97A46.04 46.04 0 0 1 31.1 96.16L18.74 108.5v-36z"></path>
-            <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="360 64 64" dur="960ms" repeatCount="indefinite"></animateTransform>
+            <path d="M109.25 55.5h-36l12-12a29.54 29.54 0 0 0-49.53 12H18.75A46.04 46.04 0 0 1 96.9 31.84l12.35-12.34v36zm-90.5 17h36l-12 12a29.54 29.54 0 0 0 49.53-12h16.97A46.04 46.04 0 0 1 31.1 96.16L18.74 108.5v-36z"/>
+            <animateTransform attributeName="transform" type="rotate" from="0 64 64" to="360 64 64" dur="960ms" repeatCount="indefinite"/>
         </g>
     </symbol>
     <symbol id="icon-teaser-grid" fill="currentColor" stroke="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-        <rect x="0" y="0" width="45" height="45"></rect>
-        <rect x="55" y="0" width="45" height="45"></rect>
-        <rect x="0" y="55" width="45" height="45"></rect>
-        <rect x="55" y="55" width="45" height="45"></rect>
+        <rect x="0" y="0" width="45" height="45"/>
+        <rect x="55" y="0" width="45" height="45"/>
+        <rect x="0" y="55" width="45" height="45"/>
+        <rect x="55" y="55" width="45" height="45"/>
     </symbol>
     <symbol id="icon-teaser-single" fill="currentColor" stroke="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-        <rect x="0" y="0" width="100" height="100"></rect>
+        <rect x="0" y="0" width="100" height="100"/>
     </symbol>
     <symbol id="icon-virus" fill="currentColor" stroke="none" viewBox="0 0 512 512"><!-- Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M483.55,227.55H462c-50.68,0-76.07-61.27-40.23-97.11L437,115.19A28.44,28.44,0,0,0,396.8,75L381.56,90.22c-35.84,35.83-97.11,10.45-97.11-40.23V28.44a28.45,28.45,0,0,0-56.9,0V50c0,50.68-61.27,76.06-97.11,40.23L115.2,75A28.44,28.44,0,0,0,75,115.19l15.25,15.25c35.84,35.84,10.45,97.11-40.23,97.11H28.45a28.45,28.45,0,1,0,0,56.89H50c50.68,0,76.07,61.28,40.23,97.12L75,396.8A28.45,28.45,0,0,0,115.2,437l15.24-15.25c35.84-35.84,97.11-10.45,97.11,40.23v21.54a28.45,28.45,0,0,0,56.9,0V462c0-50.68,61.27-76.07,97.11-40.23L396.8,437A28.45,28.45,0,0,0,437,396.8l-15.25-15.24c-35.84-35.84-10.45-97.12,40.23-97.12h21.54a28.45,28.45,0,1,0,0-56.89ZM224,272a48,48,0,1,1,48-48A48,48,0,0,1,224,272Zm80,56a24,24,0,1,1,24-24A24,24,0,0,1,304,328Z"/></symbol>
     <!-- Flags -->
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js
index 23ba02f4..ae6dba23 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/pricetable_controller.js
@@ -16,6 +16,7 @@ export default class extends Controller {
     static values = {
         mode: String,
         showAllRows: Boolean,
+        iconSpriteUrl: String,
     }
 
     initialize() {
@@ -72,7 +73,7 @@ export default class extends Controller {
         }
         if (this.hasRowToggleLabelTarget && this.hasRowToggleIconTarget) {
             this.rowToggleLabelTarget.innerText = this.showAllRowsValue ? 'weniger Termine anzeigen' : 'alle Termine anzeigen'
-            this.rowToggleIconTarget.setAttribute('href', this.showAllRowsValue ? '#icon-minus-circle' : '#icon-plus-circle')
+            this.rowToggleIconTarget.setAttribute('href', this.showAllRowsValue ? `${this.iconSpriteUrlValue}#icon-minus-circle` : `${this.iconSpriteUrlValue}#icon-plus-circle`)
         }
     }
 
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html
index 2dfc497b..34a4f9de 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Detail.html
@@ -13,5 +13,4 @@
     <f:render partial="Topnav" arguments="{_all}"/>
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html
index 5cc46e7d..205e5243 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Frontpage.html
@@ -16,5 +16,4 @@
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Search/MobileSearch" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html
index 9241ad9b..0f32426d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/FrontpageEvent.html
@@ -11,5 +11,4 @@
     <f:render partial="Topnav" arguments="{_all}"/>
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Popup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Popup.html
index 8ff7b8d9..c0d8ba93 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Popup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Popup.html
@@ -4,5 +4,4 @@
 
     <f:render section="Content"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html
index 0f59e1f7..c7511022 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Search.html
@@ -9,5 +9,4 @@
     <f:render partial="Topnav" arguments="{_all}"/>
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html
index 3f80b3ad..94b8d6a0 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html
@@ -18,5 +18,4 @@
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Search/MobileSearch" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html
index c7f5cfd7..49ab78f4 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html
@@ -26,5 +26,4 @@
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Search/MobileSearch" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html
index a223d60a..b5df1927 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeftEvent.html
@@ -19,5 +19,4 @@
     <f:render partial="Topnav" arguments="{_all}"/>
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html
index ab2510c7..4c50d5d7 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html
@@ -26,5 +26,4 @@
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Search/MobileSearch" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html
index 0d24681f..d0e1c39c 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRightEvent.html
@@ -19,5 +19,4 @@
     <f:render partial="Topnav" arguments="{_all}"/>
     <f:render partial="Mobilenav" section="Main" arguments="{_all}"/>
     <f:render partial="Config" arguments="{_all}" />
-    <f:render partial="Icons" arguments="{_all}"/>
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html
index eeb5b668..e2931779 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html
@@ -8,7 +8,7 @@
                          class="flex flex-col">
             <div class="relative">
                 <svg class="w-8 h-6 absolute top-0 left-0">
-                    <use href="#icon-flag-{city.country.code -> f:format.case(mode: 'lower')}"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{city.country.code -> f:format.case(mode: 'lower')}"></use>
                 </svg>
                 <f:render partial="TeaserImage" arguments="{image: city.teaserImage}"/>
             </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Config.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Config.html
index c3f4003c..a4b00695 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Config.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Config.html
@@ -1,6 +1,7 @@
 <script type="application/json" id="appconfig">
     {
         "loaderUrl": "<f:format.raw>{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/ajax-loader-white.gif', absolute: 1)}</f:format.raw>",
+        "iconSpriteUrl": "<f:format.raw>{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg', absolute: 1)}</f:format.raw>",
         "myEpApiBaseUrl": "<f:format.raw>{settings.myEpApiEndpointUrl}</f:format.raw>",
         "paCode": <f:if condition='{context.paCode}'><f:then>"{context.paCode}"</f:then><f:else>null</f:else></f:if>,
         "externalDomains": <f:format.raw>{settings.domainsToTrack -> v:iterator.explode() -> f:format.json() -> f:format.raw()}</f:format.raw>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html
index 53882a11..d5632ecd 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html
@@ -19,7 +19,7 @@
            title="Telefonische Beratung"
            rel="nofollow">
             <svg class="contact-bar__icon">
-                <use href="#icon-phone"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-phone"></use>
             </svg>
             <div class="hidden md:block">
                 {settings.phoneNumber}
@@ -29,7 +29,7 @@
                       class="contact-bar__item"
                       title="E-Mail">
             <svg class="contact-bar__icon">
-                <use href="#icon-email"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-email"></use>
             </svg>
             <div class="contact-bar__label">
                 {settings.contactFormToEmail}
@@ -41,7 +41,7 @@
            target="_blank"
            rel="nofollow">
             <svg class="contact-bar__icon">
-                <use href="#icon-whatsapp"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-whatsapp"></use>
             </svg>
             <div class="contact-bar__label">
                 {settings.whatsApp}
@@ -52,7 +52,7 @@
            target="_blank"
            rel="nofollow">
             <svg class="contact-bar__icon">
-                <use href="#icon-facebook"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-facebook"></use>
             </svg>
             <div class="contact-bar__label">
                 Facebook
@@ -63,7 +63,7 @@
            target="_blank"
            rel="nofollow">
             <svg class="contact-bar__icon">
-                <use href="#icon-instagram"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-instagram"></use>
             </svg>
             <div class="contact-bar__label">
                 Instagram
@@ -74,7 +74,7 @@
            target="_blank"
            rel="nofollow">
             <svg class="contact-bar__icon">
-                <use href="#icon-youtube"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-youtube"></use>
             </svg>
             <div class="contact-bar__label">
                 Youtube
@@ -83,7 +83,7 @@
         <f:if condition="{settings.englishPageUid}">
             <f:link.typolink parameter="{settings.englishPageUid}" title="English" class="contact-bar__item">
                 <svg class="contact-bar__icon">
-                    <use href="#icon-flag-gb"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-gb"></use>
                 </svg>
                 <div class="contact-bar__label">
                     English
@@ -93,7 +93,7 @@
         <f:if condition="{settings.germanPageUid}">
             <f:link.typolink parameter="{settings.germanPageUid}" title="English" class="contact-bar__item">
                 <svg class="contact-bar__icon">
-                    <use href="#icon-flag-de"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-de"></use>
                 </svg>
                 <div class="contact-bar__label">
                     Deutsch
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
index fb89c245..047dae28 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
@@ -28,7 +28,7 @@
                        rel="nofollow"
                        class="absolute bottom-0 left-1/2 transform -translate-x-1/2 -mb-8 rounded-full py-4 px-6 flex items-center space-x-2 {ep:themeClasses(classes: '{ep: \'bg-ep-secondary\', sbw: \'bg-sbw-secondary\', snz: \'bg-snz-secondary\', uch: \'bg-uch-secondary\'}', key: settings.themekey)}">
                         <svg class="w-10 h-10 text-white">
-                            <use href="#icon-phone"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-phone"></use>
                         </svg>
                         <div class="text-center text-white">
                         <span class="block whitespace-nowrap">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
index 67afda45..77771131 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
@@ -28,7 +28,7 @@
                        rel="nofollow"
                        class="absolute bottom-0 left-1/2 transform -translate-x-1/2 -mb-8 rounded-full py-4 px-6 flex items-center space-x-2 {ep:themeClasses(classes: '{ep: \'bg-ep-secondary\', sbw: \'bg-sbw-secondary\', snz: \'bg-snz-secondary\', uch: \'bg-uch-secondary\'}', key: settings.themekey)}">
                         <svg class="w-10 h-10 text-white">
-                            <use href="#icon-phone"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-phone"></use>
                         </svg>
                         <div class="text-center text-white">
                         <span class="block whitespace-nowrap">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html
index 246f6471..7e37d273 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html
@@ -15,7 +15,7 @@
                             <f:for each="{listItems -> v:iterator.explode(glue: ';')}" as="listItem">
                                 <li class="flex items-center space-x-2 text-white">
                                     <svg class="w-6 h-6">
-                                        <use href="#icon-check"></use>
+                                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-check"></use>
                                     </svg>
                                     <span>{listItem -> f:format.raw()}</span>
                                 </li>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html
index 8c3af782..8843aae8 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html
@@ -14,7 +14,7 @@
             <f:for each="{facts}" as="fact">
                 <li class="flex items-center space-x-2">
                     <svg class="w-6 h-6 text-ep-primary-light">
-                        <use href="#icon-check"></use>
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-check"></use>
                     </svg>
                     <span>{fact.name}</span>
                 </li>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html
index 793430b5..a34e2859 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html
@@ -14,7 +14,7 @@
                                class="bg-transparent border-0 uppercase ring-0 focus:ring-0 placeholder-white text-white"
                                placeholder="Suchbegriff">
                         <svg class="w-6 h-6 text-white">
-                            <use href="#icon-search"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-search"></use>
                         </svg>
                     </div>
                 </f:if>
@@ -28,7 +28,7 @@
                                 data-action="collapse#toggle">
                             <svg class="w-4 h-4 text-white transform transition duration-200 ease-in-out"
                                  data-collapse-target="icon">
-                                <use href="#icon-chevron-right"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-right"></use>
                             </svg>
                             <span>
                                 {faq.question}
@@ -44,7 +44,7 @@
                 <f:if condition="{settings.infoPageUid}">
                     <div class="flex items-center justify-end space-x-2 text-sm text-white">
                         <svg class="w-4 h-4">
-                            <use href="#icon-info-circle"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-info-circle"></use>
                         </svg>
                         <a href="{f:uri.typolink(parameter: settings.infoPageUid)}">
                             Weitere Reiseinfos findet ihr <span class="underline">hier</span>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html
index 997b29a0..29e57103 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html
@@ -37,7 +37,7 @@
                     <div class="flex">
                         <div class="flex items-start space-x-2 pr-4">
                             <svg class="w-12 h-12 text-white">
-                                <use href="#icon-phone"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-phone"></use>
                             </svg>
                             <div class="text-white">
                                 <span class="block uppercase text-xl">
@@ -63,7 +63,7 @@
                     <div class="flex">
                         <div class="flex items-start space-x-2 pr-4">
                             <svg class="w-12 h-12 text-white">
-                                <use href="#icon-whatsapp"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-whatsapp"></use>
                             </svg>
                             <div class="text-white">
                                 <span class="block uppercase text-xl">
@@ -132,7 +132,7 @@
                            rel="nofollow"
                            target="_blank">
                             <svg class="w-6 h-6 text-white">
-                                <use href="#icon-facebook"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-facebook"></use>
                             </svg>
                         </a>
                         <a href="{settings.instagramUrl}"
@@ -140,7 +140,7 @@
                            rel="nofollow"
                            target="_blank">
                             <svg class="w-6 h-6 text-white">
-                                <use href="#icon-instagram"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-instagram"></use>
                             </svg>
                         </a>
                         <a href="{settings.youtubeUrl}"
@@ -148,7 +148,7 @@
                            rel="nofollow"
                            target="_blank">
                             <svg class="w-6 h-6 text-white">
-                                <use href="#icon-youtube"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-youtube"></use>
                             </svg>
                         </a>
                     </div>
@@ -174,7 +174,7 @@
             data-action="scroll-top#scroll"
             class="hidden fixed bottom-0 right-0 mb-16 md:mb-8 mr-4 md:mr-8 z-10 h-10 w-10 flex items-center justify-center rounded bg-ep-secondary-80">
         <svg class="w-8 h-8 text-white">
-            <use href="#icon-chevron-up"></use>
+            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-up"></use>
         </svg>
     </button>
 
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html
index 63809fc0..76d9f6c8 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html
@@ -8,7 +8,7 @@
                          class="flex flex-col">
             <div class="relative">
                 <svg class="w-8 h-6 absolute top-0 left-0">
-                    <use href="#icon-flag-{hotel.country.code -> f:format.case(mode: 'lower')}"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{hotel.country.code -> f:format.case(mode: 'lower')}"></use>
                 </svg>
                 <f:render partial="TeaserImage" arguments="{image: hotel.images.original.0}"/>
             </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ImageGallery.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ImageGallery.html
index b0f66c68..395e9ad5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ImageGallery.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/ImageGallery.html
@@ -6,7 +6,7 @@
          data-controller="lightbox">
         <div class="absolute top-0 right-0 mt-4 mr-4 flex space-x-2 text-white">
             <svg class="w-8 h-8 md:w-10 h-10">
-                <use href="#icon-search"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-search"></use>
             </svg>
             <span class="text-4xl">
                 {images -> f:count()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
index 57665bef..33136888 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
@@ -23,7 +23,7 @@
                             data-overlay-toggle-id-value="mobile-search"
                             data-action="overlay-toggle#invokeToggle">
                         <svg class="w-8 h-8 text-gray-800">
-                            <use href="#icon-search"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-search"></use>
                         </svg>
                     </button>
                     <button type="button"
@@ -32,7 +32,7 @@
                             data-overlay-toggle-id-value="mobilenav"
                             data-action="overlay-toggle#invokeToggle">
                         <svg class="w-8 h-8 text-gray-800">
-                            <use href="#icon-menu"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-menu"></use>
                         </svg>
                     </button>
                 </div>
@@ -52,7 +52,7 @@
                                    title="{topitem.title}">
                                     <span>{topitem.title}</span>
                                     <svg class="ml-1 w-4 h-4 transform group-hover:rotate-180">
-                                        <use href="#icon-chevron-down"></use>
+                                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-down"></use>
                                     </svg>
                                 </a>
                                 <f:render section="SecondLevel" arguments="{topitem: topitem}"/>
@@ -74,14 +74,14 @@
                                     data-controller="searchbar-toggle"
                                     data-action="searchbar-toggle#toggle">
                                 <svg class="w-6 h-6">
-                                    <use href="#icon-search"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-search"></use>
                                 </svg>
                             </button>
                         </f:then>
                         <f:else>
                             <f:link.typolink parameter="{settings.defaultSearchPageUid}">
                                 <svg class="w-6 h-6">
-                                    <use href="#icon-search"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-search"></use>
                                 </svg>
                             </f:link.typolink>
                         </f:else>
@@ -101,7 +101,9 @@
                                 <f:then>
                                     <a href="{subitem.link}" target="_blank" title="{subitem.title}">
                                         <f:if condition="{subitem.data.tx_eptheme_context_country_code}">
-                                            <svg class="block w-8 h-6"><use href="#icon-flag-{subitem.data.tx_eptheme_context_country_code -> f:format.case(mode: 'lower')}"/></svg>
+                                            <svg class="block w-8 h-6">
+                                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{subitem.data.tx_eptheme_context_country_code -> f:format.case(mode: 'lower')}"></use>
+                                            </svg>
                                         </f:if>
                                         <span class="text-gray-800 uppercase lg:text-lg">
                                             {subitem.title}
@@ -113,7 +115,9 @@
                                        class="flex items-center space-x-2 underlined"
                                        title="{subitem.title}">
                                         <f:if condition="{subitem.data.tx_eptheme_context_country_code}">
-                                            <svg class="block w-8 h-6"><use href="#icon-flag-{subitem.data.tx_eptheme_context_country_code -> f:format.case(mode: 'lower')}"/></svg>
+                                            <svg class="block w-8 h-6">
+                                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{subitem.data.tx_eptheme_context_country_code -> f:format.case(mode: 'lower')}"></use>
+                                            </svg>
                                         </f:if>
                                         <span class="text-gray-800 uppercase lg:text-lg">
                                             {subitem.title}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
index bb7024c1..c8a29324 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
@@ -24,7 +24,7 @@
                                     data-overlay-toggle-id-value="search"
                                     data-action="overlay-toggle#invokeToggle">
                                 <svg class="w-8 h-8 text-gray-800">
-                                    <use href="#icon-search"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-search"></use>
                                 </svg>
                             </button>
                         </f:else>
@@ -33,7 +33,7 @@
                             class="focus:outline-none"
                             data-action="overlay-toggle#invokeToggle">
                         <svg class="w-8 h-8">
-                            <use href="#icon-close"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-close"></use>
                         </svg>
                     </button>
                 </div>
@@ -50,7 +50,7 @@
                                         {topitem.title}
                                     </span>
                                     <svg class="h-6 w-6 transform text-white" data-collapse-target="icon">
-                                        <use href="#icon-chevron-down"></use>
+                                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-down"></use>
                                     </svg>
                                 </a>
                                 <f:if condition="{topitem.active}">
@@ -76,7 +76,7 @@
                            title="Anrufen"
                            rel="nofollow">
                             <svg class="w-6 h-6 text-white">
-                                <use href="#icon-phone"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-phone"></use>
                             </svg>
                             <span class="hidden sm:block">
                                 Anrufen
@@ -88,7 +88,7 @@
                            rel="nofollow"
                            target="_blank">
                             <svg class="w-6 h-6 text-white">
-                                <use href="#icon-whatsapp"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-whatsapp"></use>
                             </svg>
                             <span class="hidden sm:block">
                                 Whatsapp
@@ -99,7 +99,7 @@
                                class="button button--primary  flex items-center space-x-2"
                                title="FAQ">
                                 <svg class="w-6 h-6 text-white">
-                                    <use href="#icon-faq"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-faq"></use>
                                 </svg>
                                 <span class="hidden sm:block">
                                     FAQ
@@ -129,7 +129,7 @@
                                     class="focus:outline-none"
                                     data-action="collapse#toggle">
                                 <svg class="h-6 w-6 transform text-white" data-collapse-target="icon">
-                                    <use href="#icon-chevron-down"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-down"></use>
                                 </svg>
                             </button>
                         </f:if>
@@ -142,7 +142,7 @@
                                 class="flex items-center space-x-2 text-lg leading-loose text-white hover:text-white focus:text-white"
                                 title="{subsubitem.title}">
                                     <svg class="w-4 h-4 text-white">
-                                        <use href="#icon-chevron-right"></use>
+                                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-right"></use>
                                     </svg>
                                     <span>{subsubitem.title}</span>
                                 </a>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
index 6e716af3..46e02005 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
@@ -28,20 +28,20 @@
                                         </span>
                                         <div class="flex space-x-4 mt-4">
                                             <svg class="w-8 h-6 md:w-10 md:h-8">
-                                                <use href="#icon-flag-{product.country.code -> f:format.case(mode: 'lower')}"></use>
+                                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{product.country.code -> f:format.case(mode: 'lower')}"></use>
                                             </svg>
                                             <f:if condition="{hotel}">
                                                 <f:then>
                                                     <a href="{ep:gmapsUrl(hotel: hotel)}" target="_blank" class="block bg-ep-primary-light px-2 py-1">
                                                         <svg class="w-4 h-4 md:w-6 md:h-6 text-white">
-                                                            <use href="#icon-location-marker"></use>
+                                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-location-marker"></use>
                                                         </svg>
                                                     </a>
                                                 </f:then>
                                                 <f:else>
                                                     <a href="{ep:gmapsUrl(region: product.region)}" target="_blank" class="block bg-ep-primary-light px-2 py-1">
                                                         <svg class="w-4 h-4 md:w-6 md:h-6 text-white">
-                                                            <use href="#icon-location-marker"></use>
+                                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-location-marker"></use>
                                                         </svg>
                                                     </a>
                                                 </f:else>
@@ -50,7 +50,7 @@
                                         <f:if condition="{referringUrl}">
                                             <a href="{referringUrl}" class="button button--small mt-8">
                                                 <svg class="w-4 h-4 text-white">
-                                                    <use href="#icon-chevron-left"></use>
+                                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-left"></use>
                                                 </svg>
                                                 <span>
                                                     {backlinkLabel}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
index b58cd09d..c507ea1e 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
@@ -25,7 +25,7 @@
                 <div class="flex items-center space-x-2">
                     <f:if condition="{country.code}">
                         <svg class="product-teaser__flag">
-                            <use href="#icon-flag-{country.code -> f:format.case(mode: 'lower')}"/>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{country.code -> f:format.case(mode: 'lower')}"></use>
                         </svg>
                     </f:if>
                     <span class="product-teaser__label-concept">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html
index 7e5a9e9f..5f26c823 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html
@@ -24,7 +24,7 @@
             <div class="flex items-center space-x-2"
                  data-cooltipz-dir="top-left" aria-label="Pisten" role="tooltip">
                 <svg class="w-4 h-4 md:w-6 md:h-6">
-                    <use href="#icon-ski"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-ski"></use>
                 </svg>
                 <span class="text-sm md:text-base whitespace-nowrap">
                     {region.length}
@@ -33,7 +33,7 @@
             <div class="flex items-center space-x-2"
                  data-cooltipz-dir="top-left" aria-label="Höhe" role="tooltip">
                 <svg class="w-4 h-4 md:w-6 md:h-6">
-                    <use href="#icon-mountain"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-mountain"></use>
                 </svg>
                 <span class="text-sm md:text-base whitespace-nowrap">
                     {region.height}
@@ -43,7 +43,7 @@
                 <div class="flex items-center space-x-2"
                      data-cooltipz-dir="top-left" aria-label="Lifte" role="tooltip">
                     <svg class="w-4 h-4 md:w-6 md:h-6">
-                        <use href="#icon-lift"></use>
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-lift"></use>
                     </svg>
                     <span class="text-sm md:text-base whitespace-nowrap">
                         {region.lifts}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html
index 4c71245b..a0f505f2 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html
@@ -8,7 +8,7 @@
                          class="flex flex-col">
             <div class="relative">
                 <svg class="w-8 h-6 absolute top-0 left-0">
-                    <use href="#icon-flag-{region.country.code -> f:format.case(mode: 'lower')}"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{region.country.code -> f:format.case(mode: 'lower')}"></use>
                 </svg>
                 <f:render partial="TeaserImage" arguments="{image: region.teaserImages.0}"/>
             </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Regioninfo.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Regioninfo.html
index 9d917a60..7ec37848 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Regioninfo.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Regioninfo.html
@@ -3,26 +3,30 @@
         Gebietsinfo
     </p>
     <ul>
-        <li class="flex items-center space-x-2">
-            <svg class="w-4 h-4">
-                <use href="#icon-ski"></use>
-            </svg>
-            <span>
-                Pisten: {region.length}
-            </span>
-        </li>
-        <li class="flex items-center space-x-2">
-            <svg class="w-4 h-4">
-                <use href="#icon-mountain"></use>
-            </svg>
-            <span>
-                Höhe: {region.height}
-            </span>
-        </li>
+        <f:if condition="{region.length}">
+            <li class="flex items-center space-x-2">
+                <svg class="w-4 h-4">
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-ski"></use>
+                </svg>
+                <span>
+                    Pisten: {region.length}
+                </span>
+            </li>
+        </f:if>
+        <f:if condition="{region.height}">
+            <li class="flex items-center space-x-2">
+                <svg class="w-4 h-4">
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-mountain"></use>
+                </svg>
+                <span>
+                    Höhe: {region.height}
+                </span>
+            </li>
+        </f:if>
         <f:if condition="{region.lifts}">
             <li class="flex items-center space-x-2">
                 <svg class="w-4 h-4">
-                    <use href="#icon-lift"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-lift"></use>
                 </svg>
                 <span>
                     Lifte: {region.lifts}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html
index 4c704ae9..eb847d4f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html
@@ -10,14 +10,14 @@
                 data-action="click->collapse#toggle"
                 class="flex items-center justify-between w-full bg-brand-gradient p-4">
             <svg class="w-6 h-6 text-white mr-2">
-                <use href="#icon-calendar"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-calendar"></use>
             </svg>
             <span class="flex-1 uppercase font-bold text-white text-left">
                 Reisezeitraum
             </span>
             <svg class="w-6 h-6 text-white transform"
                  data-collapse-target="icon">
-                <use href="#icon-arrow-right"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
             </svg>
         </button>
         <div data-collapse-target="container">
@@ -49,7 +49,7 @@
                                             data-action="datepicker#selectPreset">
                                         <span class="uppercase font-bold">{preset.label}</span>
                                         <svg class="w-6 h-6 transform">
-                                            <use href="#icon-arrow-right"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                                         </svg>
                                     </button>
                                 </f:for>
@@ -74,14 +74,14 @@
                 data-action="click->collapse#toggle"
                 class="flex items-center justify-between w-full bg-brand-gradient p-4">
             <svg class="w-6 h-6 text-white mr-2">
-                <use href="#icon-concept"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-concept"></use>
             </svg>
             <span class="flex-1 uppercase font-bold text-white text-left">
                 Reisekonzepte
             </span>
             <svg class="w-6 h-6 text-white transform"
                  data-collapse-target="icon">
-                <use href="#icon-arrow-right"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
             </svg>
         </button>
         <div data-collapse-target="container"
@@ -117,7 +117,7 @@
                 </span>
                 <svg class="w-6 h-6 transform"
                      data-collapse-target="icon">
-                    <use href="#icon-arrow-right"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                 </svg>
             </button>
             <div data-collapse-target="container">
@@ -133,7 +133,7 @@
                                     <strong>{destination.country.label}</strong>
                                 </span>
                                 <svg class="absolute top-0 right-0 w-8 h-6">
-                                    <use href="#icon-flag-{destination.country.code -> f:format.case(mode: 'lower')}"/>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{destination.country.code -> f:format.case(mode: 'lower')}"></use>
                                 </svg>
                             </label>
                             <f:if condition="{destination.regions}">
@@ -170,7 +170,7 @@
                 </span>
                 <svg class="w-6 h-6 transform"
                      data-collapse-target="icon">
-                    <use href="#icon-arrow-right"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                 </svg>
             </button>
             <div data-collapse-target="container">
@@ -203,7 +203,7 @@
                 </span>
                 <svg class="w-6 h-6 transform"
                      data-collapse-target="icon">
-                    <use href="#icon-arrow-right"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                 </svg>
             </button>
             <div data-collapse-target="container">
@@ -232,7 +232,7 @@
                 </span>
                 <svg class="w-6 h-6 transform"
                      data-collapse-target="icon">
-                    <use href="#icon-arrow-right"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                 </svg>
             </button>
             <div data-collapse-target="container">
@@ -265,7 +265,7 @@
                 </span>
                 <svg class="w-6 h-6 transform"
                      data-collapse-target="icon">
-                    <use href="#icon-arrow-right"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                 </svg>
             </button>
             <div data-collapse-target="container">
@@ -308,7 +308,7 @@
                 </span>
                 <svg class="w-6 h-6 transform"
                      data-collapse-target="icon">
-                    <use href="#icon-arrow-right"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                 </svg>
             </button>
             <div data-collapse-target="container">
@@ -342,7 +342,7 @@
                 </span>
                     <svg class="w-6 h-6 transform"
                          data-collapse-target="icon">
-                        <use href="#icon-arrow-right"></use>
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-right"></use>
                     </svg>
                 </button>
                 <div data-collapse-target="container">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/MobileSearch.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/MobileSearch.html
index 909cab43..931e8e12 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/MobileSearch.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/MobileSearch.html
@@ -16,7 +16,7 @@
             <button type="button"
                     class="focus:outline-none" data-action="mobile-search#close">
                 <svg class="w-8 h-8">
-                    <use href="#icon-close"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-close"></use>
                 </svg>
             </button>
         </div>
@@ -27,7 +27,7 @@
              data-mobile-search-target="loadingIndicator">
             <div class="absolute top-1/2 left-1/2 transform -translate-xy-1/2 flex items-center space-x-4 bg-ep-secondary text-white text-lg p-4 rounded">
                 <svg class="w-6 h-6">
-                    <use href="#icon-spinner"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-spinner"></use>
                 </svg>
                 <span>Suche wird geladen...</span>
             </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html
index 9e13bcb7..44e602cc 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html
@@ -6,10 +6,10 @@
         <svg class="w-6 h-6">
         <f:if condition="{meta.organic} && {meta.total} > 0">
             <f:then>
-                <use href="#icon-emoji-happy"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-emoji-happy"></use>
             </f:then>
             <f:else>
-                <use href="#icon-emoji-sad"></use>
+                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-emoji-sad"></use>
             </f:else>
         </f:if>
         </svg>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
index e83acb32..caa805fe 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
@@ -8,7 +8,7 @@
             <div class="relative">
                 <f:if condition="{context.country}">
                     <svg class="w-8 h-6 absolute top-0 left-0">
-                        <use href="#icon-flag-{context.country.code -> f:format.case(mode: 'lower')}"></use>
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{context.country.code -> f:format.case(mode: 'lower')}"></use>
                     </svg>
                 </f:if>
                 <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html
index ed8eebfa..6d35d9e5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html
@@ -8,7 +8,7 @@
                 <div class="container">
                     <nav role="navigation" class="flex justify-between m-0 p-0 w-full divide-x divide-overlay-white-50 border-r border-l border-overlay-white-50">
                         <f:link.typolink parameter="9" class="flex items-center justify-center w-16 h-8 text-white hover:text-white focus:text-white hover:bg-ep-secondary" title="E&amp;P">
-                            <svg class="w-5 h-5"><use href="#icon-home"/></svg>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-home"></use>
                         </f:link.typolink>
                         <f:for each="{topnav}" as="menuitem">
                             <a class="block flex flex-grow h-8 justify-center items-center uppercase text-sm leading-none text-white hover:text-white focus:text-white hover:bg-ep-secondary{f:if(condition: menuitem.tx_eptheme_navitemclass, then: ' {menuitem.tx_eptheme_navitemclass}')}{f:if(condition: '{menuitem.active} or {menuitem.data.uid} == {settings.forceActiveTopnavUid}', then: ' bg-ep-secondary')}"
@@ -19,7 +19,9 @@
                         </f:for>
                         <f:if condition="{settings.myEpPageUid}">
                             <f:link.typolink parameter="{settings.myEpPageUid}" class="flex items-center justify-center w-16 h-8 text-white hover:text-white focus:text-white hover:bg-ep-secondary" title="My E&P">
-                                <svg class="w-5 h-5"><use href="#icon-user"/></svg>
+                                <svg class="w-5 h-5">
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-user"></use>
+                                </svg>
                             </f:link.typolink>
                         </f:if>
                     </nav>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html
index 0eaa96bd..c6aa9adb 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html
@@ -8,8 +8,12 @@
         <div class="headline--3 headline--underlined">
             Buchungsoptionen {hotel.name}
         </div>
-
-        <div class="mb-4" data-controller="pricetable">
+        <f:variable name="spriteIconUrl">
+            <f:format.raw>{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}</f:format.raw>
+        </f:variable>
+        <div class="mb-4"
+             data-controller="pricetable"
+             data-pricetable-icon-sprite-url-value="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg', absolute: 1)}">
 
             <f:if condition="{isProductWithNoInfoConcept}">
                 <f:else>
@@ -74,7 +78,7 @@
                                           data-bus-included="{row.busIncluded}"
                                           data-bus-price="{row.busPrice}">
                                       <svg class="w-4 h-4 md:w-5 md:h-5">
-                                          <use href="#icon-bus"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-bus"></use>
                                       </svg>
                                     </span>
                                 </f:if>
@@ -84,7 +88,7 @@
                                           aria-label="{f:if(condition: row.summer, then: 'Bergbahnticket inklusive', else: 'Skipass inklusive')}"
                                           role="tooltip">
                                       <svg class="w-4 h-4 md:w-5 md:h-5">
-                                            <use href="#icon-tag"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-tag"></use>
                                         </svg>
                                     </span>
                                 </f:if>
@@ -121,7 +125,7 @@
                                             data-action="product-details#loadPrices"
                                             data-date-uid="{row.dateUid}">
                                         <svg class="w-6 h-6 hidden md:block">
-                                            <use href="#icon-arrow-circle-right"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-right"></use>
                                         </svg>
                                         <span class="font-bold text-xs md:text-sm uppercase">
                                             Infos &amp; buchen
@@ -133,7 +137,7 @@
                                        title="Reisen-Alert"
                                        class="flex space-x-1 items-center text-ep-primary-light">
                                         <svg class="w-6 h-6 hidden md:block">
-                                            <use href="#icon-arrow-circle-right"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-right"></use>
                                         </svg>
                                         <span class="font-bold text-xs md:text-sm uppercase">
                                             Reisen-Alert
@@ -154,7 +158,7 @@
                             data-action="pricetable#toggleSurcharge"
                             class="flex items-center space-x-1 focus:outline-none text-ep-primary-light">
                         <svg class="w-6 h-6">
-                            <use href="#icon-arrow-circle-right"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-right"></use>
                         </svg>
                         <span data-pricetable-target="surchargeToggleLabel"
                               data-label-default="Preise für Eigenanreise anzeigen"
@@ -170,7 +174,7 @@
                             data-action="pricetable#toggleDiscount"
                             class="flex items-center space-x-1 focus:outline-none text-ep-primary-light">
                         <svg class="w-6 h-6">
-                            <use href="#icon-arrow-circle-right"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-right"></use>
                         </svg>
                         <span data-pricetable-target="discountToggleLabel"
                               data-label-default="Preise für Busanreise anzeigen"
@@ -186,7 +190,7 @@
                             class="flex items-center space-x-1 focus:outline-none text-ep-primary-light"
                             data-action="pricetable#toggleRows">
                         <svg class="w-6 h-6">
-                            <use href="#icon-plus-circle"
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-plus-circle"
                                  data-pricetable-target="rowToggleIcon"></use>
                         </svg>
                         <span data-pricetable-target="rowToggleLabel">
@@ -201,7 +205,7 @@
                        title="{altLabel}"
                        class="flex items-center space-x-1 focus:outline-none text-ep-primary-light">
                         <svg class="w-6 h-6">
-                            <use href="#icon-arrow-circle-right"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-right"></use>
                         </svg>
                         <span>
                             {altLabel}
@@ -226,7 +230,7 @@
                             class="inline-block"
                             data-action="modal#close">
                         <svg class="w-8 h-8">
-                            <use href="#icon-close"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-close"></use>
                         </svg>
                     </button>
                 </div>
@@ -241,11 +245,9 @@
                                     <td>
                                         <div class="flex items-center space-x-2">
                                             <svg class="w-6 h-6 text-ep-primary">
-                                                <use href="#icon-check"></use>
+                                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-check"></use>
                                             </svg>
-                                            <span>
-                                                {service}
-                                            </span>
+                                            <span>{service}</span>
                                         </div>
                                     </td>
                                 </tr>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html
index a312c283..390acdaa 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html
@@ -29,7 +29,7 @@
                                   aria-label="{f:if(condition: row.summer, then: 'Bergbahnticket inklusive', else: 'Skipass inklusive')}"
                                   role="tooltip">
                                 <svg class="w-4 h-4">
-                                    <use href="#icon-tag"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-tag"></use>
                                 </svg>
                             </span>
                         </f:if>
@@ -69,7 +69,7 @@
                             class="inline-block"
                             data-action="modal#close">
                         <svg class="w-8 h-8">
-                            <use href="#icon-close"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-close"></use>
                         </svg>
                     </button>
                 </div>
@@ -84,7 +84,7 @@
                                     <td>
                                         <div class="flex items-center space-x-2">
                                             <svg class="w-6 h-6 text-ep-primary">
-                                                <use href="#icon-check"></use>
+                                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-check"></use>
                                             </svg>
                                             <span>
                                                 {service}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html
index e3d3d5a2..0edbf1e8 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html
@@ -78,7 +78,7 @@
                                           data-bus-included="{row.busIncluded}"
                                           data-bus-price="{row.busPrice}">
                                         <svg class="w-4 h-4 md:w-5 md:h-5">
-                                            <use href="#icon-bus"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-bus"></use>
                                         </svg>
                                     </span>
                                 </f:if>
@@ -87,7 +87,7 @@
                                           aria-label="{f:if(condition: row.summer, then: 'Bergbahnticket', else: 'Skipass')}"
                                           role="tooltip">
                                       <svg class="w-4 h-4 md:w-5 md:h-5">
-                                          <use href="#icon-tag"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-tag"></use>
                                       </svg>
                                     </span>
                                 </f:if>
@@ -159,7 +159,7 @@
                                 data-action="pricetable#toggleSurcharge"
                                 class="flex items-center space-x-1 focus:outline-none text-ep-primary-light">
                             <svg class="w-6 h-6">
-                                <use href="#icon-arrow-circle-right"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-right"></use>
                             </svg>
                             <span data-pricetable-target="surchargeToggleLabel"
                                   data-label-default="Preise für Eigenanreise anzeigen"
@@ -175,7 +175,7 @@
                                 data-action="pricetable#toggleDiscount"
                                 class="flex items-center space-x-1 focus:outline-none text-ep-primary-light">
                             <svg class="w-6 h-6">
-                                <use href="#icon-arrow-circle-right"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-right"></use>
                             </svg>
                             <span data-pricetable-target="discountToggleLabel"
                                   data-label-default="Preise für Busanreise anzeigen"
@@ -192,7 +192,7 @@
                                     class="flex items-center space-x-1 focus:outline-none text-ep-primary-light"
                                     data-action="product-details#showDates">
                                 <svg class="w-6 h-6">
-                                    <use href="#icon-arrow-circle-left"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-arrow-circle-left"></use>
                                 </svg>
                                 <span>
                                     zurück zur Terminübersicht
@@ -210,11 +210,9 @@
                     <f:for each="{servicesIncluded}" as="service">
                         <li class="flex items-center space-x-2">
                             <svg class="w-6 h-6 text-ep-primary">
-                                <use href="#icon-check"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-check"></use>
                             </svg>
-                            <span>
-                                {service}
-                            </span>
+                            <span>{service}</span>
                         </li>
                     </f:for>
                 </ul>
@@ -236,7 +234,7 @@
                             class="inline-block"
                             data-action="modal#close">
                         <svg class="w-8 h-8">
-                            <use href="#icon-close"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-close"></use>
                         </svg>
                     </button>
                 </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxWatchlist/List.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxWatchlist/List.html
index fcaf257b..bbcb2c78 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxWatchlist/List.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxWatchlist/List.html
@@ -145,7 +145,8 @@
                                               aria-label="auf die Merkliste setzen"
                                               data-watchlist-toggle-target="ariaLabel">
                                             <svg class="w-5 h-5 text-ep-secondary">
-                                                <use href="#icon-plus-circle" data-watchlist-toggle-target="icon"></use>
+                                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-plus-circle"
+                                                     data-watchlist-toggle-taget="icon"></use>
                                             </svg>
                                         </span>
                                     </button>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
index ee6b7a81..4c06080b 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html
@@ -22,14 +22,14 @@
                                 data-action="teasergrid#grid"
                                 data-teasergrid-target="button">
                             <svg class="w-5 h-5 text-ep-primary">
-                                <use href="#icon-teaser-grid"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-grid"></use>
                             </svg>
                         </button>
                         <button type="button"
                                 data-action="teasergrid#block"
                                 data-teasergrid-target="button">
                             <svg class="w-5 h-5 text-ep-primary">
-                                <use href="#icon-teaser-single"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-single"></use>
                             </svg>
                         </button>
                     </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html
index ed651cd0..226e48ff 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html
@@ -20,7 +20,7 @@
                 <div class="absolute top-0 left-0 inset-0 w-full h-full bg-overlay-white"
                      data-calendar-target="loadingIndicator">
                     <svg class="w-6 h-6 text-gray-800 absolute top-1/2 left-1/2 transform -translate-xy-1/2">
-                        <use href="#icon-spinner"></use>
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-spinner"></use>
                     </svg>
                 </div>
             </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html
index 89f33b63..84afbfae 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html
@@ -23,35 +23,35 @@
                                 <f:if condition="{item.data.facebook_url}">
                                     <a href="{item.data.facebook_url}" target="_blank" title="{item.data.name} bei Facebook">
                                         <svg class="w-8 h-8 {ep:themeClasses(classes: '{sbw: \'text-sbw-primary\', snz: \'text-snz-primary\', uch: \'text-uch-primary\'}', key: settings.themekey)}">
-                                            <use href="#icon-facebook"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-facebook"></use>
                                         </svg>
                                     </a>
                                 </f:if>
                                 <f:if condition="{item.data.twitter_url}">
                                     <a href="{item.data.twitter_url}" target="_blank" title="{item.data.name} bei Twitter">
                                         <svg class="w-8 h-8 {ep:themeClasses(classes: '{sbw: \'text-sbw-primary\', snz: \'text-snz-primary\', uch: \'text-uch-primary\'}', key: settings.themekey)}">
-                                            <use href="#icon-twitter"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-twitter"></use>
                                         </svg>
                                     </a>
                                 </f:if>
                                 <f:if condition="{item.data.instagram_url}">
                                     <a href="{item.data.instagram_url}" target="_blank" title="{item.data.name} bei Instagram">
                                         <svg class="w-8 h-8 {ep:themeClasses(classes: '{sbw: \'text-sbw-primary\', snz: \'text-snz-primary\', uch: \'text-uch-primary\'}', key: settings.themekey)}">
-                                            <use href="#icon-instagram"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-instagram"></use>
                                         </svg>
                                     </a>
                                 </f:if>
                                 <f:if condition="{item.data.youtube_url}">
                                     <a href="{item.data.youtube_url}" target="_blank" title="{item.data.name} bei YouTube">
                                         <svg class="w-8 h-8 {ep:themeClasses(classes: '{sbw: \'text-sbw-primary\', snz: \'text-snz-primary\', uch: \'text-uch-primary\'}', key: settings.themekey)}">
-                                            <use href="#icon-youtube"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-youtube"></use>
                                         </svg>
                                     </a>
                                 </f:if>
                                 <f:if condition="{item.data.soundcloud_url}">
                                     <a href="{item.data.soundcloud_url}" target="_blank" title="{item.data.name} bei Soundcloud">
                                         <svg class="w-8 h-8 {ep:themeClasses(classes: '{sbw: \'text-sbw-primary\', snz: \'text-snz-primary\', uch: \'text-uch-primary\'}', key: settings.themekey)}">
-                                            <use href="#icon-soundcloud"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-soundcloud"></use>
                                         </svg>
                                     </a>
                                 </f:if>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html
index 21cff5ca..167f9a17 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html
@@ -9,7 +9,7 @@
         <f:link.typolink class="teaserbox teaserbox--country" parameter="{country.detailPage}" title="{country.name}">
             <div class="teaserbox__image">
                 <svg class="teaserbox__flag">
-                    <use href="#icon-flag-{country.code -> f:format.case(mode: 'lower')}"/>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{country.code -> f:format.case(mode: 'lower')}"></use>
                 </svg>
                 <f:render partial="TeaserImage" arguments="{image: country.teaserImages.0}"/>
             </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
index c04eb3a6..8affcfd5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
@@ -147,7 +147,7 @@
                          data-product-details-target="loadingIndicator">
                         <div class="flex items-center space-x-4 bg-ep-secondary text-white text-lg p-4 rounded">
                             <svg class="w-6 h-6">
-                                <use href="#icon-spinner"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-spinner"></use>
                             </svg>
                             <span data-product-details-target="loadingMessage">Loading...</span>
                         </div>
@@ -321,7 +321,7 @@
                class="block px-4 py-2 bg-red-500 text-white flex items-center space-x-2 col-span-2 md:col-span-3"
                title="Corona Updates">
                 <svg class="w-4 h-4">
-                    <use href="#icon-virus"></use>
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-virus"></use>
                 </svg>
                 <span>Corona Updates</span>
             </a>
@@ -334,7 +334,7 @@
                         data-cooltipz-dir="top-right"
                         aria-label="FAQ">
                     <svg class="w-6 h-6 mx-auto">
-                        <use href="#icon-help-circle"></use>
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-help-circle"></use>
                     </svg>
                 </button>
             </f:if>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html
index 455b3d17..2749b70e 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html
@@ -22,14 +22,14 @@
                                 data-action="teasergrid#grid"
                                 data-teasergrid-target="button">
                             <svg class="w-5 h-5 text-ep-primary">
-                                <use href="#icon-teaser-grid"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-grid"></use>
                             </svg>
                         </button>
                         <button type="button"
                                 data-action="teasergrid#block"
                                 data-teasergrid-target="button">
                             <svg class="w-5 h-5 text-ep-primary">
-                                <use href="#icon-teaser-single"></use>
+                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-teaser-single"></use>
                             </svg>
                         </button>
                     </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchresult.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchresult.html
index 29da4ca6..71616824 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchresult.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchresult.html
@@ -17,7 +17,7 @@
                      data-search-target="loadingIndicator">
                     <div class="absolute top-1/2 left-1/2 transform -translate-xy-1/2 flex items-center space-x-4 bg-ep-secondary text-white text-lg p-4 rounded">
                         <svg class="w-6 h-6">
-                            <use href="#icon-spinner"></use>
+                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-spinner"></use>
                         </svg>
                         <span>Suchergebnis wird geladen...</span>
                     </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html
index b8ea4c15..df139fe2 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html
@@ -1,5 +1,4 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
-      xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
       data-namespace-typo3-fluid="true">
 
     <f:layout name="Default"/>
@@ -49,7 +48,7 @@
                                                data-searchbar-target="dateRangeLabel"/>
                                         <svg class="w-6 h-6 text-white absolute right-0 top-0 mr-2 mt-1 cursor-pointer"
                                              data-action="click->collapse#toggle">
-                                            <use href="#icon-calendar"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-calendar"></use>
                                         </svg>
                                         <div class="hidden absolute z-20 top-100 mt-2 left-0 min-w-full bg-white p-4 shadow-md rounded"
                                              data-collapse-target="container">
@@ -103,7 +102,7 @@
                                                class="w-full bg-transparent border-0 ring-0 focus:ring-0 text-white uppercase px-2 py-1 cursor-pointer"/>
                                         <svg class="w-6 h-6 text-white absolute right-0 top-0 mr-2 mt-1 cursor-pointer"
                                              data-action="click->collapse#toggle">
-                                            <use href="#icon-user-group"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-user-group"></use>
                                         </svg>
                                         <div
                                             class="hidden absolute z-20 top-100 mt-2 left-0 bg-white p-4 shadow-md rounded w-full h-48 overflow-y-scroll"
@@ -141,7 +140,7 @@
                                         <svg
                                             class="w-6 h-6 text-white absolute right-0 top-0 mr-2 mt-1 transform rotate-45 cursor-pointer"
                                             data-action="click->collapse#toggle">
-                                            <use href="#icon-airplane"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-airplane"></use>
                                         </svg>
                                         <div
                                             class="hidden absolute z-20 top-100 mt-2 left-0 bg-white p-4 shadow-md rounded min-w-full h-64 overflow-y-scroll"
@@ -156,8 +155,7 @@
                                                                 data-option-type="country"
                                                                 data-option-label="{destination.country.label}">
                                                             <svg class="block w-8 h-6">
-                                                                <use
-                                                                    href="#icon-flag-{destination.country.code -> f:format.case(mode: 'lower')}"/>
+                                                                <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{destination.country.code -> f:format.case(mode: 'lower')}"></use>
                                                             </svg>
                                                             <span>
                                                                     {destination.country.label}
@@ -216,7 +214,7 @@
                                                placeholder="Preis"/>
                                         <svg class="w-6 h-6 text-white absolute right-0 top-0 mr-2 mt-1 cursor-pointer"
                                              data-action="click->collapse#toggle">
-                                            <use href="#icon-euro"></use>
+                                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-euro"></use>
                                         </svg>
                                         <div
                                             class="hidden absolute z-20 top-100 left-0 bg-white p-4 shadow-md w-full h-48 overflow-y-scroll"
@@ -249,7 +247,7 @@
                             <button type="submit"
                                     class="hidden reduced:block reduced:ml-4">
                                 <svg class="w-8 h-8 text-white">
-                                    <use href="#icon-chevron-right"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-right"></use>
                                 </svg>
                             </button>
                         </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
index ed84245d..8a0b568f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Team/Show.html
@@ -29,7 +29,7 @@
                         <p>
                             <f:link.email class="flex items-center space-x-2" email="{member.email}">
                                 <svg class="w-6 h-6 text-ep-primary">
-                                    <use href="#icon-email"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-email"></use>
                                 </svg>
                                 <span>{member.email}</span>
                             </f:link.email>
@@ -39,7 +39,7 @@
                         <p>
                             <a class="flex items-center space-x-2" href="tel:{member.phone -> v:format.pregReplace(pattern: '/[\-\s]/', replacement: '')}" rel="nofollow">
                                 <svg class="w-6 h-6 text-ep-primary">
-                                    <use href="#icon-phone"></use>
+                                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-phone"></use>
                                 </svg>
                                 <span>{member.phone}</span>
                             </a>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html
index 6d3d6885..d4c832a7 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html
@@ -13,7 +13,7 @@
                 <div class="absolute top-0 left-0 inset-0 bg-overlay-white hidden"
                      data-watchlist-target="loadingIndicator">
                     <svg class="w-6 h-6 text-ep-primary-light absolute top-1/2 left-1/2 transform -translate-xy-1/2">
-                        <use href="#icon-spinner"></use>
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-spinner"></use>
                     </svg>
                 </div>
             </div>