diff --git a/packages/icon-build-helpers/src/builders/vanilla/svgo.js b/packages/icon-build-helpers/src/builders/vanilla/svgo.js
index 64bd93d46c82..43c787e99979 100644
--- a/packages/icon-build-helpers/src/builders/vanilla/svgo.js
+++ b/packages/icon-build-helpers/src/builders/vanilla/svgo.js
@@ -181,10 +181,10 @@ const plugins = [
     removeRasterImages: false,
   },
   {
-    mergePaths: true,
+    mergePaths: false,
   },
   {
-    convertShapeToPath: true,
+    convertShapeToPath: false,
   },
   {
     sortAttrs: true,
diff --git a/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap b/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap
index 3e5c454f16e3..4c64af83a00f 100644
--- a/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap
+++ b/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap
@@ -61,8 +61,8 @@ exports[`Accordion should render 1`] = `
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <path
-                    d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                  <polygon
+                    points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
                   />
                 </svg>
               </Icon>
@@ -134,8 +134,8 @@ exports[`Accordion should render 1`] = `
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <path
-                    d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                  <polygon
+                    points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
                   />
                 </svg>
               </Icon>
@@ -207,8 +207,8 @@ exports[`Accordion should render 1`] = `
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 >
-                  <path
-                    d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                  <polygon
+                    points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
                   />
                 </svg>
               </Icon>
diff --git a/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion.Skeleton-test.js.snap b/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion.Skeleton-test.js.snap
index 11c1a8fb6c56..391f6039161a 100644
--- a/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion.Skeleton-test.js.snap
+++ b/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion.Skeleton-test.js.snap
@@ -41,8 +41,8 @@ exports[`AccordionSkeleton should render 1`] = `
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+              <polygon
+                points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
               />
             </svg>
           </Icon>
@@ -149,8 +149,8 @@ exports[`AccordionSkeleton should render 1`] = `
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                <polygon
+                  points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
                 />
               </svg>
             </Icon>
@@ -209,8 +209,8 @@ exports[`AccordionSkeleton should render 1`] = `
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                <polygon
+                  points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
                 />
               </svg>
             </Icon>
@@ -269,8 +269,8 @@ exports[`AccordionSkeleton should render 1`] = `
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                <polygon
+                  points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
                 />
               </svg>
             </Icon>
diff --git a/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap b/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap
index b76bdba39f02..f97c5cd80a07 100644
--- a/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap
+++ b/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap
@@ -54,8 +54,8 @@ exports[`AccordionItem should render 1`] = `
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+              <polygon
+                points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
               />
             </svg>
           </Icon>
diff --git a/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js b/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js
index f93268df9952..372524623dbe 100644
--- a/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js
+++ b/packages/react/src/components/DataTable/__tests__/TableToolbarMenu-test.js
@@ -33,8 +33,8 @@ describe('Custom icon in DataTable.TableToolbarMenu', () => {
     );
     const originalIcon = mount(<Download16 />).find('svg');
     const icon = iconAction.find('svg');
-    expect(icon.find(':not(svg):not(title)').html()).toBe(
-      originalIcon.children().html()
+    expect(icon.getDOMNode().querySelectorAll(':not(svg):not(title)')).toEqual(
+      originalIcon.getDOMNode().querySelectorAll(':not(svg):not(title)')
     );
   });
 });
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
index 95d252a12916..e1aa558a66bc 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
@@ -2052,10 +2052,10 @@ exports[`DataTable should render 1`] = `
                               <path
                                 d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
                               />
-                              <path
-                                d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
+                              <polygon
                                 data-icon-path="inner-path"
                                 fill="none"
+                                points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
                               />
                             </svg>
                           </Icon>
@@ -2124,10 +2124,10 @@ exports[`DataTable should render 1`] = `
                               <path
                                 d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
                               />
-                              <path
-                                d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
+                              <polygon
                                 data-icon-path="inner-path"
                                 fill="none"
+                                points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
                               />
                             </svg>
                           </Icon>
@@ -2196,10 +2196,10 @@ exports[`DataTable should render 1`] = `
                               <path
                                 d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
                               />
-                              <path
-                                d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
+                              <polygon
                                 data-icon-path="inner-path"
                                 fill="none"
+                                points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
                               />
                             </svg>
                           </Icon>
@@ -2354,8 +2354,8 @@ exports[`DataTable should render 1`] = `
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+                              <polygon
+                                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
                               />
                             </svg>
                           </Icon>
