diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Icons.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Icons.html
index 5b8d2807..abd3f317 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Icons.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Icons.html
@@ -39,6 +39,18 @@
     <symbol id="icon-mountainbike" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M400 96a48 48 0 1 0-48-48 48 48 0 0 0 48 48zm224 256h-5.2a110.19 110.19 0 0 0-8.65-20.89l3.67-3.67a16 16 0 0 0 0-22.63l-22.63-22.63a16 16 0 0 0-22.63 0l-3.66 3.67a110.72 110.72 0 0 0-20.9-8.65V272a16 16 0 0 0-16-16h-32a16 16 0 0 0-16 16v5.2a110.19 110.19 0 0 0-20.89 8.65l-3.67-3.67a16 16 0 0 0-22.63 0l-22.62 22.63a16 16 0 0 0 0 22.63l3.67 3.67A110.45 110.45 0 0 0 405.2 352H400a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h5.2a110.19 110.19 0 0 0 8.65 20.89l-3.67 3.67a16 16 0 0 0 0 22.63l22.62 22.63a16 16 0 0 0 22.63 0l3.67-3.67a110.94 110.94 0 0 0 20.9 8.65v5.2a16 16 0 0 0 16 16h32a16 16 0 0 0 16-16v-5.2a110.56 110.56 0 0 0 20.9-8.65l3.67 3.67a16 16 0 0 0 22.62 0l22.63-22.63a16 16 0 0 0 0-22.63l-3.67-3.67A110.45 110.45 0 0 0 618.8 416h5.2a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm-112 96a64 64 0 1 1 64-64 64 64 0 0 1-64 64zm-272-96h-5.2a110.19 110.19 0 0 0-8.65-20.89l3.67-3.67a16 16 0 0 0 0-22.63l-22.63-22.63a16 16 0 0 0-22.63 0l-3.66 3.67a110.72 110.72 0 0 0-20.9-8.65V272a16 16 0 0 0-16-16h-32a16 16 0 0 0-16 16v5.2a110.19 110.19 0 0 0-20.89 8.65l-3.67-3.67a16 16 0 0 0-22.63 0l-22.63 22.63a16 16 0 0 0 0 22.63l3.67 3.67A110.45 110.45 0 0 0 21.2 352H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h5.2a110.19 110.19 0 0 0 8.65 20.89l-3.67 3.67a16 16 0 0 0 0 22.63l22.62 22.63a16 16 0 0 0 22.63 0l3.67-3.67A110.94 110.94 0 0 0 96 490.8v5.2a16 16 0 0 0 16 16h32a16 16 0 0 0 16-16v-5.2a110.56 110.56 0 0 0 20.9-8.65l3.67 3.67a16 16 0 0 0 22.62 0l22.63-22.63a16 16 0 0 0 0-22.63l-3.67-3.67A110.45 110.45 0 0 0 234.8 416h5.2a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm-112 96a64 64 0 1 1 64-64 64 64 0 0 1-64 64zm273-237.27a24 24 0 0 0 15 5.27h64a24 24 0 0 0 0-48h-55.59L351 109.27a24 24 0 0 0-30.62.51l-112 96a24 24 0 0 0 2.31 38.22L296 300.84V416a24 24 0 0 0 48 0V288a24 24 0 0 0-10.69-20l-43.23-28.82 70.73-60.63zM159.19 172a35.53 35.53 0 0 0 49.45 3.77l87.3-74.45c16.82-14.24 14.56-37 3.27-49.84C270 18.45 219 13.88 185.93 42L132.2 87.91a34.9 34.9 0 0 0-3.26 49.85zm57.88-93.5c9.92-8.42 24-9.35 35.65-3.43l-65.64 56-13.54-15.31z"/></symbol>
     <symbol id="icon-hotel" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M560 48c8.84 0 16-7.16 16-16V16c0-8.84-7.16-16-16-16H16C7.16 0 0 7.16 0 16v16c0 8.84 7.16 16 16 16h15.98v416H16c-8.84 0-16 7.16-16 16v16c0 8.84 7.16 16 16 16h544c8.84 0 16-7.16 16-16v-16c0-8.84-7.16-16-16-16h-16V48h16zm-64 416H320v-80h64c0-53.02-42.98-96-96-96s-96 42.98-96 96h64v80H79.98V48H496v416zM268.8 160h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm0 96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm128 0h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm0-96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm-256 96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm0-96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8z"/></symbol>
     <symbol id="icon-sportclub" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M560 48c8.84 0 16-7.16 16-16V16c0-8.84-7.16-16-16-16H16C7.16 0 0 7.16 0 16v16c0 8.84 7.16 16 16 16h15.98v416H16c-8.84 0-16 7.16-16 16v16c0 8.84 7.16 16 16 16h544c8.84 0 16-7.16 16-16v-16c0-8.84-7.16-16-16-16h-16V48h16zm-64 416H320v-80h64c0-53.02-42.98-96-96-96s-96 42.98-96 96h64v80H79.98V48H496v416zM268.8 160h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm0 96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm128 0h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm0-96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm-256 96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8zm0-96h38.4c6.4 0 12.8-6.4 12.8-12.8v-38.4c0-6.4-6.4-12.8-12.8-12.8h-38.4c-6.4 0-12.8 6.4-12.8 12.8v38.4c0 6.4 6.4 12.8 12.8 12.8z"/></symbol>
