diff --git a/docs/src/scss/components/Alert/index.html b/docs/src/scss/components/Alert/index.html
index d35f1e955b..d27ca2881c 100644
--- a/docs/src/scss/components/Alert/index.html
+++ b/docs/src/scss/components/Alert/index.html
@@ -34,14 +34,14 @@ <h2 class="docs-Heading">Alert Colors</h2>
             <div class="docs-Stack docs-Stack--stretch">
           
               <div class="Alert Alert--success" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#check-plain" />
                 </svg>
                 <div>We sent you an activation link to email <strong>spirit@lmc.eu</strong>. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
               </div>
           
               <div class="Alert Alert--informative" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#info" />
                 </svg>
                 <div>
@@ -52,14 +52,14 @@ <h2 class="docs-Heading">Alert Colors</h2>
               </div>
           
               <div class="Alert Alert--warning" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#warning" />
                 </svg>
                 <div><strong>Warning!</strong> Data update failed due to missing internet connection. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
               </div>
           
               <div class="Alert Alert--danger" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#warning" />
                 </svg>
                 <div>Data update failed due to missing internet connection. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
@@ -75,14 +75,14 @@ <h2 class="docs-Heading">Alert Centered</h2>
             <div class="docs-Stack docs-Stack--stretch">
           
               <div class="Alert Alert--success Alert--center" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#check-plain" />
                 </svg>
                 <div>We sent you an activation link to email <strong>spirit@lmc.eu</strong>. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
               </div>
           
               <div class="Alert Alert--informative Alert--center" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#info" />
                 </svg>
                 <div>
@@ -93,14 +93,14 @@ <h2 class="docs-Heading">Alert Centered</h2>
               </div>
           
               <div class="Alert Alert--warning Alert--center" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#warning" />
                 </svg>
                 <div><strong>Warning!</strong> Data update failed due to missing internet connection. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
               </div>
           
               <div class="Alert Alert--danger Alert--center" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#warning" />
                 </svg>
                 <div>Data update failed due to missing internet connection. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
@@ -116,14 +116,14 @@ <h2 class="docs-Heading">Alert Icons</h2>
             <div class="docs-Stack docs-Stack--stretch">
           
               <div class="Alert Alert--success" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#profile" />
                 </svg>
                 <div>We sent you an activation link to email <strong>spirit@lmc.eu</strong>. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
               </div>
           
               <div class="Alert Alert--informative" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#info" />
                 </svg>
                 <div>
@@ -134,14 +134,14 @@ <h2 class="docs-Heading">Alert Icons</h2>
               </div>
           
               <div class="Alert Alert--warning" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#warning" />
                 </svg>
                 <div><strong>Warning!</strong> Data update failed due to missing internet connection. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
               </div>
           
               <div class="Alert Alert--danger" role="alert">
-                <svg class="Icon" width="24" height="24">
+                <svg width="24" height="24">
                   <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#close" />
                 </svg>
                 <div>Data update failed due to missing internet connection. See <a href="./" class="link-underlined">FAQ</a> for more info.</div>
diff --git a/docs/src/scss/components/Breadcrumbs/index.html b/docs/src/scss/components/Breadcrumbs/index.html
index d8cc5a4b6c..ef128012fc 100644
--- a/docs/src/scss/components/Breadcrumbs/index.html
+++ b/docs/src/scss/components/Breadcrumbs/index.html
@@ -34,25 +34,25 @@ <h2 class="docs-Heading">Default</h2>
               <ol>
                 <li class="d-none d-tablet-flex">
                   <a href="#rootUrl" class="link-primary link-underlined">Root</a>
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-right" />
                   </svg>
                 </li>
                 <li class="d-none d-tablet-flex">
                   <a href="#categoryUrl" class="link-primary link-underlined">Category</a>
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-right" />
                   </svg>
                 </li>
                 <li class="d-tablet-none">
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-left" />
                   </svg>
                   <a href="#subcategoryUrl" class="link-primary link-underlined">Back</a>
                 </li>
                 <li class="d-none d-tablet-flex">
                   <a href="#subcategoryUrl" class="link-primary link-underlined">Subcategory</a>
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-right" />
                   </svg>
                 </li>
@@ -73,25 +73,25 @@ <h2 class="docs-Heading">Custom</h2>
               <ol>
                 <li class="d-none d-tablet-flex">
                   <a href="#rootUrl" class="link-primary link-underlined">Root</a>
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-right" />
                   </svg>
                 </li>
                 <li class="d-none d-tablet-flex">
                   <a href="#categoryUrl" class="link-primary link-underlined">Category</a>
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-right" />
                   </svg>
                 </li>
                 <li class="d-tablet-none">
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-left" />
                   </svg>
                   <a href="#subcategoryUrl" class="link-primary link-underlined">Back</a>
                 </li>
                 <li class="d-none d-tablet-flex">
                   <a href="#subcategoryUrl" class="link-primary link-underlined">Subcategory</a>
-                  <svg class="Icon" width="24" height="24">
+                  <svg width="24" height="24">
                     <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#chevron-right" />
                   </svg>
                 </li>
diff --git a/docs/src/scss/components/Modal/index.html b/docs/src/scss/components/Modal/index.html
index 2b98b72905..9a8d2052b0 100644
--- a/docs/src/scss/components/Modal/index.html
+++ b/docs/src/scss/components/Modal/index.html
@@ -467,7 +467,7 @@ <h2 id="example_scroll_view_title" class="ModalHeader__title">
                       aria-controls="example_scroll_view"
                       aria-expanded="false"
                     >
-                      <svg class="Icon" width="24" height="24" aria-hidden="true">
+                      <svg width="24" height="24" aria-hidden="true">
                         <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#close" />
                       </svg>
                       <span class="accessibility-hidden">Close</span>
@@ -561,7 +561,7 @@ <h2 id="example_scroll_view_title" class="ModalHeader__title">
           
               </dialog>
               <!-- Modal: end -->
-            
+          
             </div>
           
           </section>
diff --git a/docs/src/scss/components/Tooltip/index.html b/docs/src/scss/components/Tooltip/index.html
index 63c3952a1e..9d80a4809d 100644
--- a/docs/src/scss/components/Tooltip/index.html
+++ b/docs/src/scss/components/Tooltip/index.html
@@ -157,7 +157,7 @@ <h2 class="docs-Heading">Dismissible Tooltip</h2>
                       aria-controls="my-dismissible-tooltip"
                       aria-expanded="true"
                     >
-                      <svg class="Icon" width="24" height="24" aria-hidden="true">
+                      <svg width="24" height="24" aria-hidden="true">
                         <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#close" />
                       </svg>
                       <span class="accessibility-hidden">Close</span>
@@ -193,7 +193,7 @@ <h2 class="docs-Heading">Dismissible Tooltip via JS API</h2>
                       aria-controls="my-dismissible-tooltip2"
                       aria-expanded="true"
                     >
-                      <svg class="Icon" width="24" height="24" aria-hidden="true">
+                      <svg width="24" height="24" aria-hidden="true">
                         <use xlink:href="/spirit-design-system/icons/svg/sprite.svg#close" />
                       </svg>
                       <span class="accessibility-hidden">Close</span>