@@ -3055,10 +3055,10 @@ exports[`DataTable sticky header should render 1`] = `
                               <path
                                 d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
                               />
-                              <path
-                                d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
+                              <polygon
                                 data-icon-path="inner-path"
                                 fill="none"
+                                points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
                               />
                             </svg>
                           </Icon>
@@ -3127,10 +3127,10 @@ exports[`DataTable sticky header should render 1`] = `
                               <path
                                 d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
                               />
-                              <path
-                                d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
+                              <polygon
                                 data-icon-path="inner-path"
                                 fill="none"
+                                points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
                               />
                             </svg>
                           </Icon>
@@ -3199,10 +3199,10 @@ exports[`DataTable sticky header should render 1`] = `
                               <path
                                 d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
                               />
-                              <path
-                                d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
+                              <polygon
                                 data-icon-path="inner-path"
                                 fill="none"
+                                points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
                               />
                             </svg>
                           </Icon>
@@ -3357,8 +3357,8 @@ exports[`DataTable sticky header should render 1`] = `
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+                              <polygon
+                                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
                               />
                             </svg>
                           </Icon>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap
index 6e139bc633cc..74704e5be878 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap
@@ -66,10 +66,10 @@ exports[`DataTable.TableBatchAction should render 1`] = `
             <path
               d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
             />
-            <path
-              d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
+            <polygon
               data-icon-path="inner-path"
               fill="none"
+              points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
             />
           </svg>
         </Icon>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap
index 4d0ddc0a99fc..6211ac4e698d 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap
@@ -63,8 +63,8 @@ exports[`DataTable.TableExpandRow should render 1`] = `
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
+                        <polygon
+                          points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
                         />
                       </svg>
                     </Icon>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap
index 33cbaab29e01..864f99c5249b 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap
@@ -100,8 +100,11 @@ exports[`DataTable.TableToolbarMenu should render 1`] = `
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
+                <polygon
+                  points="13,7 12.3,6.3 8.5,10.1 8.5,1 7.5,1 7.5,10.1 3.7,6.3 3,7 8,12"
+                />
                 <path
-                  d="M13 7L12.3 6.3 8.5 10.1 8.5 1 7.5 1 7.5 10.1 3.7 6.3 3 7 8 12zM13 12v2H3v-2H2v2l0 0c0 .6.4 1 1 1h10c.6 0 1-.4 1-1l0 0v-2H13z"
+                  d="M13,12v2H3v-2H2v2l0,0c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1l0,0v-2H13z"
                 />
                 <title>
                   Add
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
index 2d7ed46fe59a..85734f4734f0 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
@@ -113,8 +113,8 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+                <polygon
+                  points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
                 />
               </svg>
             </Icon>
diff --git a/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap b/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap
index 4efcfec5e8f9..cafc77c19a68 100644
--- a/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap
+++ b/packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap
@@ -154,8 +154,8 @@ exports[`Dropdown should render 1`] = `
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                        <polygon
+                          points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
                         />
                         <title>
                           Open menu
@@ -328,8 +328,8 @@ exports[`Dropdown should render custom item components 1`] = `
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                        <polygon
+                          points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
                         />
                         <title>
                           Close menu
@@ -661,8 +661,8 @@ exports[`Dropdown should render with strings as items 1`] = `
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                        <polygon
+                          points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
                         />
                         <title>
                           Close menu
diff --git a/packages/react/src/components/FileUploader/__snapshots__/FileUploader-test.js.snap b/packages/react/src/components/FileUploader/__snapshots__/FileUploader-test.js.snap
index 8b0fdeeedd0e..1eb5d68d8aaf 100644
--- a/packages/react/src/components/FileUploader/__snapshots__/FileUploader-test.js.snap
+++ b/packages/react/src/components/FileUploader/__snapshots__/FileUploader-test.js.snap
@@ -87,8 +87,8 @@ exports[`Filename renders as expected renders upload status icon as expected 2`]
         width={16}
         xmlns="http://www.w3.org/2000/svg"
       >
