diff --git a/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap b/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap
index 0dadfade96..7fda6db615 100644
--- a/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap
+++ b/src/behaviours/pod-logs/__snapshots__/download-logs.test.tsx.snap
@@ -40,7 +40,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
             >
               <a
                 aria-current="page"
-                class="nav-item flex gaps align-center expandable active"
+                class="navItem active"
                 data-testid="sidebar-item-link-for-workloads"
                 href="/"
               >
@@ -51,13 +51,11 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                     class="icon"
                   />
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Workloads
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"
@@ -74,7 +72,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
               data-testid="sidebar-item-config"
             >
               <a
-                class="nav-item flex gaps align-center"
+                class="navItem"
                 data-testid="sidebar-item-link-for-config"
                 href="/"
               >
@@ -88,9 +86,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                     list
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Config
                 </span>
               </a>
@@ -101,7 +97,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
               data-testid="sidebar-item-network"
             >
               <a
-                class="nav-item flex gaps align-center expandable"
+                class="navItem"
                 data-testid="sidebar-item-link-for-network"
                 href="/"
               >
@@ -115,13 +111,11 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                     device_hub
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Network
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"
@@ -138,7 +132,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
               data-testid="sidebar-item-storage"
             >
               <a
-                class="nav-item flex gaps align-center"
+                class="navItem"
                 data-testid="sidebar-item-link-for-storage"
                 href="/"
               >
@@ -152,9 +146,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                     storage
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Storage
                 </span>
               </a>
@@ -165,7 +157,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
               data-testid="sidebar-item-helm"
             >
               <a
-                class="nav-item flex gaps align-center expandable"
+                class="navItem"
                 data-testid="sidebar-item-link-for-helm"
                 href="/"
               >
@@ -176,13 +168,11 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                     class="icon"
                   />
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Helm
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"
@@ -199,7 +189,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
               data-testid="sidebar-item-user-management"
             >
               <a
-                class="nav-item flex gaps align-center"
+                class="navItem"
                 data-testid="sidebar-item-link-for-user-management"
                 href="/"
               >
@@ -213,9 +203,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                     security
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Access Control
                 </span>
               </a>
@@ -226,7 +214,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
               data-testid="sidebar-item-custom-resources"
             >
               <a
-                class="nav-item flex gaps align-center expandable"
+                class="navItem"
                 data-testid="sidebar-item-link-for-custom-resources"
                 href="/"
               >
@@ -240,13 +228,11 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                     extension
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Custom Resources
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"
diff --git a/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap b/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap
index d760b5c0c2..6dbe47992f 100644
--- a/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap
@@ -40,7 +40,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
             >
               <a
                 aria-current="page"
-                class="nav-item flex gaps align-center expandable active"
+                class="navItem active"
                 data-testid="sidebar-item-link-for-workloads"
                 href="/"
               >
@@ -51,13 +51,11 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                     class="icon"
                   />
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Workloads
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"
@@ -74,7 +72,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
               data-testid="sidebar-item-config"
             >
               <a
-                class="nav-item flex gaps align-center"
+                class="navItem"
                 data-testid="sidebar-item-link-for-config"
                 href="/"
               >
@@ -88,9 +86,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                     list
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Config
                 </span>
               </a>
@@ -101,7 +97,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
               data-testid="sidebar-item-network"
             >
               <a
-                class="nav-item flex gaps align-center expandable"
+                class="navItem"
                 data-testid="sidebar-item-link-for-network"
                 href="/"
               >
@@ -115,13 +111,11 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                     device_hub
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Network
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"
@@ -138,7 +132,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
               data-testid="sidebar-item-storage"
             >
               <a
-                class="nav-item flex gaps align-center"
+                class="navItem"
                 data-testid="sidebar-item-link-for-storage"
                 href="/"
               >
@@ -152,9 +146,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                     storage
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Storage
                 </span>
               </a>
@@ -165,7 +157,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
               data-testid="sidebar-item-helm"
             >
               <a
-                class="nav-item flex gaps align-center expandable"
+                class="navItem"
                 data-testid="sidebar-item-link-for-helm"
                 href="/"
               >
@@ -176,13 +168,11 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                     class="icon"
                   />
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Helm
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"
@@ -199,7 +189,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
               data-testid="sidebar-item-user-management"
             >
               <a
-                class="nav-item flex gaps align-center"
+                class="navItem"
                 data-testid="sidebar-item-link-for-user-management"
                 href="/"
               >
@@ -213,9 +203,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                     security
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Access Control
                 </span>
               </a>
@@ -226,7 +214,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
               data-testid="sidebar-item-custom-resources"
             >
               <a
-                class="nav-item flex gaps align-center expandable"
+                class="navItem"
                 data-testid="sidebar-item-link-for-custom-resources"
                 href="/"
               >
@@ -240,13 +228,11 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                     extension
                   </span>
                 </i>
-                <span
-                  class="link-text box grow"
-                >
+                <span>
                   Custom Resources
                 </span>
                 <i
-                  class="Icon expand-icon box right material focusable"
+                  class="Icon expandIcon material focusable"
                 >
                   <span
                     class="icon"