diff --git a/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
index f4e3f206a9..751c0c3032 100644
--- a/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
+++ b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
@@ -297,7 +297,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                   <div
                     class="info-panel box grow"
                   >
-                    0 items
+                    1 item
                   </div>
                   <div
                     class="Input SearchInput"
@@ -449,12 +449,91 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                       </div>
                     </div>
                     <div
-                      class="NoItems flex box grow"
+                      class="VirtualList Catalog box grow dark"
                     >
-                      <div
-                        class="box center"
-                      >
-                        Item list is empty
+                      <div>
+                        <div
+                          class="list"
+                          style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                        >
+                          <div
+                            style="height: 33px; width: 100%;"
+                          >
+                            <div
+                              style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                            >
+                              <div
+                                class="TableRow nowrap"
+                              >
+                                <div
+                                  class="TableCell entityName"
+                                >
+                                  <div
+                                    class="Avatar rounded catalogAvatar"
+                                    style="width: 24px; height: 24px; background: rgb(18, 10, 107);"
+                                  >
+                                    scn
+                                  </div>
+                                  <span>
+                                    some-context-name
+                                  </span>
+                                  <i
+                                    class="Icon pinIcon svg interactive focusable small"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                    />
+                                  </i>
+                                  <div>
+                                    Add to Hotbar
+                                  </div>
+                                </div>
+                                <div
+                                  class="TableCell"
+                                >
+                                  KubernetesCluster
+                                </div>
+                                <div
+                                  class="TableCell sourceCell"
+                                >
+                                  unknown
+                                </div>
+                                <div
+                                  class="TableCell labelsCell scrollable"
+                                />
+                                <div
+                                  class="TableCell statusCell"
+                                >
+                                  <span
+                                    class="disconnected"
+                                  >
+                                    disconnected
+                                  </span>
+                                </div>
+                                <div
+                                  class="TableCell menu"
+                                >
+                                  <div>
+                                    <i
+                                      class="Icon material interactive focusable"
+                                      data-testid="icon-for-menu-actions-for-catalog-for-some-cluster-id"
+                                      id="menu-actions-for-catalog-for-some-cluster-id"
+                                      tabindex="0"
+                                    >
+                                      <span
+                                        class="icon"
+                                        data-icon-name="more_vert"
+                                      >
+                                        more_vert
+                                      </span>
+                                    </i>
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -952,7 +1031,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                   <div
                     class="info-panel box grow"
                   >
-                    0 items
+                    1 item
                   </div>
                   <div
                     class="Input SearchInput"
@@ -1104,12 +1183,91 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                     </div>
                     <div
-                      class="NoItems flex box grow"
+                      class="VirtualList Catalog box grow dark"
                     >
-                      <div
-                        class="box center"
-                      >
-                        Item list is empty
+                      <div>
+                        <div
+                          class="list"
+                          style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                        >
+                          <div
+                            style="height: 33px; width: 100%;"
+                          >
+                            <div
+                              style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                            >
+                              <div
+                                class="TableRow nowrap"
+                              >
+                                <div
+                                  class="TableCell entityName"
+                                >
+                                  <div
+                                    class="Avatar rounded catalogAvatar"
+                                    style="width: 24px; height: 24px; background: rgb(18, 10, 107);"
+                                  >
+                                    scn
+                                  </div>
+                                  <span>
+                                    some-context-name
+                                  </span>
+                                  <i
+                                    class="Icon pinIcon svg interactive focusable small"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                    />
+                                  </i>
+                                  <div>
+                                    Add to Hotbar
+                                  </div>
+                                </div>
+                                <div
+                                  class="TableCell"
+                                >
+                                  KubernetesCluster
+                                </div>
+                                <div
+                                  class="TableCell sourceCell"
+                                >
+                                  unknown
+                                </div>
+                                <div
+                                  class="TableCell labelsCell scrollable"
+                                />
+                                <div
+                                  class="TableCell statusCell"
+                                >
+                                  <span
+                                    class="disconnected"
+                                  >
+                                    disconnected
+                                  </span>
+                                </div>
+                                <div
+                                  class="TableCell menu"
+                                >
+                                  <div>
+                                    <i
+                                      class="Icon material interactive focusable"
+                                      data-testid="icon-for-menu-actions-for-catalog-for-some-cluster-id"
+                                      id="menu-actions-for-catalog-for-some-cluster-id"
+                                      tabindex="0"
+                                    >
+                                      <span
+                                        class="icon"
+                                        data-icon-name="more_vert"
+                                      >
+                                        more_vert
+                                      </span>
+                                    </i>
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -1640,7 +1798,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                   <div
                     class="info-panel box grow"
                   >
