diff --git a/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap b/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap
index 11c93e1a7c..b4fd971488 100644
--- a/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap
+++ b/packages/core/src/features/catalog/__snapshots__/opening-entity-details.test.tsx.snap
@@ -375,41 +375,35 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -423,7 +417,7 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -433,124 +427,99 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -642,6 +611,7 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -662,6 +632,7 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -682,6 +653,7 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -692,6 +664,7 @@ exports[`opening catalog entity details panel when navigated to the catalog rend
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -1196,41 +1169,35 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -1244,7 +1211,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -1254,124 +1221,99 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -1463,6 +1405,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -1483,6 +1426,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -1503,6 +1447,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -1513,6 +1458,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -2049,41 +1995,35 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -2097,7 +2037,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -2107,124 +2047,99 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -2316,6 +2231,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -2336,6 +2252,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -2356,6 +2273,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -2366,6 +2284,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -2902,41 +2821,35 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -2950,7 +2863,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -2960,124 +2873,99 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -3169,6 +3057,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -3189,6 +3078,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -3209,6 +3099,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -3219,6 +3110,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -4006,41 +3898,35 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -4054,7 +3940,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -4064,124 +3950,99 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -4273,6 +4134,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -4293,6 +4155,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -4313,6 +4176,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -4323,6 +4187,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -4847,41 +4712,35 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -4895,7 +4754,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -4905,124 +4764,99 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -5114,6 +4948,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -5134,6 +4969,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -5154,6 +4990,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -5164,6 +5001,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -5688,41 +5526,35 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -5736,7 +5568,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -5746,124 +5578,99 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -5955,6 +5762,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -5975,6 +5783,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -5995,6 +5804,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -6005,6 +5815,7 @@ exports[`opening catalog entity details panel when navigated to the catalog when
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
diff --git a/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap b/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
index 980e1a5461..fdef983669 100644
--- a/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
+++ b/packages/core/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
@@ -89,41 +89,35 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -137,7 +131,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -147,124 +141,99 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -356,6 +325,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -376,6 +346,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -396,6 +367,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -406,6 +378,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -741,41 +714,35 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -789,7 +756,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -799,124 +766,99 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -1008,6 +950,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -1028,6 +971,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -1048,6 +992,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -1058,6 +1003,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -1426,41 +1372,35 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -1474,7 +1414,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -1484,124 +1424,99 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -1693,6 +1608,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -1713,6 +1629,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -1733,6 +1650,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -1743,6 +1661,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -2190,41 +2109,35 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -2238,7 +2151,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -2248,124 +2161,99 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -2457,6 +2345,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -2477,6 +2366,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -2497,6 +2387,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -2507,6 +2398,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
@@ -2954,41 +2846,35 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                 Catalog
               </div>
               <ul
-                aria-multiselectable="false"
-                class="MuiTreeView-root"
+                class="treeView"
                 role="tree"
               >
                 <li
-                  aria-selected="true"
-                  class="MuiTreeItem-root Mui-selected"
+                  class="root selected treeItem"
                   data-testid="*-tab"
                   role="treeitem"
-                  tabindex="0"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="iconContainer"
+                  />
+                  <div
+                    class="label"
                   >
-                    <div
-                      class="MuiTreeItem-iconContainer"
-                    />
-                    <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                    >
-                      Browse
-                    </div>
+                    Browse
                   </div>
                 </li>
+                <div
+                  class="HorizontalLine size-xxs"
+                />
                 <li
-                  aria-expanded="true"
-                  class="MuiTreeItem-root bordered Mui-expanded"
-                  role="treeitem"
-                  tabindex="-1"
+                  class="root treeGroup"
+                  role="group"
                 >
                   <div
-                    class="MuiTreeItem-content"
+                    class="group"
                   >
                     <div
-                      class="MuiTreeItem-iconContainer"
+                      class="iconContainer"
                     >
                       <i
                         class="Icon material focusable"
@@ -3002,7 +2888,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                       </i>
                     </div>
                     <div
-                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                      class="label"
                     >
                       <div
                         class="parent"
@@ -3012,124 +2898,99 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                     </div>
                   </div>
                   <ul
-                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
-                    role="group"
-                    style="min-height: 0px;"
+                    class="contents expanded"
                   >
-                    <div
-                      class="MuiCollapse-wrapper"
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/General-tab"
+                      role="treeitem"
                     >
                       <div
-                        class="MuiCollapse-wrapperInner"
+                        class="iconContainer"
                       >
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/General-tab"
-                          role="treeitem"
-                          tabindex="-1"
+                        <i
+                          class="Icon material focusable small"
                         >
-                          <div
-                            class="MuiTreeItem-content"
+                          <span
+                            class="icon"
+                            data-icon-name="settings"
                           >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="settings"
-                                >
-                                  settings
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  General
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name=""
-                                />
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Clusters
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
-                        <li
-                          class="MuiTreeItem-root"
-                          data-testid="entity.k8slens.dev/WebLink-tab"
-                          role="treeitem"
-                          tabindex="-1"
-                        >
-                          <div
-                            class="MuiTreeItem-content"
-                          >
-                            <div
-                              class="MuiTreeItem-iconContainer"
-                            >
-                              <i
-                                class="Icon material focusable small"
-                              >
-                                <span
-                                  class="icon"
-                                  data-icon-name="public"
-                                >
-                                  public
-                                </span>
-                              </i>
-                            </div>
-                            <div
-                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
-                            >
-                              <div
-                                class="flex"
-                              >
-                                <div>
-                                  Web Links
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </li>
+                            settings
+                          </span>
+                        </i>
                       </div>
-                    </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            General
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name=""
+                          />
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Clusters
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                    <li
+                      class="root treeItem"
+                      data-testid="entity.k8slens.dev/WebLink-tab"
+                      role="treeitem"
+                    >
+                      <div
+                        class="iconContainer"
+                      >
+                        <i
+                          class="Icon material focusable small"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="public"
+                          >
+                            public
+                          </span>
+                        </i>
+                      </div>
+                      <div
+                        class="label"
+                      >
+                        <div
+                          class="flex"
+                        >
+                          <div>
+                            Web Links
+                          </div>
+                        </div>
+                      </div>
+                    </li>
                   </ul>
                 </li>
               </ul>
@@ -3221,6 +3082,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                       </div>
                       <div
                         class="TableCell nowrap sorting"
+                        data-testid="catalog-kind-column"
                         id="kind"
                       >
                         <div
@@ -3241,6 +3103,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                       </div>
                       <div
                         class="TableCell sourceCell nowrap sorting"
+                        data-testid="catalog-source-column"
                         id="source"
                       >
                         <div
@@ -3261,6 +3124,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                       </div>
                       <div
                         class="TableCell labelsCell scrollable nowrap"
+                        data-testid="catalog-labels-column"
                         id="labels"
                       >
                         <div
@@ -3271,6 +3135,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
                       </div>
                       <div
                         class="TableCell statusCell nowrap sorting"
+                        data-testid="catalog-status-column"
                         id="status"
                       >
                         <div
diff --git a/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap b/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
index 432e6da0a3..3d795c91a4 100644
--- a/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
+++ b/packages/core/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
@@ -927,6 +927,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
           >
             <i
               class="Icon logo svg focusable"
+              data-testid="no-welcome-banners-icon"
             >
               <span
                 class="icon"