-        <path
-          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+        <polygon
+          points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
         />
         <title>
           Upload complete
diff --git a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap
index efa5b5d31885..cdeb6f19c5f4 100644
--- a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap
+++ b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxField-test.js.snap
@@ -47,8 +47,8 @@ exports[`ListBoxField should render 1`] = `
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+              <polygon
+                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
               />
             </svg>
           </Icon>
@@ -108,8 +108,8 @@ exports[`ListBoxField should set \`aria-owns\` based when expanded 1`] = `
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+              <polygon
+                points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
               />
             </svg>
           </Icon>
diff --git a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap
index 757ff45f3745..4443bbb999a5 100644
--- a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap
+++ b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxMenuIcon-test.js.snap
@@ -37,8 +37,8 @@ exports[`ListBoxMenuIcon should render 1`] = `
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <path
-            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+          <polygon
+            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
           />
           <title>
             Close menu
@@ -87,8 +87,8 @@ exports[`ListBoxMenuIcon should render 2`] = `
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <path
-            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+          <polygon
+            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
           />
           <title>
             Open menu
diff --git a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap
index 957c19cc7999..8e7e67e2ee1a 100644
--- a/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap
+++ b/packages/react/src/components/ListBox/__tests__/__snapshots__/ListBoxSelection-test.js.snap
@@ -57,8 +57,8 @@ exports[`ListBoxSelection should render 1`] = `
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <path
-            d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+          <polygon
+            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
           />
         </svg>
       </Icon>
@@ -126,8 +126,8 @@ exports[`ListBoxSelection should render 2`] = `
           width={16}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <path
-            d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+          <polygon
+            points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
           />
         </svg>
       </Icon>
diff --git a/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap b/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
index 26cbea0e21c7..a220fc4fc9a9 100644
--- a/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
+++ b/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
@@ -132,8 +132,8 @@ exports[`ModalWrapper should render 1`] = `
                     width={20}
                     xmlns="http://www.w3.org/2000/svg"
                   >
-                    <path
-                      d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+                    <polygon
+                      points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
                     />
                   </svg>
                 </Icon>
@@ -192,8 +192,8 @@ exports[`ModalWrapper should render 1`] = `
                       width="20"
                       xmlns="http://www.w3.org/2000/svg"
                     >
-                      <path
-                        d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+                      <polygon
+                        points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
                       />
                     </svg>
                   </button>,
@@ -227,8 +227,8 @@ exports[`ModalWrapper should render 1`] = `
                         width="20"
                         xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
+                        <polygon
+                          points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
                         />
                       </svg>
                     </button>,