-                    0 items
+                    1 item
                   </div>
                   <div
                     class="Input SearchInput"
@@ -1792,12 +1950,91 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                     </div>
                     <div
-                      class="NoItems flex box grow"
+                      class="VirtualList Catalog box grow dark"
                     >
-                      <div
-                        class="box center"
-                      >
-                        Item list is empty
+                      <div>
+                        <div
+                          class="list"
+                          style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                        >
+                          <div
+                            style="height: 33px; width: 100%;"
+                          >
+                            <div
+                              style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                            >
+                              <div
+                                class="TableRow nowrap"
+                              >
+                                <div
+                                  class="TableCell entityName"
+                                >
+                                  <div
+                                    class="Avatar rounded catalogAvatar"
+                                    style="width: 24px; height: 24px; background: rgb(18, 10, 107);"
+                                  >
+                                    scn
+                                  </div>
+                                  <span>
+                                    some-context-name
+                                  </span>
+                                  <i
+                                    class="Icon pinIcon svg interactive focusable small"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                    />
+                                  </i>
+                                  <div>
+                                    Add to Hotbar
+                                  </div>
+                                </div>
+                                <div
+                                  class="TableCell"
+                                >
+                                  KubernetesCluster
+                                </div>
+                                <div
+                                  class="TableCell sourceCell"
+                                >
+                                  unknown
+                                </div>
+                                <div
+                                  class="TableCell labelsCell scrollable"
+                                />
+                                <div
+                                  class="TableCell statusCell"
+                                >
+                                  <span
+                                    class="disconnected"
+                                  >
+                                    disconnected
+                                  </span>
+                                </div>
+                                <div
+                                  class="TableCell menu"
+                                >
+                                  <div>
+                                    <i
+                                      class="Icon material interactive focusable"
+                                      data-testid="icon-for-menu-actions-for-catalog-for-some-cluster-id"
+                                      id="menu-actions-for-catalog-for-some-cluster-id"
+                                      tabindex="0"
+                                    >
+                                      <span
+                                        class="icon"
+                                        data-icon-name="more_vert"
+                                      >
+                                        more_vert
+                                      </span>
+                                    </i>
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -2407,7 +2644,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                   <div
                     class="info-panel box grow"
                   >
-                    0 items
+                    1 item
                   </div>
                   <div
                     class="Input SearchInput focused"
@@ -2559,12 +2796,91 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                     </div>
                     <div
-                      class="NoItems flex box grow"
+                      class="VirtualList Catalog box grow dark"
                     >
-                      <div
-                        class="box center"
-                      >
-                        Item list is empty
+                      <div>
+                        <div
+                          class="list"
+                          style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                        >
+                          <div
+                            style="height: 33px; width: 100%;"
+                          >
+                            <div
+                              style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                            >
+                              <div
+                                class="TableRow nowrap"
+                              >
+                                <div
+                                  class="TableCell entityName"
+                                >
+                                  <div
+                                    class="Avatar rounded catalogAvatar"
+                                    style="width: 24px; height: 24px; background: rgb(18, 10, 107);"
+                                  >
+                                    scn
+                                  </div>
+                                  <span>
+                                    some-context-name
+                                  </span>
+                                  <i
+                                    class="Icon pinIcon svg interactive focusable small"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                    />
+                                  </i>
+                                  <div>
+                                    Add to Hotbar
+                                  </div>
+                                </div>
+                                <div
+                                  class="TableCell"
+                                >
+                                  KubernetesCluster
+                                </div>
+                                <div
+                                  class="TableCell sourceCell"
+                                >
+                                  unknown
+                                </div>
+                                <div
+                                  class="TableCell labelsCell scrollable"
+                                />
+                                <div
+                                  class="TableCell statusCell"
+                                >
+                                  <span
+                                    class="disconnected"
+                                  >
+                                    disconnected
+                                  </span>
+                                </div>
+                                <div
+                                  class="TableCell menu"
+                                >
+                                  <div>
+                                    <i
+                                      class="Icon material interactive focusable"
+                                      data-testid="icon-for-menu-actions-for-catalog-for-some-cluster-id"
+                                      id="menu-actions-for-catalog-for-some-cluster-id"
+                                      tabindex="0"
+                                    >
+                                      <span
+                                        class="icon"
+                                        data-icon-name="more_vert"
+                                      >
+                                        more_vert
+                                      </span>
+                                    </i>
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -3174,7 +3490,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                   <div
                     class="info-panel box grow"
                   >
