diff --git a/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
index 39d6efa75c..f6dff1fd8c 100644
--- a/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
+++ b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
@@ -12,44 +12,62 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -399,44 +417,62 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -819,44 +855,62 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1318,44 +1372,62 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1817,44 +1889,62 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
diff --git a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index da7e454080..a0bbe1e42f 100644
--- a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -86,72 +86,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -166,227 +175,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -402,9 +242,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -412,7 +252,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -420,7 +260,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -433,20 +273,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -470,30 +296,256 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -683,72 +735,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -763,227 +824,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -992,31 +884,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1030,7 +923,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1052,56 +945,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1291,72 +1395,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -1371,227 +1484,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -1600,31 +1544,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1638,7 +1583,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1660,56 +1605,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2010,72 +2166,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -2090,227 +2255,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2319,31 +2315,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2357,7 +2354,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2379,56 +2376,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2626,72 +2834,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -2706,227 +2923,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2935,31 +2983,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2973,7 +3022,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2995,56 +3044,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3345,72 +3605,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -3425,227 +3694,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3654,31 +3754,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3692,7 +3793,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -3714,56 +3815,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4246,72 +4558,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -4326,227 +4647,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -4555,31 +4707,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4593,7 +4746,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -4615,56 +4768,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4965,72 +5329,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -5045,227 +5418,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -5274,31 +5478,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -5312,7 +5517,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -5334,56 +5539,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -5866,72 +6282,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -5946,227 +6371,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -6175,31 +6431,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -6213,7 +6470,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -6235,56 +6492,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -6586,72 +7054,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -6666,227 +7143,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -6895,31 +7203,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -6933,7 +7242,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -6955,56 +7264,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -7202,72 +7722,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -7282,227 +7811,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -7518,9 +7878,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -7528,7 +7888,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -7536,7 +7896,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -7549,20 +7909,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -7586,30 +7932,256 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -7807,72 +8379,81 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -7887,227 +8468,58 @@ exports[`add custom helm repository in preferences when navigating to preference
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -8123,9 +8535,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -8133,7 +8545,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -8141,7 +8553,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -8154,20 +8566,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -8191,30 +8589,256 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
diff --git a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 4bbfeefa0a..cf23e1226f 100644
--- a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -86,72 +86,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -166,227 +175,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -402,9 +242,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -412,7 +252,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -420,7 +260,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -433,20 +273,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -470,30 +296,256 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -683,72 +735,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -763,227 +824,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -992,31 +884,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1030,7 +923,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1052,56 +945,267 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1291,72 +1395,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -1371,227 +1484,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -1600,33 +1544,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control Select__control--menu-is-open css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                                  aria-expanded="true"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
                                   aria-haspopup="true"
-                                  aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1640,7 +1583,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1662,56 +1605,269 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--menu-is-open css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="true"
+                                    aria-haspopup="true"
+                                    aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1813,7 +1969,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
     />
   </div>
   <div
-    class="Select__menu-portal css-1no2yl0-MenuPortal"
+    class="Select__menu-portal css-yj2v5g"
   >
     <div
       class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
@@ -1952,72 +2108,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -2032,227 +2197,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2261,34 +2257,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -2299,7 +2296,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2321,56 +2318,267 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2560,72 +2768,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -2640,227 +2857,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2869,34 +2917,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -2907,7 +2956,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2929,56 +2978,267 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3168,72 +3428,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -3248,227 +3517,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3484,9 +3584,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -3494,7 +3594,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -3502,10 +3602,10 @@ exports[`add helm repository from list in preferences when navigating to prefere
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -3515,20 +3615,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -3552,30 +3638,256 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3765,72 +4077,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -3845,227 +4166,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -4074,34 +4226,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -4112,7 +4265,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -4134,90 +4287,301 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some to be added repository"
-                            >
-                              Some to be added repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
                             >
-                              some-other-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some to be added repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some to be added repository"
+                              >
+                                Some to be added repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some to be added repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4407,72 +4771,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -4487,227 +4860,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -4716,33 +4920,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control Select__control--menu-is-open css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                                  aria-expanded="true"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
                                   aria-haspopup="true"
-                                  aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4756,7 +4959,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -4778,90 +4981,303 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--menu-is-open css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="true"
+                                    aria-haspopup="true"
+                                    aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some to be added repository"
-                            >
-                              Some to be added repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
                             >
-                              some-other-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some to be added repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some to be added repository"
+                              >
+                                Some to be added repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some to be added repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4963,7 +5379,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
     />
   </div>
   <div
-    class="Select__menu-portal css-1no2yl0-MenuPortal"
+    class="Select__menu-portal css-yj2v5g"
   >
     <div
       class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
@@ -5112,72 +5528,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -5192,227 +5617,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -5421,34 +5677,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -5459,7 +5716,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -5481,90 +5738,301 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some to be added repository"
-                            >
-                              Some to be added repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
                             >
-                              some-other-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some to be added repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some to be added repository"
+                              >
+                                Some to be added repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some to be added repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -5754,72 +6222,81 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -5834,227 +6311,58 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -6070,9 +6378,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -6080,7 +6388,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -6088,10 +6396,10 @@ exports[`add helm repository from list in preferences when navigating to prefere
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -6101,20 +6409,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -6138,30 +6432,256 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
diff --git a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 9757270629..43ba686edc 100644
--- a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -86,72 +86,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -166,227 +175,58 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -402,9 +242,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -412,7 +252,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -420,7 +260,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -433,20 +273,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -470,30 +296,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -683,72 +735,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -763,227 +824,58 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -999,9 +891,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -1009,7 +901,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -1017,7 +909,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1030,20 +922,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -1067,30 +945,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1280,72 +1384,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -1360,226 +1473,269 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error updating Helm repositories: Some error
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error updating Helm repositories: Some error
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1769,72 +1925,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -1849,227 +2014,58 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2085,9 +2081,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -2095,7 +2091,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -2103,7 +2099,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2116,20 +2112,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -2153,30 +2135,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2366,72 +2574,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -2446,226 +2663,269 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error when adding default Helm repository: Some error
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error when adding default Helm repository: Some error
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2855,72 +3115,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -2935,227 +3204,58 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3171,9 +3271,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -3181,7 +3281,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -3189,7 +3289,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3202,20 +3302,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -3239,30 +3325,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3452,72 +3764,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -3532,227 +3853,58 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3761,31 +3913,32 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3799,7 +3952,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -3821,90 +3974,301 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-repository"
-                            >
-                              some-repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-repository-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-other-repository"
-                            >
-                              some-other-repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-repository"
+                              >
+                                some-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-repository-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-repository"
+                              tabindex="0"
                             >
-                              some-other-repository-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-other-repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-other-repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-other-repository"
+                              >
+                                some-other-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-repository-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-other-repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-other-repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4094,72 +4458,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -4174,226 +4547,269 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`.
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`.
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4583,72 +4999,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -4663,226 +5088,269 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`.
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`.
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -5072,72 +5540,81 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -5152,226 +5629,269 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error getting Helm configuration: some-error
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error getting Helm configuration: some-error
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
diff --git a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index 343830b5c6..c8e42cc657 100644
--- a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -86,72 +86,81 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -166,227 +175,58 @@ exports[`remove helm repository from list of active repositories in preferences
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -402,9 +242,9 @@ exports[`remove helm repository from list of active repositories in preferences
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -412,7 +252,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -420,7 +260,7 @@ exports[`remove helm repository from list of active repositories in preferences
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -433,20 +273,6 @@ exports[`remove helm repository from list of active repositories in preferences
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -470,30 +296,256 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -683,72 +735,81 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -763,227 +824,58 @@ exports[`remove helm repository from list of active repositories in preferences
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -992,31 +884,32 @@ exports[`remove helm repository from list of active repositories in preferences
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1030,7 +923,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1052,56 +945,267 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-active-repository"
-                            >
-                              some-active-repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-active-repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-active-repository"
+                              >
+                                some-active-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-active-repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1291,72 +1395,81 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -1371,227 +1484,58 @@ exports[`remove helm repository from list of active repositories in preferences
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -1600,31 +1544,32 @@ exports[`remove helm repository from list of active repositories in preferences
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1638,7 +1583,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1660,56 +1605,267 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-active-repository"
-                            >
-                              some-active-repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-active-repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-active-repository"
+                              >
+                                some-active-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-active-repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1899,72 +2055,81 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header flex items-center"
                   data-preference-tab-group-test="general-tab-group"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="app"
-                  role="tab"
-                  tabindex="0"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
-                </div>
-                <hr />
               </div>
             </div>
           </nav>
@@ -1979,227 +2144,58 @@ exports[`remove helm repository from list of active repositories in preferences
                 data-preference-page-test="kubernetes-page"
                 id="kubernetes-page"
               >
-                <h2>
+                <h2
+                  data-preference-page-title-test="true"
+                >
                   Kubernetes
                 </h2>
-                <section
-                  id="kubectl"
+                <div
+                  data-preference-item-test="kubectl"
                 >
-                  <section>
+                  <section
+                    id="kubectl"
+                  >
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2215,9 +2211,9 @@ exports[`remove helm repository from list of active repositories in preferences
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -2225,7 +2221,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -2233,7 +2229,7 @@ exports[`remove helm repository from list of active repositories in preferences
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2246,20 +2242,6 @@ exports[`remove helm repository from list of active repositories in preferences
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -2283,30 +2265,256 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
index 8a3f4f094c..043ee215ba 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
@@ -3071,7 +3071,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
     </div>
   </div>
   <div
-    class="Select__menu-portal css-1no2yl0-MenuPortal"
+    class="Select__menu-portal css-yj2v5g"
   >
     <div
       class="theme-outlined install-chart-version-select-for-some-first-tab-id-options Select__menu css-26l3qy-menu"
@@ -7984,7 +7984,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
     </div>
   </div>
   <div
-    class="Select__menu-portal css-1no2yl0-MenuPortal"
+    class="Select__menu-portal css-yj2v5g"
   >
     <div
       class="NamespaceSelectMenu theme-outlined install-chart-namespace-select-for-some-first-tab-id-options Select__menu css-26l3qy-menu"
diff --git a/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap b/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
index c69b64bf69..abd29f03bf 100644
--- a/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
@@ -685,6 +685,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1408,6 +1409,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2143,6 +2145,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
index 822d9641c9..547102fcb4 100644
--- a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
@@ -1723,6 +1723,7 @@ exports[`preferences - navigation to application preferences given in some child
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index c782514e5e..8365fb7a24 100644
--- a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -1,18 +1,713 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab shows extension tab in general area 1`] = `
-<div
-  class="Tab flex gaps align-center"
-  data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-  role="tab"
-  tabindex="0"
->
-  <div
-    class="label"
-  >
-    Metrics tab
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Metrics tab
+                    </div>
+                  </div>
+                </div>
+                <div
+                  style="padding: 0px 10px;"
+                >
+                  <div
+                    class="HorizontalLine size-sm"
+                  />
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                data-preference-page-test="application-page"
+                id="application-page"
+              >
+                <h2
+                  data-preference-page-title-test="true"
+                >
+                  Application
+                </h2>
+                <div
+                  data-preference-item-test="theme"
+                >
+                  <section
+                    id="appearance"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Theme
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-theme-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-theme-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-theme-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="theme-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="extension-install-registry"
+                >
+                  <section
+                    id="extensionRegistryUrl"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Extension Install Registry
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-extension-install-registry-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-extension-install-registry-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-extension-install-registry-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="extension-install-registry-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <p
+                      class="mt-4 mb-5 leading-relaxed"
+                    >
+                      This setting is to change the registry URL for installing extensions by name. 
+                      If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                      <b>
+                        .npmrc
+                      </b>
+                       file or in the input below.
+                    </p>
+                    <div
+                      class="Input theme round black disabled invalid"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="Custom Extension Registry URL..."
+                          spellcheck="false"
+                          value="some-custom-url"
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="start-up"
+                >
+                  <section
+                    id="other"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Start-up
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Automatically start Lens on login
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="update-channel"
+                >
+                  <section
+                    id="update-channel"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Update Channel
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-update-channel-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
+                          >
+                            Stable
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="update-channel-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="timezone"
+                >
+                  <section
+                    id="locale"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Locale Timezone
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-timezone-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-timezone-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-timezone-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="timezone-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
   </div>
-</div>
+</body>
 `;
 
 exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab when navigating to specific extension tab renders 1`] = `
@@ -89,7 +784,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -101,81 +795,92 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
             </div>
           </div>
@@ -188,38 +893,42 @@ exports[`preferences - navigation to extension specific preferences given in pre
             class="content"
           >
             <section
-              id="extensions"
+              data-preference-page-test="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
+              id="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
             >
               <h2
-                data-testid="extension-preferences-page-title"
+                data-preference-page-title-test="true"
               >
                 Metrics tab
               </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-metrics-preference-item-id"
-                id="metrics-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-registered-tab-page-id-item-metrics-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  License item
-                   
-                </div>
-                <div
-                  data-testid="metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="metrics-preference-item-id"
                 >
                   <div
-                    data-testid="metrics-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    License item
+                     
+                  </div>
+                  <div
+                    data-testid="metrics-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="metrics-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -396,7 +1105,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -408,93 +1116,104 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="extension-duplicated-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
             </div>
           </div>
@@ -507,38 +1226,42 @@ exports[`preferences - navigation to extension specific preferences given in pre
             class="content"
           >
             <section
-              id="extensions"
+              data-preference-page-test="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
+              id="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
             >
               <h2
-                data-testid="extension-preferences-page-title"
+                data-preference-page-title-test="true"
               >
                 Metrics tab
               </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-metrics-preference-item-id"
-                id="metrics-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-registered-tab-page-id-item-metrics-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  License item
-                   
-                </div>
-                <div
-                  data-testid="metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="metrics-preference-item-id"
                 >
                   <div
-                    data-testid="metrics-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    License item
+                     
+                  </div>
+                  <div
+                    data-testid="metrics-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="metrics-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -715,7 +1438,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -727,93 +1449,104 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="extension-duplicated-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
             </div>
           </div>
@@ -826,38 +1559,42 @@ exports[`preferences - navigation to extension specific preferences given in pre
             class="content"
           >
             <section
-              id="extensions"
+              data-preference-page-test="preference-item-for-extension-duplicated-tab-page-id-additional-page-metrics-extension-tab"
+              id="preference-item-for-extension-duplicated-tab-page-id-additional-page-metrics-extension-tab"
             >
               <h2
-                data-testid="extension-preferences-page-title"
+                data-preference-page-title-test="true"
               >
                 Metrics tab
               </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-another-metrics-preference-item-id"
-                id="another-metrics-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-duplicated-tab-page-id-item-another-metrics-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  Another metrics
-                   
-                </div>
-                <div
-                  data-testid="another-metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="another-metrics-preference-item-id"
                 >
                   <div
-                    data-testid="another-metrics-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    Another metrics
+                     
+                  </div>
+                  <div
+                    data-testid="another-metrics-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="another-metrics-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -1034,7 +1771,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1046,74 +1782,84 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="extensions-tab-group"
               >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                data-testid="extension-settings"
-              >
-                <hr />
                 <div
                   class="header flex items-center"
                 >
@@ -1127,33 +1873,30 @@ exports[`preferences - navigation to extension specific preferences given in pre
                       extension
                     </span>
                   </i>
-                   
                   Extensions
                 </div>
-                <div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-test-extension-id"
+                  role="tab"
+                  tabindex="0"
+                >
                   <div
-                    class="Tab flex gaps align-center active"
-                    data-testid="tab-link-for-extension-some-test-extension-id"
-                    role="tab"
-                    tabindex="0"
+                    class="label"
                   >
-                    <div
-                      class="label"
-                    >
-                      some-test-extension-id
-                    </div>
+                    some-test-extension-id
                   </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-other-test-extension-id"
+                  role="tab"
+                  tabindex="0"
+                >
                   <div
-                    class="Tab flex gaps align-center"
-                    data-testid="tab-link-for-extension-some-other-test-extension-id"
-                    role="tab"
-                    tabindex="0"
+                    class="label"
                   >
-                    <div
-                      class="label"
-                    >
-                      some-other-test-extension-id
-                    </div>
+                    some-other-test-extension-id
                   </div>
                 </div>
               </div>
@@ -1168,38 +1911,42 @@ exports[`preferences - navigation to extension specific preferences given in pre
             class="content"
           >
             <section
-              id="extensions"
+              data-preference-page-test="preference-item-for-extension-some-test-extension-id-page"
+              id="preference-item-for-extension-some-test-extension-id-page"
             >
               <h2
-                data-testid="extension-preferences-page-title"
+                data-preference-page-title-test="true"
               >
                 some-test-extension-id preferences
               </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-some-preference-item-id"
-                id="some-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-some-test-extension-id-item-some-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  Some preference item
-                   
-                </div>
-                <div
-                  data-testid="some-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="some-preference-item-id"
                 >
                   <div
-                    data-testid="some-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    Some preference item
+                     
+                  </div>
+                  <div
+                    data-testid="some-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="some-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -1387,72 +2134,81 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header flex items-center"
                 data-preference-tab-group-test="general-tab-group"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="app"
-                role="tab"
-                tabindex="0"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <hr />
             </div>
           </div>
         </nav>
@@ -1467,396 +2223,426 @@ exports[`preferences - navigation to extension specific preferences given in pre
               data-preference-page-test="application-page"
               id="application-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -2044,72 +2830,112 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header flex items-center"
                 data-preference-tab-group-test="general-tab-group"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="app"
-                role="tab"
-                tabindex="0"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="extensions-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  Kubernetes
+                  <i
+                    class="Icon mr-3 material focusable smallest"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="extension"
+                    >
+                      extension
+                    </span>
+                  </i>
+                  Extensions
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-test-extension-id"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    some-test-extension-id
+                  </div>
                 </div>
               </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <hr />
             </div>
           </div>
         </nav>
@@ -2124,396 +2950,426 @@ exports[`preferences - navigation to extension specific preferences given in pre
               data-preference-page-test="application-page"
               id="application-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -2690,7 +3546,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -2702,74 +3557,84 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="extensions-tab-group"
               >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                data-testid="extension-settings"
-              >
-                <hr />
                 <div
                   class="header flex items-center"
                 >
@@ -2783,21 +3648,18 @@ exports[`preferences - navigation to extension specific preferences given in pre
                       extension
                     </span>
                   </i>
-                   
                   Extensions
                 </div>
-                <div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-test-extension-id"
+                  role="tab"
+                  tabindex="0"
+                >
                   <div
-                    class="Tab flex gaps align-center active"
-                    data-testid="tab-link-for-extension-some-test-extension-id"
-                    role="tab"
-                    tabindex="0"
+                    class="label"
                   >
-                    <div
-                      class="label"
-                    >
-                      some-test-extension-id
-                    </div>
+                    some-test-extension-id
                   </div>
                 </div>
               </div>
@@ -2812,38 +3674,42 @@ exports[`preferences - navigation to extension specific preferences given in pre
             class="content"
           >
             <section
-              id="extensions"
+              data-preference-page-test="preference-item-for-extension-some-test-extension-id-page"
+              id="preference-item-for-extension-some-test-extension-id-page"
             >
               <h2
-                data-testid="extension-preferences-page-title"
+                data-preference-page-title-test="true"
               >
                 some-test-extension-id preferences
               </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-some-preference-item-id"
-                id="some-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-some-test-extension-id-item-some-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  Some preference item
-                   
-                </div>
-                <div
-                  data-testid="some-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="some-preference-item-id"
                 >
                   <div
-                    data-testid="some-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    Some preference item
+                     
+                  </div>
+                  <div
+                    data-testid="some-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="some-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -3021,7 +3887,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="extension-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3033,69 +3898,80 @@ exports[`preferences - navigation to extension specific preferences given in pre
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
+                  style="padding: 0px 10px;"
                 >
                   <div
-                    class="label"
-                  >
-                    Proxy
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Kubernetes
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Editor
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Terminal
-                  </div>
+                    class="HorizontalLine size-sm"
+                  />
                 </div>
               </div>
             </div>
@@ -3107,21 +3983,12 @@ exports[`preferences - navigation to extension specific preferences given in pre
             <div
               class="content"
             >
-              <section
-                id="extensions"
+              <div
+                class="flex items-center"
+                data-preference-page-does-not-exist-test="true"
               >
-                <h2
-                  data-testid="extension-preferences-page-title"
-                >
-                  Extension preferences
-                </h2>
-                <div
-                  class="flex items-center"
-                  data-testid="error-for-extension-not-being-present"
-                >
-                  No extension found
-                </div>
-              </section>
+                No preferences found
+              </div>
             </div>
             <div
               class="toolsRegion"
@@ -3223,343 +4090,3 @@ exports[`preferences - navigation to extension specific preferences given in pre
   </div>
 </body>
 `;
-
-exports[`preferences - navigation to extension specific preferences when navigating to extension specific tab renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <div
-          class="preventedDragging"
-        >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
-          >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-        </div>
-        <div
-          class="size-sm"
-        />
-        <div
-          class="preventedDragging"
-        >
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-        </div>
-        <div
-          class="size-sm"
-        />
-        <div
-          class="preventedDragging"
-        >
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-        </div>
-        <div
-          class="separator"
-        />
-      </div>
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <section
-        id="extensions"
-      >
-        <h2
-          data-testid="extension-preferences-page-title"
-        >
-          Metrics tab
-        </h2>
-        <section
-          class="small"
-          data-testid="extension-preference-item-for-another-metrics-preference-item-id"
-          id="another-metrics-preference-item-id"
-        >
-          <div
-            class="SubTitle"
-          >
-            Another metrics
-             
-          </div>
-          <div
-            data-testid="another-metrics-preference-item-input"
-          />
-          <div
-            class="hint"
-          >
-            <div
-              data-testid="another-metrics-preference-item-hint"
-            />
-          </div>
-        </section>
-        <hr
-          class="small"
-        />
-      </section>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-      data-testid="status-bar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences when navigating to someone else extension specific tab renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <div
-          class="preventedDragging"
-        >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
-          >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-        </div>
-        <div
-          class="size-sm"
-        />
-        <div
-          class="preventedDragging"
-        >
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-        </div>
-        <div
-          class="size-sm"
-        />
-        <div
-          class="preventedDragging"
-        >
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-        </div>
-        <div
-          class="separator"
-        />
-      </div>
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <section
-        id="extensions"
-      >
-        <h2
-          data-testid="extension-preferences-page-title"
-        >
-          extension-using-someone-else-tab-id preferences
-        </h2>
-        <section
-          class="small"
-          data-testid="extension-preference-item-for-my-preferences-item-id"
-          id="my-preferences-item-id"
-        >
-          <div
-            class="SubTitle"
-          >
-            My preferences
-             
-          </div>
-          <div
-            data-testid="my-preferences-item-input"
-          />
-          <div
-            class="hint"
-          >
-            <div
-              data-testid="my-preferences-item-hint"
-            />
-          </div>
-        </section>
-        <hr
-          class="small"
-        />
-      </section>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-      data-testid="status-bar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
diff --git a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
index f155759306..ff95cc524a 100644
--- a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
@@ -85,72 +85,81 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               class="Tabs flex column"
             >
               <div
-                class="header flex items-center"
                 data-preference-tab-group-test="general-tab-group"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="app"
-                role="tab"
-                tabindex="0"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <hr />
             </div>
           </div>
         </nav>
@@ -165,396 +174,426 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               data-preference-page-test="application-page"
               id="application-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -742,72 +781,81 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               class="Tabs flex column"
             >
               <div
-                class="header flex items-center"
                 data-preference-tab-group-test="general-tab-group"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="app"
-                role="tab"
-                tabindex="0"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
               <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
+                style="padding: 0px 10px;"
               >
                 <div
-                  class="label"
-                >
-                  Proxy
-                </div>
+                  class="HorizontalLine size-sm"
+                />
               </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <hr />
             </div>
           </div>
         </nav>
@@ -822,227 +870,58 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               data-preference-page-test="kubernetes-page"
               id="kubernetes-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Kubernetes
               </h2>
-              <section
-                id="kubectl"
+              <div
+                data-preference-item-test="kubectl"
               >
-                <section>
+                <section
+                  id="kubectl"
+                >
                   <div
-                    class="SubTitle"
+                    data-preference-item-test="kubectl-binary-download"
                   >
-                    Kubectl binary download
-                     
-                  </div>
-                  <label
-                    class="Switch"
-                    data-testid="switch"
-                  >
-                    Download kubectl binaries matching the Kubernetes cluster version
-                    <input
-                      role="switch"
-                      type="checkbox"
-                    />
-                  </label>
-                </section>
-                <section>
-                  <div
-                    class="SubTitle"
-                  >
-                    Download mirror
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens Select--is-disabled css-3iigni-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-download-mirror-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
-                    <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
-                    >
+                    <section>
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="SubTitle"
                       >
-                        <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-download-mirror-input-placeholder"
-                        >
-                          Download mirror for kubectl
-                        </div>
-                        <div
-                          class="Select__input-container css-jzldcf-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-download-mirror-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            disabled=""
-                            id="download-mirror-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
+                        Kubectl binary download
+                         
                       </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      <label
+                        class="Switch"
+                        data-testid="switch"
                       >
-                        <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                        Download kubectl binaries matching the Kubernetes cluster version
+                        <input
+                          role="switch"
+                          type="checkbox"
                         />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
-                          >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                            />
-                          </svg>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </section>
-                <section>
-                  <div
-                    class="SubTitle"
-                  >
-                    Directory for binaries
-                     
+                      </label>
+                    </section>
                   </div>
                   <div
-                    class="Input theme round black disabled"
-                  >
-                    <label
-                      class="input-area flex gaps align-center"
-                      id=""
-                    >
-                      <input
-                        class="input box grow"
-                        disabled=""
-                        placeholder="/some-electron-app-path-for-user-data/binaries"
-                        spellcheck="false"
-                        value=""
-                      />
-                    </label>
-                    <div
-                      class="input-info flex gaps"
-                    />
-                  </div>
+                    class="size-xl"
+                  />
                   <div
-                    class="hint"
+                    data-preference-item-test="kubectl-download-mirror"
                   >
-                    The directory to download binaries into.
-                  </div>
-                </section>
-                <section>
-                  <div
-                    class="SubTitle"
-                  >
-                    Path to kubectl binary
-                     
-                  </div>
-                  <div
-                    class="Input theme round black"
-                  >
-                    <label
-                      class="input-area flex gaps align-center"
-                      id=""
-                    >
-                      <input
-                        class="input box grow"
-                        placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
-                        spellcheck="false"
-                        value=""
-                      />
-                    </label>
-                    <div
-                      class="input-info flex gaps"
-                    />
-                  </div>
-                </section>
-              </section>
-              <hr />
-              <section
-                id="kube-sync"
-              >
-                <h2
-                  data-testid="kubernetes-sync-header"
-                >
-                  Kubeconfig Syncs
-                </h2>
-                <div
-                  class="self-start mb-5"
-                >
-                  <button
-                    class="Button PathPicker primary"
-                    type="button"
-                  >
-                    Sync Files and Folders
-                  </button>
-                </div>
-                <div
-                  class="SubTitle pt-5"
-                >
-                  Synced Items
-                   
-                </div>
-                <div
-                  class="notice mt-3"
-                >
-                  <div
-                    class="flex-grow text-center"
-                  >
-                    No files and folders have been synced yet
-                  </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="helm"
-              >
-                <h2>
-                  Helm Charts
-                </h2>
-                <div>
-                  <div
-                    data-testid="helm-controls"
-                  >
-                    <div
-                      class="flex gaps"
-                    >
+                    <section>
                       <div
-                        class="Select theme-lens box grow css-b62m3t-container"
+                        class="SubTitle"
+                      >
+                        Download mirror
+                         
+                      </div>
+                      <div
+                        class="Select theme-lens Select--is-disabled css-3iigni-container"
                       >
                         <span
                           class="css-1f43avz-a11yText-A11yText"
-                          id="react-select-selection-of-active-public-helm-repository-live-region"
+                          id="react-select-download-mirror-input-live-region"
                         />
                         <span
                           aria-atomic="false"
@@ -1051,31 +930,32 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                           class="css-1f43avz-a11yText-A11yText"
                         />
                         <div
-                          class="Select__control css-1s2u09g-control"
+                          class="Select__control Select__control--is-disabled css-1insrsq-control"
                         >
                           <div
                             class="Select__value-container css-319lph-ValueContainer"
                           >
                             <div
                               class="Select__placeholder css-14el2xx-placeholder"
-                              id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              id="react-select-download-mirror-input-placeholder"
                             >
-                              Repositories
+                              Download mirror for kubectl
                             </div>
                             <div
-                              class="Select__input-container css-6j8wv5-Input"
+                              class="Select__input-container css-jzldcf-Input"
                               data-value=""
                             >
                               <input
                                 aria-autocomplete="list"
-                                aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                aria-describedby="react-select-download-mirror-input-placeholder"
                                 aria-expanded="false"
                                 aria-haspopup="true"
                                 autocapitalize="none"
                                 autocomplete="off"
                                 autocorrect="off"
                                 class="Select__input"
-                                id="selection-of-active-public-helm-repository"
+                                disabled=""
+                                id="download-mirror-input"
                                 role="combobox"
                                 spellcheck="false"
                                 style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1089,7 +969,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                             class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                           >
                             <span
-                              class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              class="Select__indicator-separator css-109onse-indicatorSeparator"
                             />
                             <div
                               aria-hidden="true"
@@ -1111,21 +991,232 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                           </div>
                         </div>
                       </div>
-                      <button
-                        class="Button primary"
-                        data-testid="add-custom-helm-repo-button"
-                        type="button"
-                      >
-                        Add Custom Helm Repo
-                      </button>
-                    </div>
-                    <div
-                      class="repos"
-                    />
-                    <div />
+                    </section>
                   </div>
-                </div>
-              </section>
+                  <div
+                    class="size-xl"
+                  />
+                  <div
+                    data-preference-item-test="kubectl-directory-for-binaries"
+                  >
+                    <section>
+                      <div
+                        class="SubTitle"
+                      >
+                        Directory for binaries
+                         
+                      </div>
+                      <div
+                        class="Input theme round black disabled"
+                      >
+                        <label
+                          class="input-area flex gaps align-center"
+                          id=""
+                        >
+                          <input
+                            class="input box grow"
+                            disabled=""
+                            placeholder="/some-electron-app-path-for-user-data/binaries"
+                            spellcheck="false"
+                            value=""
+                          />
+                        </label>
+                        <div
+                          class="input-info flex gaps"
+                        />
+                      </div>
+                      <div
+                        class="hint"
+                      >
+                        The directory to download binaries into.
+                      </div>
+                    </section>
+                  </div>
+                  <div
+                    class="size-xl"
+                  />
+                  <div
+                    data-preference-item-test="kubectl-path-to-binary"
+                  >
+                    <section>
+                      <div
+                        class="SubTitle"
+                      >
+                        Path to kubectl binary
+                         
+                      </div>
+                      <div
+                        class="Input theme round black"
+                      >
+                        <label
+                          class="input-area flex gaps align-center"
+                          id=""
+                        >
+                          <input
+                            class="input box grow"
+                            placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                            spellcheck="false"
+                            value=""
+                          />
+                        </label>
+                        <div
+                          class="input-info flex gaps"
+                        />
+                      </div>
+                    </section>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="kubeconfig-sync"
+              >
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="helm-charts"
+              >
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      />
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </div>
             </section>
           </div>
           <div
diff --git a/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap b/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
index 7affd72bf1..69f2e93e1a 100644
--- a/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
+++ b/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
@@ -201,6 +201,7 @@ exports[`extendability-using-extension-api given an extension with a weakly type
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -429,6 +430,7 @@ exports[`extendability-using-extension-api given an extension with top-bar items
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -648,6 +650,7 @@ exports[`extendability-using-extension-api given an extension with top-bar items
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -867,6 +870,7 @@ exports[`extendability-using-extension-api renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap b/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
index 3bf716f2d4..5d147fea18 100644
--- a/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
+++ b/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
@@ -172,7 +172,7 @@ exports[`<NamespaceSelectFilter /> when clicked renders 1`] = `
     </div>
   </div>
   <div
-    class="Select__menu-portal css-1no2yl0-MenuPortal"
+    class="Select__menu-portal css-yj2v5g"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
@@ -822,7 +822,7 @@ exports[`<NamespaceSelectFilter /> when clicked when 'test-2' is clicked when cl
     </div>
   </div>
   <div
-    class="Select__menu-portal css-1no2yl0-MenuPortal"
+    class="Select__menu-portal css-yj2v5g"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
@@ -1340,7 +1340,7 @@ exports[`<NamespaceSelectFilter /> when clicked when 'test-2' is clicked when cl
     </div>
   </div>
   <div
-    class="Select__menu-portal css-1no2yl0-MenuPortal"
+    class="Select__menu-portal css-yj2v5g"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"