+    <symbol id="icon-teaser-grid" fill="currentColor" stroke="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+        <clipPath id="_clip1">
+            <path d="M57.815,0L95.315,0C96.615,0 97.72,0.52 98.635,1.565C99.545,2.605 100,3.87 100,5.355L100,41.07C100,42.56 99.545,43.825 98.635,44.865C97.72,45.91 96.615,46.43 95.315,46.43L57.815,46.43C56.51,46.43 55.405,45.91 54.49,44.865C53.58,43.825 53.125,42.56 53.125,41.07L53.125,5.355C53.125,3.87 53.58,2.605 54.49,1.565C55.405,0.52 56.51,0 57.815,0ZM42.19,0C43.49,0 44.595,0.52 45.51,1.565C46.42,2.605 46.875,3.87 46.875,5.355L46.875,41.07C46.875,42.56 46.42,43.825 45.51,44.865C44.595,45.91 43.49,46.43 42.19,46.43L4.69,46.43C3.385,46.43 2.28,45.91 1.365,44.865C0.455,43.825 0,42.56 0,41.07L0,5.355C0,3.87 0.455,2.605 1.365,1.565C2.28,0.52 3.385,0 4.69,0L42.19,0ZM0,58.93C0,57.44 0.455,56.175 1.365,55.135C2.28,54.09 3.385,53.57 4.69,53.57L42.19,53.57C43.49,53.57 44.595,54.09 45.51,55.135C46.42,56.175 46.875,57.44 46.875,58.93L46.875,94.645C46.875,96.13 46.42,97.395 45.51,98.44C44.595,99.48 43.49,100 42.19,100L4.69,100C3.385,100 2.28,99.48 1.365,98.44C0.455,97.395 0,96.13 0,94.645L0,58.93ZM57.815,100C56.51,100 55.405,99.48 54.49,98.44C53.58,97.395 53.125,96.13 53.125,94.645L53.125,58.93C53.125,57.44 53.58,56.175 54.49,55.135C55.405,54.09 56.51,53.57 57.815,53.57L95.315,53.57C96.615,53.57 97.72,54.09 98.635,55.135C99.545,56.175 100,57.44 100,58.93L100,94.645C100,96.13 99.545,97.395 98.635,98.44C97.72,99.48 96.615,100 95.315,100L57.815,100Z"/>
+        </clipPath>
+        <g clip-path="url(#_clip1)"><rect width="100" height="100"></rect></g>
+    </symbol>
+    <symbol id="icon-teaser-single" fill="currentColor" stroke="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+        <clipPath id="_clip1">
+            <path d="M5,0L95,0C97.76,0 100,2.24 100,5L100,95C100,97.76 97.76,100 95,100L5,100C2.24,100 0,97.76 0,95L0,5C0,2.24 2.24,0 5,0Z"/>
+        </clipPath>
+        <g clip-path="url(#_clip1)"><rect width="100" height="100"></rect></g>
+    </symbol>
     <!-- Flags -->
     <symbol id="icon-flag-at" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 480"><g fill-rule="evenodd"><path fill="#fff" d="M640 480H0V0h640z"/><path fill="#ed2939" d="M640 480H0V320h640zm0-319.9H0V.1h640z"/></g></symbol>
     <symbol id="icon-flag-ch" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 480"><g fill-rule="evenodd" stroke-width="1pt"><path fill="#d52b1e" d="M0 0h640v480H0z"/><g fill="#fff"><path d="M170 195h300v90H170z"/><path d="M275 90h90v300h-90z"/></g></g></symbol>
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 042ab239..b71e5df0 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
@@ -20,14 +20,14 @@
                         <button class="opacity-50"
                                 data-action="teasergrid#grid"
                                 data-teasergrid-target="button">
-                            <svg class="w-6 h-6 text-ep-primary">
-                                <use href="#icon-minus-circle"></use>
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="#icon-teaser-grid"></use>
                             </svg>
                         </button>
                         <button data-action="teasergrid#block"
                                 data-teasergrid-target="button">
-                            <svg class="w-6 h-6 text-ep-primary">
-                                <use href="#icon-plus-circle"></use>
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="#icon-teaser-single"></use>
                             </svg>
                         </button>
                     </div>
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 774f6f20..332aa873 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
@@ -20,14 +20,14 @@
                         <button class="opacity-50"
                                 data-action="teasergrid#grid"
                                 data-teasergrid-target="button">
-                            <svg class="w-6 h-6 text-ep-primary">
-                                <use href="#icon-minus-circle"></use>
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="#icon-teaser-grid"></use>
                             </svg>
                         </button>
                         <button data-action="teasergrid#block"
                                 data-teasergrid-target="button">
-                            <svg class="w-6 h-6 text-ep-primary">
-                                <use href="#icon-plus-circle"></use>
+                            <svg class="w-5 h-5 text-ep-primary">
+                                <use href="#icon-teaser-single"></use>
                             </svg>
                         </button>
                     </div>