-                    0 items
+                    1 item
                   </div>
                   <div
                     class="Input SearchInput"
@@ -3326,12 +3642,91 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                       </div>
                     </div>
                     <div
-                      class="NoItems flex box grow"
+                      class="VirtualList Catalog box grow dark"
                     >
-                      <div
-                        class="box center"
-                      >
-                        Item list is empty
+                      <div>
+                        <div
+                          class="list"
+                          style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                        >
+                          <div
+                            style="height: 33px; width: 100%;"
+                          >
+                            <div
+                              style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                            >
+                              <div
+                                class="TableRow nowrap"
+                              >
+                                <div
+                                  class="TableCell entityName"
+                                >
+                                  <div
+                                    class="Avatar rounded catalogAvatar"
+                                    style="width: 24px; height: 24px; background: rgb(18, 10, 107);"
+                                  >
+                                    scn
+                                  </div>
+                                  <span>
+                                    some-context-name
+                                  </span>
+                                  <i
+                                    class="Icon pinIcon svg interactive focusable small"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                    />
+                                  </i>
+                                  <div>
+                                    Add to Hotbar
+                                  </div>
+                                </div>
+                                <div
+                                  class="TableCell"
+                                >
+                                  KubernetesCluster
+                                </div>
+                                <div
+                                  class="TableCell sourceCell"
+                                >
+                                  unknown
+                                </div>
+                                <div
+                                  class="TableCell labelsCell scrollable"
+                                />
+                                <div
+                                  class="TableCell statusCell"
+                                >
+                                  <span
+                                    class="disconnected"
+                                  >
+                                    disconnected
+                                  </span>
+                                </div>
+                                <div
+                                  class="TableCell menu"
+                                >
+                                  <div>
+                                    <i
+                                      class="Icon material interactive focusable"
+                                      data-testid="icon-for-menu-actions-for-catalog-for-some-cluster-id"
+                                      id="menu-actions-for-catalog-for-some-cluster-id"
+                                      tabindex="0"
+                                    >
+                                      <span
+                                        class="icon"
+                                        data-icon-name="more_vert"
+                                      >
+                                        more_vert
+                                      </span>
+                                    </i>
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
diff --git a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index 9b8c8580c4..2fbc5c3a41 100644
--- a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -1620,7 +1620,56 @@ exports[`preferences - closing-preferences given already in a page renders 1`] =
     >
       <div
         class="HotbarItems flex column gaps"
-      />
+      >
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="0"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="1"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="2"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="3"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="4"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="5"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="6"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="7"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="8"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="9"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="10"
+        />
+        <div
+          class="HotbarCell isDraggingOwner animateDown"
+          index="11"
+        />
+      </div>
       <div
         class="HotbarSelector"
       >
diff --git a/src/features/terminal/__snapshots__/opening-terminal-tab.test.tsx.snap b/src/features/terminal/__snapshots__/opening-terminal-tab.test.tsx.snap
index c398662058..3323da6e5f 100644
--- a/src/features/terminal/__snapshots__/opening-terminal-tab.test.tsx.snap
+++ b/src/features/terminal/__snapshots__/opening-terminal-tab.test.tsx.snap
@@ -326,19 +326,19 @@ exports[`test for opening terminal tab within cluster frame when new terminal ta
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="Select__control css-13cymwt-control"
                     >
                       <div
-                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                        class="Select__value-container Select__value-container--is-multi css-1fdsijx-ValueContainer"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
+                          class="Select__placeholder css-1jqq78o-placeholder"
                           id="react-select-overview-namespace-select-filter-input-placeholder"
                         >
                           All namespaces
                         </div>
                         <div
-                          class="Select__input-container css-6j8wv5-Input"
+                          class="Select__input-container css-qbdosj-Input"
                           data-value=""
                         >
                           <input
@@ -364,11 +364,11 @@ exports[`test for opening terminal tab within cluster frame when new terminal ta
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
                         <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          class="Select__indicator-separator css-1u9des2-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          class="Select__indicator Select__dropdown-indicator css-1xc3v61-indicatorContainer"
                         >
                           <svg
                             aria-hidden="true"