diff --git a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap
index 19896c350ec8..ef33ee58bf27 100644
--- a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap
+++ b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/FilterableMultiSelect-test.js.snap
@@ -171,8 +171,8 @@ exports[`MultiSelect.Filterable should render 1`] = `
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <path
-                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                          <polygon
+                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
                           />
                           <title>
                             Open menu
diff --git a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap
index b8281b17a31b..aea160f4487b 100644
--- a/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap
+++ b/packages/react/src/components/MultiSelect/__tests__/__snapshots__/MultiSelect-test.js.snap
@@ -164,8 +164,8 @@ exports[`MultiSelect should render 1`] = `
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
-                          <path
-                            d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                          <polygon
+                            points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
                           />
                           <title>
                             Open menu
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap
index a341d4373248..e2bbd4ca378c 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderGlobalAction-test.js.snap
@@ -36,7 +36,19 @@ exports[`HeaderGlobalAction should render 1`] = `
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M8.24 25.14L7 26.67a13.79 13.79 0 004.18 2.44l.69-1.87A12 12 0 018.24 25.14zM4.19 18l-2 .41A14.09 14.09 0 003.86 23L5.59 22A12.44 12.44 0 014.19 18zM11.82 4.76l-.69-1.87A13.79 13.79 0 007 5.33L8.24 6.86A12 12 0 0111.82 4.76zM5.59 10L3.86 9a14.37 14.37 0 00-1.64 4.59l2 .34A12.05 12.05 0 015.59 10zM16 2V4a12 12 0 010 24v2A14 14 0 0016 2z"
+            d="M8.24,25.14,7,26.67a13.79,13.79,0,0,0,4.18,2.44l.69-1.87A12,12,0,0,1,8.24,25.14Z"
+          />
+          <path
+            d="M4.19,18l-2,.41A14.09,14.09,0,0,0,3.86,23L5.59,22A12.44,12.44,0,0,1,4.19,18Z"
+          />
+          <path
+            d="M11.82,4.76l-.69-1.87A13.79,13.79,0,0,0,7,5.33L8.24,6.86A12,12,0,0,1,11.82,4.76Z"
+          />
+          <path
+            d="M5.59,10,3.86,9a14.37,14.37,0,0,0-1.64,4.59l2,.34A12.05,12.05,0,0,1,5.59,10Z"
+          />
+          <path
+            d="M16,2V4a12,12,0,0,1,0,24v2A14,14,0,0,0,16,2Z"
           />
         </svg>
       </Icon>
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap
index ed9eae8a7e05..1a7792aae6b0 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenu-test.js.snap
@@ -47,8 +47,8 @@ exports[`HeaderMenu should render 1`] = `
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                <polygon
+                  points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
                 />
               </svg>
             </Icon>
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap
index 45b5b538e4f8..f668021474a3 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/HeaderMenuButton-test.js.snap
@@ -36,8 +36,29 @@ exports[`HeaderMenuButton should render 1`] = `
           width={20}
           xmlns="http://www.w3.org/2000/svg"
         >
-          <path
-            d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
+          <rect
+            height="1.2"
+            width="16"
+            x="2"
+            y="14.8"
+          />
+          <rect
+            height="1.2"
+            width="16"
+            x="2"
+            y="11.2"
+          />
+          <rect
+            height="1.2"
+            width="16"
+            x="2"
+            y="7.6"
+          />
+          <rect
+            height="1.2"
+            width="16"
+            x="2"
+            y="4"
           />
         </svg>
       </Icon>
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap
index 627de87c7b1c..c83f95a5d044 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavFooter-test.js.snap
@@ -40,8 +40,8 @@ exports[`SideNavFooter should render 1`] = `
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M22 16L12 26 10.6 24.6 19.2 16 10.6 7.4 12 6z"
+              <polygon
+                points="22,16 12,26 10.6,24.6 19.2,16 10.6,7.4 12,6"
               />
             </svg>
           </Icon>
@@ -98,8 +98,8 @@ exports[`SideNavFooter should render 2`] = `
               width={20}
               xmlns="http://www.w3.org/2000/svg"
             >
-              <path
-                d="M22 16L12 26 10.6 24.6 19.2 16 10.6 7.4 12 6z"
+              <polygon
+                points="22,16 12,26 10.6,24.6 19.2,16 10.6,7.4 12,6"
               />
             </svg>
           </Icon>
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap
index 8f4a77e6a159..2ddbe252b96a 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavMenu-test.js.snap
@@ -37,8 +37,8 @@ exports[`SideNavMenu should render 1`] = `
                 width="20"
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M16 22L6 12 7.4 10.6 16 19.2 24.6 10.6 26 12z"
+                <polygon
+                  points="16,22 6,12 7.4,10.6 16,19.2 24.6,10.6 26,12"
                 />
               </svg>
             </div>
@@ -118,8 +118,8 @@ exports[`SideNavMenu should render 1`] = `
                 width={20}
                 xmlns="http://www.w3.org/2000/svg"
               >
-                <path
-                  d="M16 22L6 12 7.4 10.6 16 19.2 24.6 10.6 26 12z"
+                <polygon
+                  points="16,22 6,12 7.4,10.6 16,19.2 24.6,10.6 26,12"
                 />
               </svg>
             </Icon>
diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap
index 9d91ebbf33b2..e62e6baf90bc 100644
--- a/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap
+++ b/packages/react/src/components/UIShell/__tests__/__snapshots__/SideNavSwitcher-test.js.snap
@@ -84,8 +84,8 @@ exports[`SideNavSwitcher should render 1`] = `
             width={20}
             xmlns="http://www.w3.org/2000/svg"
           >
-            <path
-              d="M16 22L6 12 7.4 10.6 16 19.2 24.6 10.6 26 12z"
+            <polygon
+              points="16,22 6,12 7.4,10.6 16,19.2 24.6,10.6 26,12"
             />
           </svg>
         </Icon>