diff --git a/packages/core/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap b/packages/core/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
index 03e2a2cd8a..a7d87f9d8d 100644
--- a/packages/core/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
+++ b/packages/core/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
@@ -230,7 +230,7 @@ exports[`extension special characters in page registrations renders 1`] = `
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -434,7 +434,7 @@ exports[`extension special characters in page registrations when navigating to r
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap b/packages/core/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
index 5a864f8096..7c99971862 100644
--- a/packages/core/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
+++ b/packages/core/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
@@ -230,7 +230,7 @@ exports[`navigate to extension page renders 1`] = `
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -434,7 +434,7 @@ exports[`navigate to extension page when extension navigates to child route rend
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -654,7 +654,7 @@ exports[`navigate to extension page when extension navigates to route with param
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -874,7 +874,7 @@ exports[`navigate to extension page when extension navigates to route without pa
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1094,7 +1094,7 @@ exports[`navigate to extension page when extension navigates to route without pa
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/__snapshots__/navigating-between-routes.test.tsx.snap b/packages/core/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
index 98b22c8ec3..f20a08fcd7 100644
--- a/packages/core/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
+++ b/packages/core/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
@@ -154,7 +154,7 @@ exports[`navigating between routes given route with optional path parameters whe
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -358,7 +358,7 @@ exports[`navigating between routes given route without path parameters when navi
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/packages/core/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index 4bd662e2f0..61da0fa47f 100644
--- a/packages/core/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/packages/core/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -230,7 +230,7 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -518,7 +518,7 @@ exports[`add-cluster - navigation using application menu when navigating to add
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/application-update/__snapshots__/installing-update.test.ts.snap b/packages/core/src/features/application-update/__snapshots__/installing-update.test.ts.snap
index cd0d55e25f..838372e21f 100644
--- a/packages/core/src/features/application-update/__snapshots__/installing-update.test.ts.snap
+++ b/packages/core/src/features/application-update/__snapshots__/installing-update.test.ts.snap
@@ -231,7 +231,7 @@ exports[`installing update when started renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -516,7 +516,7 @@ exports[`installing update when started when user checks for updates renders 1`]
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -801,7 +801,7 @@ exports[`installing update when started when user checks for updates when new up
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1706,7 +1706,7 @@ exports[`installing update when started when user checks for updates when new up
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2016,7 +2016,7 @@ exports[`installing update when started when user checks for updates when new up
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2301,7 +2301,7 @@ exports[`installing update when started when user checks for updates when no new
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap b/packages/core/src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
index 26fd923e16..1fed4674c7 100644
--- a/packages/core/src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
+++ b/packages/core/src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
@@ -256,7 +256,7 @@ exports[`encourage user to update when sufficient time passed since update was d
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -541,7 +541,7 @@ exports[`encourage user to update when sufficient time passed since update was d
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap b/packages/core/src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap
index 36779dc42e..1dae5dc1f3 100644
--- a/packages/core/src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap
+++ b/packages/core/src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap
@@ -231,7 +231,7 @@ exports[`installing update using tray when started renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -516,7 +516,7 @@ exports[`installing update using tray when started when user checks for updates
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -801,7 +801,7 @@ exports[`installing update using tray when started when user checks for updates
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1086,7 +1086,7 @@ exports[`installing update using tray when started when user checks for updates
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1396,7 +1396,7 @@ exports[`installing update using tray when started when user checks for updates
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1681,7 +1681,7 @@ exports[`installing update using tray when started when user checks for updates
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/application-update/child-features/force-update/__snapshots__/force-update.test.ts.snap b/packages/core/src/features/application-update/child-features/force-update/__snapshots__/force-update.test.ts.snap
index 5dd749857a..17541b10b6 100644
--- a/packages/core/src/features/application-update/child-features/force-update/__snapshots__/force-update.test.ts.snap
+++ b/packages/core/src/features/application-update/child-features/force-update/__snapshots__/force-update.test.ts.snap
@@ -256,7 +256,7 @@ exports[`force user to update when too long since update was downloaded when app
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -566,7 +566,7 @@ exports[`force user to update when too long since update was downloaded when app
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -923,7 +923,7 @@ exports[`force user to update when too long since update was downloaded when app
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap
index e6ae682c92..a0594118a9 100644
--- a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap
+++ b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap
@@ -231,7 +231,7 @@ exports[`periodical checking of updates given updater is enabled and configurati
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap b/packages/core/src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap
index 9e77201bf3..6ba19e2866 100644
--- a/packages/core/src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap
+++ b/packages/core/src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap
@@ -231,7 +231,7 @@ exports[`selection of update stability when started renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap b/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap
index 75fc3f2ffd..b6f79cb965 100644
--- a/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap
+++ b/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap
@@ -231,7 +231,7 @@ exports[`opening catalog entity details panel renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1052,7 +1052,7 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1873,7 +1873,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2726,7 +2726,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -3579,7 +3579,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -4683,7 +4683,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -5524,7 +5524,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -6841,7 +6841,7 @@ exports[`opening catalog entity details panel when not navigated to the catalog
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap b/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
index 980e1a5461..2d3ce252d6 100644
--- a/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
+++ b/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
@@ -542,7 +542,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1194,7 +1194,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1879,7 +1879,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2643,7 +2643,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -3407,7 +3407,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap b/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
index 0269032531..0ccdeaaee5 100644
--- a/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
+++ b/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
@@ -322,7 +322,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -698,7 +698,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing ESC
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1074,7 +1074,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1462,7 +1462,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1747,7 +1747,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2032,7 +2032,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing ESC
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2317,7 +2317,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2614,7 +2614,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/entity-settings/__snapshots__/showing-settings-for-correct-entity.test.tsx.snap b/packages/core/src/features/entity-settings/__snapshots__/showing-settings-for-correct-entity.test.tsx.snap
index bb30b0dc71..f8addbd6b9 100644
--- a/packages/core/src/features/entity-settings/__snapshots__/showing-settings-for-correct-entity.test.tsx.snap
+++ b/packages/core/src/features/entity-settings/__snapshots__/showing-settings-for-correct-entity.test.tsx.snap
@@ -231,7 +231,7 @@ exports[`Showing correct entity settings renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -593,7 +593,7 @@ exports[`Showing correct entity settings when navigating to local cluster entity
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -976,7 +976,7 @@ exports[`Showing correct entity settings when navigating to non-local cluster en
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1261,7 +1261,7 @@ exports[`Showing correct entity settings when navigating to weblink entity setti
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/packages/core/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index 53dc28e961..2503b4cf67 100644
--- a/packages/core/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/packages/core/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -230,7 +230,7 @@ exports[`extensions - navigation using application menu renders 1`] = `
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -543,7 +543,7 @@ exports[`extensions - navigation using application menu when navigating to exten
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/packages/core/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index 7932686bbf..10a37371d0 100644
--- a/packages/core/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/packages/core/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -649,7 +649,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1391,7 +1391,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2133,7 +2133,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2986,7 +2986,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -3736,7 +3736,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -4589,7 +4589,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -5624,7 +5624,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -6477,7 +6477,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -7512,7 +7512,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -8366,7 +8366,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -9105,7 +9105,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -9844,7 +9844,7 @@ exports[`add custom helm repository in preferences when navigating to preference
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/packages/core/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 516b4a0e1e..dc2f020cb4 100644
--- a/packages/core/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/packages/core/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -649,7 +649,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1391,7 +1391,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2135,7 +2135,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2928,7 +2928,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -3670,7 +3670,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -4401,7 +4401,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -5177,7 +5177,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -5955,7 +5955,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -6792,7 +6792,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -7523,7 +7523,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/packages/core/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 08746bc247..473338c42d 100644
--- a/packages/core/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/packages/core/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -649,7 +649,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1380,7 +1380,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2003,7 +2003,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2734,7 +2734,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -3357,7 +3357,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -4088,7 +4088,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -4864,7 +4864,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -5487,7 +5487,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -6110,7 +6110,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -6733,7 +6733,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/packages/core/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index afac42ce72..666f4f79e6 100644
--- a/packages/core/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/packages/core/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -649,7 +649,7 @@ exports[`remove helm repository from list of active repositories in preferences
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1363,7 +1363,7 @@ exports[`remove helm repository from list of active repositories in preferences
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2077,7 +2077,7 @@ exports[`remove helm repository from list of active repositories in preferences
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -2808,7 +2808,7 @@ exports[`remove helm repository from list of active repositories in preferences
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/packages/core/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index 23530d3cb7..370bd4d7ef 100644
--- a/packages/core/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/packages/core/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -709,7 +709,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1057,7 +1057,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1263,7 +1263,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1469,7 +1469,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2231,7 +2231,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2579,7 +2579,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2785,7 +2785,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2991,7 +2991,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap b/packages/core/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
index 58ee657697..1376328790 100644
--- a/packages/core/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
+++ b/packages/core/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
@@ -722,7 +722,7 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap b/packages/core/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
index 6ea4376818..2b2c8b591a 100644
--- a/packages/core/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
+++ b/packages/core/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
@@ -697,7 +697,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1475,7 +1475,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2265,7 +2265,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.tsx.snap b/packages/core/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.tsx.snap
index f7c8e0925b..6c6d6ff7b1 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.tsx.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.tsx.snap
@@ -697,7 +697,7 @@ exports[`preferences - navigation to application preferences given in preference
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1478,7 +1478,7 @@ exports[`preferences - navigation to application preferences given in preference
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1884,7 +1884,7 @@ exports[`preferences - navigation to application preferences given in some child
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2634,7 +2634,7 @@ exports[`preferences - navigation to application preferences given in some child
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -3385,7 +3385,7 @@ exports[`preferences - navigation to application preferences given in some child
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap b/packages/core/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
index 8a4ee12180..2e4bd39d72 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
@@ -697,7 +697,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1336,7 +1336,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/packages/core/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index 959eb2c63d..4ef2f47f93 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -710,7 +710,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1090,7 +1090,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1481,7 +1481,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1872,7 +1872,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2289,7 +2289,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -3039,7 +3039,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -3827,7 +3827,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -4232,7 +4232,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -4568,7 +4568,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/packages/core/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
index b796e7b0b3..a52174e6e8 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
@@ -697,7 +697,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1374,7 +1374,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/packages/core/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
index 0acaad9d5c..d491c50bd9 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
@@ -697,7 +697,7 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1103,7 +1103,7 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap b/packages/core/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
index 9170bff635..c21712c25b 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
@@ -337,7 +337,7 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1087,7 +1087,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1849,7 +1849,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2228,7 +2228,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -2567,7 +2567,7 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap b/packages/core/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
index 0c485b5f27..b55ae7447c 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
@@ -697,7 +697,7 @@ exports[`preferences - navigation to terminal preferences given in preferences,
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -1310,7 +1310,7 @@ exports[`preferences - navigation to terminal preferences given in preferences,
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap b/packages/core/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
index 855c4c54eb..7ea54c611e 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -230,7 +230,7 @@ exports[`preferences - navigation using application menu renders 1`] = `
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -980,7 +980,7 @@ exports[`preferences - navigation using application menu when navigating to pref
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
diff --git a/packages/core/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap b/packages/core/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
index c0ab06204e..443aebbfb2 100644
--- a/packages/core/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
+++ b/packages/core/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
@@ -231,7 +231,7 @@ exports[`show-about-using-tray renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -983,7 +983,7 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/preferences/__snapshots__/urls-of-legacy-extensions.test.tsx.snap b/packages/core/src/features/preferences/__snapshots__/urls-of-legacy-extensions.test.tsx.snap
index 6b9a2c8f04..9b1fb32701 100644
--- a/packages/core/src/features/preferences/__snapshots__/urls-of-legacy-extensions.test.tsx.snap
+++ b/packages/core/src/features/preferences/__snapshots__/urls-of-legacy-extensions.test.tsx.snap
@@ -375,7 +375,7 @@ exports[`preferences: URLs of legacy extensions given extension with both custom
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -804,7 +804,7 @@ exports[`preferences: URLs of legacy extensions given extension with both custom
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1195,7 +1195,7 @@ exports[`preferences: URLs of legacy extensions given extension with custom pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1560,7 +1560,7 @@ exports[`preferences: URLs of legacy extensions given extension with custom pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1965,7 +1965,7 @@ exports[`preferences: URLs of legacy extensions given extension with custom pref
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap b/packages/core/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
index f652074bf8..1b6bd6255d 100644
--- a/packages/core/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
+++ b/packages/core/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
@@ -231,7 +231,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap b/packages/core/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
index 179c2bf3f1..f1124906b5 100644
--- a/packages/core/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
+++ b/packages/core/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
@@ -231,7 +231,7 @@ exports[`extendability-using-extension-api given an extension with a weakly type
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -525,7 +525,7 @@ exports[`extendability-using-extension-api given an extension with top-bar items
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -810,7 +810,7 @@ exports[`extendability-using-extension-api given an extension with top-bar items
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1095,7 +1095,7 @@ exports[`extendability-using-extension-api renders 1`] = `
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
diff --git a/packages/core/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap b/packages/core/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
index 4016a617c3..ca327df5c9 100644
--- a/packages/core/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/packages/core/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -230,7 +230,7 @@ exports[`welcome - navigation using application menu renders 1`] = `
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span
@@ -981,7 +981,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
           class="HotbarSelector"
         >
           <i
-            class="Icon Icon previous material interactive focusable"
+            class="Icon previous material interactive focusable"
             tabindex="0"
           >
             <span
@@ -1265,7 +1265,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
         class="HotbarSelector"
       >
         <i
-          class="Icon Icon previous material interactive focusable"
+          class="Icon previous material interactive focusable"
           tabindex="0"
         >
           <span