diff --git a/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
index 7f76811494..8a293a41f9 100644
--- a/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
@@ -484,6 +484,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -493,7 +494,9 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1096,6 +1099,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1105,7 +1109,9 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
index 49fcc917a4..6d64889cff 100644
--- a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
@@ -457,6 +457,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -466,7 +467,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -990,6 +993,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -999,7 +1003,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1543,6 +1549,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1552,7 +1559,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1976,6 +1985,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1985,7 +1995,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2388,6 +2400,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2397,7 +2410,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2941,6 +2956,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2950,7 +2966,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -3474,6 +3492,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -3483,7 +3502,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
index fff3da0126..ac415ae3e2 100644
--- a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
@@ -457,6 +457,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -466,7 +467,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -990,6 +993,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -999,7 +1003,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1559,6 +1565,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1568,7 +1575,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2047,6 +2056,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2056,7 +2066,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2535,6 +2547,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2544,7 +2557,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2986,6 +3001,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2995,7 +3011,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -3555,6 +3573,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -3564,7 +3583,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -4088,6 +4109,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -4097,7 +4119,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap b/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
index ed36d5134f..7fe8edf8cf 100644
--- a/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
@@ -429,6 +429,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -438,7 +439,9 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -974,6 +977,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -983,7 +987,9 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
index d7daa6bf14..7c81e1dfd7 100644
--- a/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
@@ -310,6 +310,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -319,7 +320,9 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -817,6 +820,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -826,7 +830,9 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1324,6 +1330,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given not yet known
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1333,7 +1340,9 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given not yet known
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
index 3dde5af5d5..5642dbcf22 100644
--- a/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -448,6 +448,7 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -457,7 +458,9 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -955,6 +958,7 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -964,7 +968,9 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1462,6 +1468,7 @@ exports[`disable sidebar items when cluster is not relevant given not yet known
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1471,7 +1478,9 @@ exports[`disable sidebar items when cluster is not relevant given not yet known
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
index 60f0d0095a..0221082e02 100644
--- a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -367,6 +367,7 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -376,7 +377,9 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -849,6 +852,7 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -858,7 +862,9 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1331,6 +1337,7 @@ exports[`disable kube object detail items when cluster is not relevant given not
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1340,7 +1347,9 @@ exports[`disable kube object detail items when cluster is not relevant given not
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap
index 9459045e02..292a820f4b 100644
--- a/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -315,6 +315,7 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -324,7 +325,9 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -701,6 +704,7 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -710,7 +714,9 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1087,6 +1093,7 @@ exports[`disable kube object menu items when cluster is not relevant given not y
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1096,7 +1103,9 @@ exports[`disable kube object menu items when cluster is not relevant given not y
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap b/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap
index 042e9f02ab..dec48cdc12 100644
--- a/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap
+++ b/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap
@@ -304,6 +304,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -313,7 +314,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -725,6 +728,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -734,7 +738,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1146,6 +1152,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1155,7 +1162,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1527,6 +1536,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1536,7 +1546,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1908,6 +1920,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1917,7 +1930,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2329,6 +2344,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -2338,7 +2354,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap
index 001f97e00b..9fc7e6bbf1 100644
--- a/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap
@@ -344,6 +344,7 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -353,7 +354,9 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -725,6 +728,7 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -734,7 +738,9 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1106,6 +1112,7 @@ exports[`disable kube object statuses when cluster is not relevant given not yet
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1115,7 +1122,9 @@ exports[`disable kube object statuses when cluster is not relevant given not yet
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
index f46517dc0b..b087beee3d 100644
--- a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
+++ b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
@@ -548,6 +548,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -557,7 +558,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1183,6 +1186,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -1192,7 +1196,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1823,6 +1829,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -1832,7 +1839,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2532,6 +2541,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2541,7 +2551,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2581,6 +2593,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2590,7 +2603,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3216,6 +3231,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3225,7 +3241,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3265,6 +3283,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3274,7 +3293,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3972,6 +3993,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3981,7 +4003,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4021,6 +4045,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -4030,7 +4055,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4730,6 +4757,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -4739,7 +4767,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -5453,6 +5483,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -5462,7 +5493,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -6171,6 +6204,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6180,7 +6214,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -6880,6 +6916,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6889,7 +6926,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -7589,6 +7628,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -7598,7 +7638,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -8845,6 +8887,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -8854,7 +8897,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -10657,6 +10702,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -10666,7 +10712,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
index e23184d8fc..f82cbc2e0e 100644
--- a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
+++ b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
@@ -455,6 +455,7 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -464,7 +465,9 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -997,6 +1000,7 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -1006,7 +1010,9 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
index 2fd23c30cc..4dc26ef987 100644
--- a/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
@@ -435,6 +435,7 @@ exports[`disable workloads overview details when cluster is not relevant given e
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -444,7 +445,9 @@ exports[`disable workloads overview details when cluster is not relevant given e
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -942,6 +945,7 @@ exports[`disable workloads overview details when cluster is not relevant given e
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -951,7 +955,9 @@ exports[`disable workloads overview details when cluster is not relevant given e
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1449,6 +1455,7 @@ exports[`disable workloads overview details when cluster is not relevant given n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1458,7 +1465,9 @@ exports[`disable workloads overview details when cluster is not relevant given n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
index 15c98bdca1..043ee215ba 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
@@ -2010,6 +2010,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2019,7 +2020,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2765,6 +2768,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2774,7 +2778,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3764,6 +3770,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3773,7 +3780,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4737,6 +4746,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -4746,7 +4756,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -5705,6 +5717,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -5714,7 +5727,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -6673,6 +6688,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6682,7 +6698,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -7663,6 +7681,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -7672,7 +7691,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -8662,6 +8683,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -8671,7 +8693,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -9630,6 +9654,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -9639,7 +9664,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -10653,6 +10680,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -10662,7 +10690,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -12261,6 +12291,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -12270,7 +12301,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -13109,6 +13142,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -13118,7 +13152,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -14323,6 +14359,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -14332,7 +14369,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -14372,6 +14411,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -14381,7 +14421,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -15127,6 +15169,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -15136,7 +15179,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -15176,6 +15221,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -15185,7 +15231,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -16146,6 +16194,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -16155,7 +16204,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -16195,6 +16246,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -16204,7 +16256,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -17163,6 +17217,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -17172,7 +17227,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -18131,6 +18188,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -18140,7 +18198,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
index c0359c4b88..ea4fa6fc90 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
@@ -430,6 +430,7 @@ exports[`installing helm chart from previously opened tab given tab for installi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -439,7 +440,9 @@ exports[`installing helm chart from previously opened tab given tab for installi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -947,6 +950,7 @@ exports[`installing helm chart from previously opened tab given tab for installi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -956,7 +960,9 @@ exports[`installing helm chart from previously opened tab given tab for installi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
index 6417d5c987..dcd2bb5dd1 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
@@ -6188,6 +6188,7 @@ exports[`opening dock tab for installing helm chart given application is started
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6197,7 +6198,9 @@ exports[`opening dock tab for installing helm chart given application is started
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
index 44a9781448..7c995becc5 100644
--- a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
+++ b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
@@ -596,9 +596,14 @@ exports[`showing details for helm release given application is started when navi
                     </div>
                   </div>
                   <div
-                    class="Spinner singleColor center"
-                    data-testid="helm-releases-spinner"
-                  />
+                    class="NoItems flex box grow"
+                  >
+                    <div
+                      class="box center"
+                    >
+                      Item list is empty
+                    </div>
+                  </div>
                 </div>
                 <div
                   class="AddRemoveButtons flex gaps"
@@ -661,6 +666,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -670,7 +676,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
index c491c391ae..d629d85798 100644
--- a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
+++ b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
@@ -383,6 +383,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -392,7 +393,9 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -849,6 +852,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -858,7 +862,9 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1379,6 +1385,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1388,7 +1395,9 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>