diff --git a/packages/ui/src/components/Icons/create-icon.tsx b/packages/ui/src/components/Icons/create-icon.tsx
index 8ab400c35..abd89ad1d 100644
--- a/packages/ui/src/components/Icons/create-icon.tsx
+++ b/packages/ui/src/components/Icons/create-icon.tsx
@@ -31,7 +31,7 @@ export function createIcon({
   svgPath,
 }: IconDefinition): ComponentClass<SVGIconProps> {
   return class SVGIcon extends Component<SVGIconProps> {
-    static displayName = name;
+    static readonly displayName = name;
 
     id = `icon-title-${currentId++}`;
 
@@ -47,10 +47,9 @@ export function createIcon({
           className={classes}
           viewBox={viewBox}
           fill="currentColor"
-          aria-labelledby={hasTitle ? this.id : null}
-          aria-hidden={hasTitle ? null : true}
+          aria-labelledby={hasTitle ? this.id : undefined}
+          aria-hidden={hasTitle ? undefined : true}
           transform={transform}
-          role="img"
           width="1em"
           height="1em"
           {...(props as Omit<SVGProps<SVGElement>, 'ref'>)} // Lie.
diff --git a/packages/ui/src/components/Visualization/Canvas/Canvas.tsx b/packages/ui/src/components/Visualization/Canvas/Canvas.tsx
index 4ce4a40c6..3c8c3e91a 100644
--- a/packages/ui/src/components/Visualization/Canvas/Canvas.tsx
+++ b/packages/ui/src/components/Visualization/Canvas/Canvas.tsx
@@ -1,4 +1,3 @@
-import { Icon } from '@patternfly/react-core';
 import { CatalogIcon } from '@patternfly/react-icons';
 import {
   Model,
diff --git a/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap b/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap
index 787532ef0..3ba3408d4 100644
--- a/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap
+++ b/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap
@@ -717,18 +717,18 @@ exports[`Canvas Catalog button should NOT be present if \`CatalogModalContext\`
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Horizontal Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 432.86328,0 c -34.9234,-1e-5 -64.82625,23.168645 -75.20508,54.859375 h -78.69336 v 0.308594 h -13.1289 V 231.58984 H 148.05078 C 137.78436,201.61385 109.30753,179.7832 76.089844,179.7832 34.355088,179.7832 0,214.19584 0,256 c 0,41.80416 34.355088,76.2168 76.089844,76.2168 33.217686,0 61.694516,-21.83065 71.960936,-51.80664 H 265.83594 V 456.9082 h 13.1289 v 0.29688 h 78.7168 C 368.08021,488.86228 397.96389,512 432.86328,512 476.28035,512 512,476.21975 512,432.73047 c 0,-43.48927 -35.71965,-79.26562 -79.13672,-79.26563 -34.94712,0 -64.86922,23.19608 -75.22851,54.91993 H 314.57422 V 280.41016 h 43.08398 c 10.3789,31.69063 40.28175,54.85742 75.20508,54.85742 C 476.28035,335.26757 512,299.48927 512,256 c 0,-43.48927 -35.71965,-79.26757 -79.13672,-79.26758 -34.92333,0 -64.82618,23.16679 -75.20508,54.85742 H 314.57422 V 103.67773 h 43.08398 c 10.37889,31.69063 40.28175,54.85743 75.20508,54.85743 C 476.28035,158.53515 512.00001,122.75881 512,79.269531 512,35.780261 476.28035,0 432.86328,0 Z"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -756,18 +756,18 @@ exports[`Canvas Catalog button should NOT be present if \`CatalogModalContext\`
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Vertical Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 256,-0.00195313 c -41.77177,4.83e-6 -76.20117,34.33777113 -76.20117,76.10546913 -1e-5,33.245764 21.84391,61.720664 51.81054,71.982424 V 265.81445 H 55.074219 v 13.14844 h -0.275391 v 78.68359 C 23.150155,368.03955 1.9169543e-6,397.92105 0,432.84961 c 2.3846233e-6,43.44988 35.794913,79.15234 79.251953,79.15234 43.457047,1e-5 79.253907,-35.70245 79.253907,-79.15234 0,-34.97602 -23.2129,-64.89598 -54.92773,-75.25 v -43.00586 h 128.03124 v 43.0293 c -31.68129,10.37383 -54.86132,40.2746 -54.86132,75.22656 0,43.44988 35.79491,79.15234 79.25195,79.15234 43.45703,-10e-6 79.25195,-35.70246 79.25195,-79.15234 0,-34.9526 -23.18109,-64.85325 -54.86328,-75.22656 v -43.0293 h 127.96875 v 43.0293 c -31.6813,10.37383 -54.86328,40.27459 -54.86328,75.22656 0,43.44989 35.79686,79.15235 79.25391,79.15234 43.45704,0 79.25195,-35.70246 79.25195,-79.15234 0,-34.95261 -23.18109,-64.85326 -54.86328,-75.22656 v -78.66016 h -0.28516 V 265.81445 H 280.38867 V 148.08789 c 29.96786,-10.26106 51.81251,-38.73773 51.8125,-71.984374 0,-41.767698 -34.4294,-76.1054643 -76.20117,-76.10546913 z M 280.38867,63.634766 c 1.88026,3.732198 3.0332,7.918634 3.0332,12.46875 10e-6,4.550115 -1.15294,8.738504 -3.0332,12.470703 z m -48.7793,0.0039 v 24.93164 c -1.87901,-3.731258 -3.03125,-7.91827 -3.03125,-12.466796 0,-4.548526 1.15223,-8.733586 3.03125,-12.464844 z M 103.57813,414.50586 c 3.82192,5.07537 6.14843,11.3614 6.14843,18.34375 0,6.98235 -2.32651,13.26838 -6.14843,18.34375 z m 176.81054,0.0762 c 3.78578,5.0623 6.08399,11.32141 6.08399,18.26758 0,6.94616 -2.29821,13.20528 -6.08399,18.26758 z m 176.74805,0 c 3.78566,5.06225 6.08398,11.32153 6.08398,18.26758 0,6.94605 -2.29832,13.20533 -6.08398,18.26758 z m -225.52735,0.002 v 36.53125 c -3.78477,-5.06192 -6.08203,-11.32046 -6.08203,-18.26562 0,-6.94516 2.29726,-13.2037 6.08203,-18.26563 z m 176.74805,0 v 36.53125 c -3.78477,-5.06192 -6.08398,-11.32046 -6.08398,-18.26562 0,-6.94516 2.29921,-13.2037 6.08398,-18.26563 z m -353.558592,0.0762 v 36.3789 c -3.748649,-5.04863 -6.019531,-11.28059 -6.019531,-18.18945 0,-6.90886 2.270882,-13.14082 6.019531,-18.18945 z M 307.81153,76.104458 A 51.811546,51.716827 0 0 0 255.99999,24.387631 51.811546,51.716827 0 0 0 204.18845,76.104458 51.811546,51.716827 0 0 0 255.99999,127.82129 51.811546,51.716827 0 0 0 307.81153,76.104458 Z M 134.11561,432.84943 a 54.862992,54.762693 0 0 0 -54.863002,-54.76269 54.862992,54.762693 0 0 0 -54.862992,54.76269 54.862992,54.762693 0 0 0 54.862992,54.76269 54.862992,54.762693 0 0 0 54.863002,-54.76269 z m 353.49475,0 a 54.862992,54.762693 0 0 0 -54.86299,-54.76269 54.862992,54.762693 0 0 0 -54.863,54.76269 54.862992,54.762693 0 0 0 54.863,54.76269 54.862992,54.762693 0 0 0 54.86299,-54.76269 z m -176.74739,0 a 54.862992,54.762693 0 0 0 -54.86298,-54.76269 54.862992,54.762693 0 0 0 -54.86299,54.76269 54.862992,54.762693 0 0 0 54.86299,54.76269 54.862992,54.762693 0 0 0 54.86298,-54.76269 z M 79.18924,493.73631 V 278.96326 M 255.99999,493.73631 V 17.414482 M 432.74737,493.73631 V 278.96326 m 24.10342,11.23988 H 55.07487"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -1523,18 +1523,18 @@ exports[`Canvas Catalog button should be present if \`CatalogModalContext\` is p
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Horizontal Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 432.86328,0 c -34.9234,-1e-5 -64.82625,23.168645 -75.20508,54.859375 h -78.69336 v 0.308594 h -13.1289 V 231.58984 H 148.05078 C 137.78436,201.61385 109.30753,179.7832 76.089844,179.7832 34.355088,179.7832 0,214.19584 0,256 c 0,41.80416 34.355088,76.2168 76.089844,76.2168 33.217686,0 61.694516,-21.83065 71.960936,-51.80664 H 265.83594 V 456.9082 h 13.1289 v 0.29688 h 78.7168 C 368.08021,488.86228 397.96389,512 432.86328,512 476.28035,512 512,476.21975 512,432.73047 c 0,-43.48927 -35.71965,-79.26562 -79.13672,-79.26563 -34.94712,0 -64.86922,23.19608 -75.22851,54.91993 H 314.57422 V 280.41016 h 43.08398 c 10.3789,31.69063 40.28175,54.85742 75.20508,54.85742 C 476.28035,335.26757 512,299.48927 512,256 c 0,-43.48927 -35.71965,-79.26757 -79.13672,-79.26758 -34.92333,0 -64.82618,23.16679 -75.20508,54.85742 H 314.57422 V 103.67773 h 43.08398 c 10.37889,31.69063 40.28175,54.85743 75.20508,54.85743 C 476.28035,158.53515 512.00001,122.75881 512,79.269531 512,35.780261 476.28035,0 432.86328,0 Z"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -1562,18 +1562,18 @@ exports[`Canvas Catalog button should be present if \`CatalogModalContext\` is p
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Vertical Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 256,-0.00195313 c -41.77177,4.83e-6 -76.20117,34.33777113 -76.20117,76.10546913 -1e-5,33.245764 21.84391,61.720664 51.81054,71.982424 V 265.81445 H 55.074219 v 13.14844 h -0.275391 v 78.68359 C 23.150155,368.03955 1.9169543e-6,397.92105 0,432.84961 c 2.3846233e-6,43.44988 35.794913,79.15234 79.251953,79.15234 43.457047,1e-5 79.253907,-35.70245 79.253907,-79.15234 0,-34.97602 -23.2129,-64.89598 -54.92773,-75.25 v -43.00586 h 128.03124 v 43.0293 c -31.68129,10.37383 -54.86132,40.2746 -54.86132,75.22656 0,43.44988 35.79491,79.15234 79.25195,79.15234 43.45703,-10e-6 79.25195,-35.70246 79.25195,-79.15234 0,-34.9526 -23.18109,-64.85325 -54.86328,-75.22656 v -43.0293 h 127.96875 v 43.0293 c -31.6813,10.37383 -54.86328,40.27459 -54.86328,75.22656 0,43.44989 35.79686,79.15235 79.25391,79.15234 43.45704,0 79.25195,-35.70246 79.25195,-79.15234 0,-34.95261 -23.18109,-64.85326 -54.86328,-75.22656 v -78.66016 h -0.28516 V 265.81445 H 280.38867 V 148.08789 c 29.96786,-10.26106 51.81251,-38.73773 51.8125,-71.984374 0,-41.767698 -34.4294,-76.1054643 -76.20117,-76.10546913 z M 280.38867,63.634766 c 1.88026,3.732198 3.0332,7.918634 3.0332,12.46875 10e-6,4.550115 -1.15294,8.738504 -3.0332,12.470703 z m -48.7793,0.0039 v 24.93164 c -1.87901,-3.731258 -3.03125,-7.91827 -3.03125,-12.466796 0,-4.548526 1.15223,-8.733586 3.03125,-12.464844 z M 103.57813,414.50586 c 3.82192,5.07537 6.14843,11.3614 6.14843,18.34375 0,6.98235 -2.32651,13.26838 -6.14843,18.34375 z m 176.81054,0.0762 c 3.78578,5.0623 6.08399,11.32141 6.08399,18.26758 0,6.94616 -2.29821,13.20528 -6.08399,18.26758 z m 176.74805,0 c 3.78566,5.06225 6.08398,11.32153 6.08398,18.26758 0,6.94605 -2.29832,13.20533 -6.08398,18.26758 z m -225.52735,0.002 v 36.53125 c -3.78477,-5.06192 -6.08203,-11.32046 -6.08203,-18.26562 0,-6.94516 2.29726,-13.2037 6.08203,-18.26563 z m 176.74805,0 v 36.53125 c -3.78477,-5.06192 -6.08398,-11.32046 -6.08398,-18.26562 0,-6.94516 2.29921,-13.2037 6.08398,-18.26563 z m -353.558592,0.0762 v 36.3789 c -3.748649,-5.04863 -6.019531,-11.28059 -6.019531,-18.18945 0,-6.90886 2.270882,-13.14082 6.019531,-18.18945 z M 307.81153,76.104458 A 51.811546,51.716827 0 0 0 255.99999,24.387631 51.811546,51.716827 0 0 0 204.18845,76.104458 51.811546,51.716827 0 0 0 255.99999,127.82129 51.811546,51.716827 0 0 0 307.81153,76.104458 Z M 134.11561,432.84943 a 54.862992,54.762693 0 0 0 -54.863002,-54.76269 54.862992,54.762693 0 0 0 -54.862992,54.76269 54.862992,54.762693 0 0 0 54.862992,54.76269 54.862992,54.762693 0 0 0 54.863002,-54.76269 z m 353.49475,0 a 54.862992,54.762693 0 0 0 -54.86299,-54.76269 54.862992,54.762693 0 0 0 -54.863,54.76269 54.862992,54.762693 0 0 0 54.863,54.76269 54.862992,54.762693 0 0 0 54.86299,-54.76269 z m -176.74739,0 a 54.862992,54.762693 0 0 0 -54.86298,-54.76269 54.862992,54.762693 0 0 0 -54.86299,54.76269 54.862992,54.762693 0 0 0 54.86299,54.76269 54.862992,54.762693 0 0 0 54.86298,-54.76269 z M 79.18924,493.73631 V 278.96326 M 255.99999,493.73631 V 17.414482 M 432.74737,493.73631 V 278.96326 m 24.10342,11.23988 H 55.07487"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -1940,18 +1940,18 @@ exports[`Canvas Empty state should render empty state when there is no visible f
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Horizontal Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 432.86328,0 c -34.9234,-1e-5 -64.82625,23.168645 -75.20508,54.859375 h -78.69336 v 0.308594 h -13.1289 V 231.58984 H 148.05078 C 137.78436,201.61385 109.30753,179.7832 76.089844,179.7832 34.355088,179.7832 0,214.19584 0,256 c 0,41.80416 34.355088,76.2168 76.089844,76.2168 33.217686,0 61.694516,-21.83065 71.960936,-51.80664 H 265.83594 V 456.9082 h 13.1289 v 0.29688 h 78.7168 C 368.08021,488.86228 397.96389,512 432.86328,512 476.28035,512 512,476.21975 512,432.73047 c 0,-43.48927 -35.71965,-79.26562 -79.13672,-79.26563 -34.94712,0 -64.86922,23.19608 -75.22851,54.91993 H 314.57422 V 280.41016 h 43.08398 c 10.3789,31.69063 40.28175,54.85742 75.20508,54.85742 C 476.28035,335.26757 512,299.48927 512,256 c 0,-43.48927 -35.71965,-79.26757 -79.13672,-79.26758 -34.92333,0 -64.82618,23.16679 -75.20508,54.85742 H 314.57422 V 103.67773 h 43.08398 c 10.37889,31.69063 40.28175,54.85743 75.20508,54.85743 C 476.28035,158.53515 512.00001,122.75881 512,79.269531 512,35.780261 476.28035,0 432.86328,0 Z"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -1979,18 +1979,18 @@ exports[`Canvas Empty state should render empty state when there is no visible f
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Vertical Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 256,-0.00195313 c -41.77177,4.83e-6 -76.20117,34.33777113 -76.20117,76.10546913 -1e-5,33.245764 21.84391,61.720664 51.81054,71.982424 V 265.81445 H 55.074219 v 13.14844 h -0.275391 v 78.68359 C 23.150155,368.03955 1.9169543e-6,397.92105 0,432.84961 c 2.3846233e-6,43.44988 35.794913,79.15234 79.251953,79.15234 43.457047,1e-5 79.253907,-35.70245 79.253907,-79.15234 0,-34.97602 -23.2129,-64.89598 -54.92773,-75.25 v -43.00586 h 128.03124 v 43.0293 c -31.68129,10.37383 -54.86132,40.2746 -54.86132,75.22656 0,43.44988 35.79491,79.15234 79.25195,79.15234 43.45703,-10e-6 79.25195,-35.70246 79.25195,-79.15234 0,-34.9526 -23.18109,-64.85325 -54.86328,-75.22656 v -43.0293 h 127.96875 v 43.0293 c -31.6813,10.37383 -54.86328,40.27459 -54.86328,75.22656 0,43.44989 35.79686,79.15235 79.25391,79.15234 43.45704,0 79.25195,-35.70246 79.25195,-79.15234 0,-34.95261 -23.18109,-64.85326 -54.86328,-75.22656 v -78.66016 h -0.28516 V 265.81445 H 280.38867 V 148.08789 c 29.96786,-10.26106 51.81251,-38.73773 51.8125,-71.984374 0,-41.767698 -34.4294,-76.1054643 -76.20117,-76.10546913 z M 280.38867,63.634766 c 1.88026,3.732198 3.0332,7.918634 3.0332,12.46875 10e-6,4.550115 -1.15294,8.738504 -3.0332,12.470703 z m -48.7793,0.0039 v 24.93164 c -1.87901,-3.731258 -3.03125,-7.91827 -3.03125,-12.466796 0,-4.548526 1.15223,-8.733586 3.03125,-12.464844 z M 103.57813,414.50586 c 3.82192,5.07537 6.14843,11.3614 6.14843,18.34375 0,6.98235 -2.32651,13.26838 -6.14843,18.34375 z m 176.81054,0.0762 c 3.78578,5.0623 6.08399,11.32141 6.08399,18.26758 0,6.94616 -2.29821,13.20528 -6.08399,18.26758 z m 176.74805,0 c 3.78566,5.06225 6.08398,11.32153 6.08398,18.26758 0,6.94605 -2.29832,13.20533 -6.08398,18.26758 z m -225.52735,0.002 v 36.53125 c -3.78477,-5.06192 -6.08203,-11.32046 -6.08203,-18.26562 0,-6.94516 2.29726,-13.2037 6.08203,-18.26563 z m 176.74805,0 v 36.53125 c -3.78477,-5.06192 -6.08398,-11.32046 -6.08398,-18.26562 0,-6.94516 2.29921,-13.2037 6.08398,-18.26563 z m -353.558592,0.0762 v 36.3789 c -3.748649,-5.04863 -6.019531,-11.28059 -6.019531,-18.18945 0,-6.90886 2.270882,-13.14082 6.019531,-18.18945 z M 307.81153,76.104458 A 51.811546,51.716827 0 0 0 255.99999,24.387631 51.811546,51.716827 0 0 0 204.18845,76.104458 51.811546,51.716827 0 0 0 255.99999,127.82129 51.811546,51.716827 0 0 0 307.81153,76.104458 Z M 134.11561,432.84943 a 54.862992,54.762693 0 0 0 -54.863002,-54.76269 54.862992,54.762693 0 0 0 -54.862992,54.76269 54.862992,54.762693 0 0 0 54.862992,54.76269 54.862992,54.762693 0 0 0 54.863002,-54.76269 z m 353.49475,0 a 54.862992,54.762693 0 0 0 -54.86299,-54.76269 54.862992,54.762693 0 0 0 -54.863,54.76269 54.862992,54.762693 0 0 0 54.863,54.76269 54.862992,54.762693 0 0 0 54.86299,-54.76269 z m -176.74739,0 a 54.862992,54.762693 0 0 0 -54.86298,-54.76269 54.862992,54.762693 0 0 0 -54.86299,54.76269 54.862992,54.762693 0 0 0 54.86299,54.76269 54.862992,54.762693 0 0 0 54.86298,-54.76269 z M 79.18924,493.73631 V 278.96326 M 255.99999,493.73631 V 17.414482 M 432.74737,493.73631 V 278.96326 m 24.10342,11.23988 H 55.07487"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -2383,18 +2383,18 @@ exports[`Canvas Empty state should render empty state when there is no visual en
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Horizontal Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 432.86328,0 c -34.9234,-1e-5 -64.82625,23.168645 -75.20508,54.859375 h -78.69336 v 0.308594 h -13.1289 V 231.58984 H 148.05078 C 137.78436,201.61385 109.30753,179.7832 76.089844,179.7832 34.355088,179.7832 0,214.19584 0,256 c 0,41.80416 34.355088,76.2168 76.089844,76.2168 33.217686,0 61.694516,-21.83065 71.960936,-51.80664 H 265.83594 V 456.9082 h 13.1289 v 0.29688 h 78.7168 C 368.08021,488.86228 397.96389,512 432.86328,512 476.28035,512 512,476.21975 512,432.73047 c 0,-43.48927 -35.71965,-79.26562 -79.13672,-79.26563 -34.94712,0 -64.86922,23.19608 -75.22851,54.91993 H 314.57422 V 280.41016 h 43.08398 c 10.3789,31.69063 40.28175,54.85742 75.20508,54.85742 C 476.28035,335.26757 512,299.48927 512,256 c 0,-43.48927 -35.71965,-79.26757 -79.13672,-79.26758 -34.92333,0 -64.82618,23.16679 -75.20508,54.85742 H 314.57422 V 103.67773 h 43.08398 c 10.37889,31.69063 40.28175,54.85743 75.20508,54.85743 C 476.28035,158.53515 512.00001,122.75881 512,79.269531 512,35.780261 476.28035,0 432.86328,0 Z"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -2422,18 +2422,18 @@ exports[`Canvas Empty state should render empty state when there is no visual en
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Vertical Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 256,-0.00195313 c -41.77177,4.83e-6 -76.20117,34.33777113 -76.20117,76.10546913 -1e-5,33.245764 21.84391,61.720664 51.81054,71.982424 V 265.81445 H 55.074219 v 13.14844 h -0.275391 v 78.68359 C 23.150155,368.03955 1.9169543e-6,397.92105 0,432.84961 c 2.3846233e-6,43.44988 35.794913,79.15234 79.251953,79.15234 43.457047,1e-5 79.253907,-35.70245 79.253907,-79.15234 0,-34.97602 -23.2129,-64.89598 -54.92773,-75.25 v -43.00586 h 128.03124 v 43.0293 c -31.68129,10.37383 -54.86132,40.2746 -54.86132,75.22656 0,43.44988 35.79491,79.15234 79.25195,79.15234 43.45703,-10e-6 79.25195,-35.70246 79.25195,-79.15234 0,-34.9526 -23.18109,-64.85325 -54.86328,-75.22656 v -43.0293 h 127.96875 v 43.0293 c -31.6813,10.37383 -54.86328,40.27459 -54.86328,75.22656 0,43.44989 35.79686,79.15235 79.25391,79.15234 43.45704,0 79.25195,-35.70246 79.25195,-79.15234 0,-34.95261 -23.18109,-64.85326 -54.86328,-75.22656 v -78.66016 h -0.28516 V 265.81445 H 280.38867 V 148.08789 c 29.96786,-10.26106 51.81251,-38.73773 51.8125,-71.984374 0,-41.767698 -34.4294,-76.1054643 -76.20117,-76.10546913 z M 280.38867,63.634766 c 1.88026,3.732198 3.0332,7.918634 3.0332,12.46875 10e-6,4.550115 -1.15294,8.738504 -3.0332,12.470703 z m -48.7793,0.0039 v 24.93164 c -1.87901,-3.731258 -3.03125,-7.91827 -3.03125,-12.466796 0,-4.548526 1.15223,-8.733586 3.03125,-12.464844 z M 103.57813,414.50586 c 3.82192,5.07537 6.14843,11.3614 6.14843,18.34375 0,6.98235 -2.32651,13.26838 -6.14843,18.34375 z m 176.81054,0.0762 c 3.78578,5.0623 6.08399,11.32141 6.08399,18.26758 0,6.94616 -2.29821,13.20528 -6.08399,18.26758 z m 176.74805,0 c 3.78566,5.06225 6.08398,11.32153 6.08398,18.26758 0,6.94605 -2.29832,13.20533 -6.08398,18.26758 z m -225.52735,0.002 v 36.53125 c -3.78477,-5.06192 -6.08203,-11.32046 -6.08203,-18.26562 0,-6.94516 2.29726,-13.2037 6.08203,-18.26563 z m 176.74805,0 v 36.53125 c -3.78477,-5.06192 -6.08398,-11.32046 -6.08398,-18.26562 0,-6.94516 2.29921,-13.2037 6.08398,-18.26563 z m -353.558592,0.0762 v 36.3789 c -3.748649,-5.04863 -6.019531,-11.28059 -6.019531,-18.18945 0,-6.90886 2.270882,-13.14082 6.019531,-18.18945 z M 307.81153,76.104458 A 51.811546,51.716827 0 0 0 255.99999,24.387631 51.811546,51.716827 0 0 0 204.18845,76.104458 51.811546,51.716827 0 0 0 255.99999,127.82129 51.811546,51.716827 0 0 0 307.81153,76.104458 Z M 134.11561,432.84943 a 54.862992,54.762693 0 0 0 -54.863002,-54.76269 54.862992,54.762693 0 0 0 -54.862992,54.76269 54.862992,54.762693 0 0 0 54.862992,54.76269 54.862992,54.762693 0 0 0 54.863002,-54.76269 z m 353.49475,0 a 54.862992,54.762693 0 0 0 -54.86299,-54.76269 54.862992,54.762693 0 0 0 -54.863,54.76269 54.862992,54.762693 0 0 0 54.863,54.76269 54.862992,54.762693 0 0 0 54.86299,-54.76269 z m -176.74739,0 a 54.862992,54.762693 0 0 0 -54.86298,-54.76269 54.862992,54.762693 0 0 0 -54.86299,54.76269 54.862992,54.762693 0 0 0 54.86299,54.76269 54.862992,54.762693 0 0 0 54.86298,-54.76269 z M 79.18924,493.73631 V 278.96326 M 255.99999,493.73631 V 17.414482 M 432.74737,493.73631 V 278.96326 m 24.10342,11.23988 H 55.07487"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -3189,18 +3189,18 @@ exports[`Canvas should render correctly 1`] = `
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Horizontal Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 432.86328,0 c -34.9234,-1e-5 -64.82625,23.168645 -75.20508,54.859375 h -78.69336 v 0.308594 h -13.1289 V 231.58984 H 148.05078 C 137.78436,201.61385 109.30753,179.7832 76.089844,179.7832 34.355088,179.7832 0,214.19584 0,256 c 0,41.80416 34.355088,76.2168 76.089844,76.2168 33.217686,0 61.694516,-21.83065 71.960936,-51.80664 H 265.83594 V 456.9082 h 13.1289 v 0.29688 h 78.7168 C 368.08021,488.86228 397.96389,512 432.86328,512 476.28035,512 512,476.21975 512,432.73047 c 0,-43.48927 -35.71965,-79.26562 -79.13672,-79.26563 -34.94712,0 -64.86922,23.19608 -75.22851,54.91993 H 314.57422 V 280.41016 h 43.08398 c 10.3789,31.69063 40.28175,54.85742 75.20508,54.85742 C 476.28035,335.26757 512,299.48927 512,256 c 0,-43.48927 -35.71965,-79.26757 -79.13672,-79.26758 -34.92333,0 -64.82618,23.16679 -75.20508,54.85742 H 314.57422 V 103.67773 h 43.08398 c 10.37889,31.69063 40.28175,54.85743 75.20508,54.85743 C 476.28035,158.53515 512.00001,122.75881 512,79.269531 512,35.780261 476.28035,0 432.86328,0 Z"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -3228,18 +3228,18 @@ exports[`Canvas should render correctly 1`] = `
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Vertical Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 256,-0.00195313 c -41.77177,4.83e-6 -76.20117,34.33777113 -76.20117,76.10546913 -1e-5,33.245764 21.84391,61.720664 51.81054,71.982424 V 265.81445 H 55.074219 v 13.14844 h -0.275391 v 78.68359 C 23.150155,368.03955 1.9169543e-6,397.92105 0,432.84961 c 2.3846233e-6,43.44988 35.794913,79.15234 79.251953,79.15234 43.457047,1e-5 79.253907,-35.70245 79.253907,-79.15234 0,-34.97602 -23.2129,-64.89598 -54.92773,-75.25 v -43.00586 h 128.03124 v 43.0293 c -31.68129,10.37383 -54.86132,40.2746 -54.86132,75.22656 0,43.44988 35.79491,79.15234 79.25195,79.15234 43.45703,-10e-6 79.25195,-35.70246 79.25195,-79.15234 0,-34.9526 -23.18109,-64.85325 -54.86328,-75.22656 v -43.0293 h 127.96875 v 43.0293 c -31.6813,10.37383 -54.86328,40.27459 -54.86328,75.22656 0,43.44989 35.79686,79.15235 79.25391,79.15234 43.45704,0 79.25195,-35.70246 79.25195,-79.15234 0,-34.95261 -23.18109,-64.85326 -54.86328,-75.22656 v -78.66016 h -0.28516 V 265.81445 H 280.38867 V 148.08789 c 29.96786,-10.26106 51.81251,-38.73773 51.8125,-71.984374 0,-41.767698 -34.4294,-76.1054643 -76.20117,-76.10546913 z M 280.38867,63.634766 c 1.88026,3.732198 3.0332,7.918634 3.0332,12.46875 10e-6,4.550115 -1.15294,8.738504 -3.0332,12.470703 z m -48.7793,0.0039 v 24.93164 c -1.87901,-3.731258 -3.03125,-7.91827 -3.03125,-12.466796 0,-4.548526 1.15223,-8.733586 3.03125,-12.464844 z M 103.57813,414.50586 c 3.82192,5.07537 6.14843,11.3614 6.14843,18.34375 0,6.98235 -2.32651,13.26838 -6.14843,18.34375 z m 176.81054,0.0762 c 3.78578,5.0623 6.08399,11.32141 6.08399,18.26758 0,6.94616 -2.29821,13.20528 -6.08399,18.26758 z m 176.74805,0 c 3.78566,5.06225 6.08398,11.32153 6.08398,18.26758 0,6.94605 -2.29832,13.20533 -6.08398,18.26758 z m -225.52735,0.002 v 36.53125 c -3.78477,-5.06192 -6.08203,-11.32046 -6.08203,-18.26562 0,-6.94516 2.29726,-13.2037 6.08203,-18.26563 z m 176.74805,0 v 36.53125 c -3.78477,-5.06192 -6.08398,-11.32046 -6.08398,-18.26562 0,-6.94516 2.29921,-13.2037 6.08398,-18.26563 z m -353.558592,0.0762 v 36.3789 c -3.748649,-5.04863 -6.019531,-11.28059 -6.019531,-18.18945 0,-6.90886 2.270882,-13.14082 6.019531,-18.18945 z M 307.81153,76.104458 A 51.811546,51.716827 0 0 0 255.99999,24.387631 51.811546,51.716827 0 0 0 204.18845,76.104458 51.811546,51.716827 0 0 0 255.99999,127.82129 51.811546,51.716827 0 0 0 307.81153,76.104458 Z M 134.11561,432.84943 a 54.862992,54.762693 0 0 0 -54.863002,-54.76269 54.862992,54.762693 0 0 0 -54.862992,54.76269 54.862992,54.762693 0 0 0 54.862992,54.76269 54.862992,54.762693 0 0 0 54.863002,-54.76269 z m 353.49475,0 a 54.862992,54.762693 0 0 0 -54.86299,-54.76269 54.862992,54.762693 0 0 0 -54.863,54.76269 54.862992,54.762693 0 0 0 54.863,54.76269 54.862992,54.762693 0 0 0 54.86299,-54.76269 z m -176.74739,0 a 54.862992,54.762693 0 0 0 -54.86298,-54.76269 54.862992,54.762693 0 0 0 -54.86299,54.76269 54.862992,54.762693 0 0 0 54.86299,54.76269 54.862992,54.762693 0 0 0 54.86298,-54.76269 z M 79.18924,493.73631 V 278.96326 M 255.99999,493.73631 V 17.414482 M 432.74737,493.73631 V 278.96326 m 24.10342,11.23988 H 55.07487"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -3995,18 +3995,18 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Horizontal Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 432.86328,0 c -34.9234,-1e-5 -64.82625,23.168645 -75.20508,54.859375 h -78.69336 v 0.308594 h -13.1289 V 231.58984 H 148.05078 C 137.78436,201.61385 109.30753,179.7832 76.089844,179.7832 34.355088,179.7832 0,214.19584 0,256 c 0,41.80416 34.355088,76.2168 76.089844,76.2168 33.217686,0 61.694516,-21.83065 71.960936,-51.80664 H 265.83594 V 456.9082 h 13.1289 v 0.29688 h 78.7168 C 368.08021,488.86228 397.96389,512 432.86328,512 476.28035,512 512,476.21975 512,432.73047 c 0,-43.48927 -35.71965,-79.26562 -79.13672,-79.26563 -34.94712,0 -64.86922,23.19608 -75.22851,54.91993 H 314.57422 V 280.41016 h 43.08398 c 10.3789,31.69063 40.28175,54.85742 75.20508,54.85742 C 476.28035,335.26757 512,299.48927 512,256 c 0,-43.48927 -35.71965,-79.26757 -79.13672,-79.26758 -34.92333,0 -64.82618,23.16679 -75.20508,54.85742 H 314.57422 V 103.67773 h 43.08398 c 10.37889,31.69063 40.28175,54.85743 75.20508,54.85743 C 476.28035,158.53515 512.00001,122.75881 512,79.269531 512,35.780261 476.28035,0 432.86328,0 Z"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >
@@ -4034,18 +4034,18 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                 <span
                                   class="pf-v6-c-button__text"
                                 >
-                                  <span
-                                    class="pf-v6-c-icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    class="pf-v6-svg"
+                                    fill="currentColor"
+                                    height="1em"
+                                    viewBox="0 0 512 512"
+                                    width="1em"
                                   >
-                                    <span
-                                      class="pf-v6-c-icon__content"
-                                    >
-                                      <img
-                                        alt="Vertical Layout"
-                                        src=""
-                                      />
-                                    </span>
-                                  </span>
+                                    <path
+                                      d="m 256,-0.00195313 c -41.77177,4.83e-6 -76.20117,34.33777113 -76.20117,76.10546913 -1e-5,33.245764 21.84391,61.720664 51.81054,71.982424 V 265.81445 H 55.074219 v 13.14844 h -0.275391 v 78.68359 C 23.150155,368.03955 1.9169543e-6,397.92105 0,432.84961 c 2.3846233e-6,43.44988 35.794913,79.15234 79.251953,79.15234 43.457047,1e-5 79.253907,-35.70245 79.253907,-79.15234 0,-34.97602 -23.2129,-64.89598 -54.92773,-75.25 v -43.00586 h 128.03124 v 43.0293 c -31.68129,10.37383 -54.86132,40.2746 -54.86132,75.22656 0,43.44988 35.79491,79.15234 79.25195,79.15234 43.45703,-10e-6 79.25195,-35.70246 79.25195,-79.15234 0,-34.9526 -23.18109,-64.85325 -54.86328,-75.22656 v -43.0293 h 127.96875 v 43.0293 c -31.6813,10.37383 -54.86328,40.27459 -54.86328,75.22656 0,43.44989 35.79686,79.15235 79.25391,79.15234 43.45704,0 79.25195,-35.70246 79.25195,-79.15234 0,-34.95261 -23.18109,-64.85326 -54.86328,-75.22656 v -78.66016 h -0.28516 V 265.81445 H 280.38867 V 148.08789 c 29.96786,-10.26106 51.81251,-38.73773 51.8125,-71.984374 0,-41.767698 -34.4294,-76.1054643 -76.20117,-76.10546913 z M 280.38867,63.634766 c 1.88026,3.732198 3.0332,7.918634 3.0332,12.46875 10e-6,4.550115 -1.15294,8.738504 -3.0332,12.470703 z m -48.7793,0.0039 v 24.93164 c -1.87901,-3.731258 -3.03125,-7.91827 -3.03125,-12.466796 0,-4.548526 1.15223,-8.733586 3.03125,-12.464844 z M 103.57813,414.50586 c 3.82192,5.07537 6.14843,11.3614 6.14843,18.34375 0,6.98235 -2.32651,13.26838 -6.14843,18.34375 z m 176.81054,0.0762 c 3.78578,5.0623 6.08399,11.32141 6.08399,18.26758 0,6.94616 -2.29821,13.20528 -6.08399,18.26758 z m 176.74805,0 c 3.78566,5.06225 6.08398,11.32153 6.08398,18.26758 0,6.94605 -2.29832,13.20533 -6.08398,18.26758 z m -225.52735,0.002 v 36.53125 c -3.78477,-5.06192 -6.08203,-11.32046 -6.08203,-18.26562 0,-6.94516 2.29726,-13.2037 6.08203,-18.26563 z m 176.74805,0 v 36.53125 c -3.78477,-5.06192 -6.08398,-11.32046 -6.08398,-18.26562 0,-6.94516 2.29921,-13.2037 6.08398,-18.26563 z m -353.558592,0.0762 v 36.3789 c -3.748649,-5.04863 -6.019531,-11.28059 -6.019531,-18.18945 0,-6.90886 2.270882,-13.14082 6.019531,-18.18945 z M 307.81153,76.104458 A 51.811546,51.716827 0 0 0 255.99999,24.387631 51.811546,51.716827 0 0 0 204.18845,76.104458 51.811546,51.716827 0 0 0 255.99999,127.82129 51.811546,51.716827 0 0 0 307.81153,76.104458 Z M 134.11561,432.84943 a 54.862992,54.762693 0 0 0 -54.863002,-54.76269 54.862992,54.762693 0 0 0 -54.862992,54.76269 54.862992,54.762693 0 0 0 54.862992,54.76269 54.862992,54.762693 0 0 0 54.863002,-54.76269 z m 353.49475,0 a 54.862992,54.762693 0 0 0 -54.86299,-54.76269 54.862992,54.762693 0 0 0 -54.863,54.76269 54.862992,54.762693 0 0 0 54.863,54.76269 54.862992,54.762693 0 0 0 54.86299,-54.76269 z m -176.74739,0 a 54.862992,54.762693 0 0 0 -54.86298,-54.76269 54.862992,54.762693 0 0 0 -54.86299,54.76269 54.862992,54.762693 0 0 0 54.86299,54.76269 54.862992,54.762693 0 0 0 54.86298,-54.76269 z M 79.18924,493.73631 V 278.96326 M 255.99999,493.73631 V 17.414482 M 432.74737,493.73631 V 278.96326 m 24.10342,11.23988 H 55.07487"
+                                    />
+                                  </svg>
                                   <span
                                     class="pf-v6-screen-reader"
                                   >