diff --git a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index 1eb9a2d891..52ff7f0a8d 100644
--- a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -85,81 +85,84 @@ exports[`preferences - closing-preferences given accessing preferences directly
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Test tab
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
               <hr />
@@ -177,396 +180,418 @@ exports[`preferences - closing-preferences given accessing preferences directly
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
@@ -754,81 +779,84 @@ exports[`preferences - closing-preferences given accessing preferences directly
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Test tab
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
               <hr />
@@ -842,8 +870,12 @@ exports[`preferences - closing-preferences given accessing preferences directly
           <div
             class="content"
           >
-            <div>
-              irrelevant
+            <div
+              data-preference-item-test="test-item"
+            >
+              <div>
+                irrelevant
+              </div>
             </div>
           </div>
           <div
@@ -1313,81 +1345,84 @@ exports[`preferences - closing-preferences given already in a page and then navi
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Test tab
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
               <hr />
@@ -1405,396 +1440,418 @@ exports[`preferences - closing-preferences given already in a page and then navi
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
@@ -1982,81 +2039,84 @@ exports[`preferences - closing-preferences given already in a page and then navi
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Test tab
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
               <hr />
@@ -2070,8 +2130,12 @@ exports[`preferences - closing-preferences given already in a page and then navi
           <div
             class="content"
           >
-            <div>
-              irrelevant
+            <div
+              data-preference-item-test="test-item"
+            >
+              <div>
+                irrelevant
+              </div>
             </div>
           </div>
           <div
diff --git a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
index 442cdbecc8..72bfb568ab 100644
--- a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
@@ -86,69 +86,96 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 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>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-other-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      Some other title
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Some title
+                    </div>
                   </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 active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <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>
                 <hr />
@@ -166,396 +193,418 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 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>
+                  </section>
+                </div>
                 <hr />
-                <section
-                  id="extensionRegistryUrl"
+                <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"
-                  >
-                    <label
-                      class="input-area flex gaps align-center"
-                      id=""
+                    <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>
+                <hr />
+                <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
-                        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>
+                  </section>
+                </div>
                 <hr />
-                <section
-                  id="other"
+                <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>
+                  </section>
+                </div>
                 <hr />
-                <section
-                  id="locale"
+                <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
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 82505f0f93..e6f0029bb5 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
@@ -85,69 +85,72 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -166,396 +169,418 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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,88 +767,94 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
               <div
-                class="header flex items-center"
                 data-preference-tab-group-test="some-tab-group"
-              >
-                Some tab group label
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="some-path-id-for-some-tab-id"
-                role="tab"
-                tabindex="0"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  Some tab label
+                  Some tab group label
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Some tab label
+                  </div>
                 </div>
               </div>
               <hr />
@@ -841,396 +872,418 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
@@ -1417,100 +1470,106 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
               <div
-                class="header flex items-center"
                 data-preference-tab-group-test="some-tab-group"
-              >
-                Some tab group label
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="some-path-id-for-some-tab-id"
-                role="tab"
-                tabindex="0"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  Some tab label
+                  Some tab group label
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="some-path-id-for-some-other-tab-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-tab-id"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Some other tab label
+                  <div
+                    class="label"
+                  >
+                    Some tab label
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-other-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Some other tab label
+                  </div>
                 </div>
               </div>
               <hr />
@@ -1528,396 +1587,418 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
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 06df2df244..cddbba6069 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
@@ -85,69 +85,72 @@ exports[`preferences - navigation to application preferences given in some child
               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>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -165,68 +168,78 @@ exports[`preferences - navigation to application preferences given in some child
               data-preference-page-test="proxy-page"
               id="proxy-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Proxy
               </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  HTTP Proxy
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
+              <div
+                data-preference-item-test="http-proxy-url"
+              >
+                <section>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <small
-                  class="hint"
-                >
-                  Proxy is used only for non-cluster communication.
-                </small>
-              </section>
+                    class="SubTitle"
+                  >
+                    HTTP Proxy
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                  <small
+                    class="hint"
+                  >
+                    Proxy is used only for non-cluster communication.
+                  </small>
+                </section>
+              </div>
               <hr
                 class="small"
               />
-              <section
-                class="small"
+              <div
+                data-preference-item-test="allow-untrusted-certificates"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  class="small"
                 >
-                  Certificate Trust
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Allow untrusted Certificate Authorities
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-                <small
-                  class="hint"
-                >
-                  This will make Lens to trust ANY certificate authority without any validations. Needed with some corporate proxies that do certificate re-writing. Does not affect cluster communications!
-                </small>
-              </section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Certificate Trust
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Allow untrusted Certificate Authorities
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                  <small
+                    class="hint"
+                  >
+                    This will make Lens to trust ANY certificate authority without any validations. Needed with some corporate proxies that do certificate re-writing. Does not affect cluster communications!
+                  </small>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -414,69 +427,72 @@ exports[`preferences - navigation to application preferences given in some child
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -494,396 +510,418 @@ exports[`preferences - navigation to application preferences given in some child
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
diff --git a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
index c9f0bc5d79..c9a420c9ff 100644
--- a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
@@ -85,69 +85,72 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -165,396 +168,418 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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,69 +767,72 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -822,280 +850,302 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               data-preference-page-test="editor-page"
               id="editor-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Editor
               </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Minimap
-                   
-                </div>
-                <div
-                  class="flex gaps justify-space-between"
-                >
+              <div
+                data-preference-item-test="minimap"
+              >
+                <section>
                   <div
-                    class="flex gaps align-center"
+                    class="SubTitle"
+                  >
+                    Minimap
+                     
+                  </div>
+                  <div
+                    class="flex gaps justify-space-between"
+                  >
+                    <div
+                      class="flex gaps align-center"
+                    >
+                      <label
+                        class="Switch"
+                        data-testid="switch"
+                      >
+                        Show minimap
+                        <input
+                          role="switch"
+                          type="checkbox"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="flex gaps align-center"
+                    >
+                      <div
+                        class="SubHeader compact"
+                      >
+                        Position
+                      </div>
+                      <div
+                        class="Select theme-lens css-b62m3t-container"
+                      >
+                        <span
+                          class="css-1f43avz-a11yText-A11yText"
+                          id="react-select-minimap-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-minimap-input-placeholder"
+                            >
+                              Select...
+                            </div>
+                            <div
+                              class="Select__input-container css-6j8wv5-Input"
+                              data-value=""
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-describedby="react-select-minimap-input-placeholder"
+                                aria-expanded="false"
+                                aria-haspopup="true"
+                                autocapitalize="none"
+                                autocomplete="off"
+                                autocorrect="off"
+                                class="Select__input"
+                                id="minimap-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>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                data-preference-item-test="line-numbers"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Line numbers
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-editor-line-numbers-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-editor-line-numbers-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-editor-line-numbers-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="editor-line-numbers-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
+                data-preference-item-test="tab-size"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Tab size
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
                   >
                     <label
-                      class="Switch"
-                      data-testid="switch"
+                      class="input-area flex gaps align-center"
+                      id=""
                     >
-                      Show minimap
                       <input
-                        role="switch"
-                        type="checkbox"
+                        class="input box grow"
+                        min="1"
+                        spellcheck="false"
+                        type="number"
+                        value="42"
                       />
                     </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                data-preference-item-test="editor-font-size"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Font size
+                     
                   </div>
                   <div
-                    class="flex gaps align-center"
+                    class="Input theme round black"
                   >
-                    <div
-                      class="SubHeader compact"
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
                     >
-                      Position
-                    </div>
+                      <input
+                        class="input box grow"
+                        min="10"
+                        spellcheck="false"
+                        type="number"
+                        value="42"
+                      />
+                    </label>
                     <div
-                      class="Select theme-lens css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-minimap-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-minimap-input-placeholder"
-                          >
-                            Select...
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-minimap-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="minimap-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>
+                      class="input-info flex gaps"
+                    />
                   </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Line numbers
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-editor-line-numbers-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
+                </section>
+              </div>
+              <div
+                data-preference-item-test="editor-font-family"
+              >
+                <section>
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-editor-line-numbers-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-editor-line-numbers-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="editor-line-numbers-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>
+                    Font family
+                     
                   </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Tab size
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      min="1"
-                      spellcheck="false"
-                      type="number"
-                      value="42"
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font size
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Input theme round black"
                   >
-                    <input
-                      class="input box grow"
-                      min="10"
-                      spellcheck="false"
-                      type="number"
-                      value="42"
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        spellcheck="false"
+                        type="text"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
                     />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font family
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      spellcheck="false"
-                      type="text"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
+                  </div>
+                </section>
+              </div>
             </section>
           </div>
           <div
diff --git a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
index 2399d508e6..2131c573d1 100644
--- a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
@@ -85,69 +85,72 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -165,396 +168,418 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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,69 +767,72 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               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>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -822,68 +850,78 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               data-preference-page-test="proxy-page"
               id="proxy-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Proxy
               </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  HTTP Proxy
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
+              <div
+                data-preference-item-test="http-proxy-url"
+              >
+                <section>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <small
-                  class="hint"
-                >
-                  Proxy is used only for non-cluster communication.
-                </small>
-              </section>
+                    class="SubTitle"
+                  >
+                    HTTP Proxy
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                  <small
+                    class="hint"
+                  >
+                    Proxy is used only for non-cluster communication.
+                  </small>
+                </section>
+              </div>
               <hr
                 class="small"
               />
-              <section
-                class="small"
+              <div
+                data-preference-item-test="allow-untrusted-certificates"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  class="small"
                 >
-                  Certificate Trust
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Allow untrusted Certificate Authorities
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-                <small
-                  class="hint"
-                >
-                  This will make Lens to trust ANY certificate authority without any validations. Needed with some corporate proxies that do certificate re-writing. Does not affect cluster communications!
-                </small>
-              </section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Certificate Trust
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Allow untrusted Certificate Authorities
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                  <small
+                    class="hint"
+                  >
+                    This will make Lens to trust ANY certificate authority without any validations. Needed with some corporate proxies that do certificate re-writing. Does not affect cluster communications!
+                  </small>
+                </section>
+              </div>
             </section>
           </div>
           <div
diff --git a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
index 9045d0c09e..6b7867604e 100644
--- a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
@@ -85,81 +85,84 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="telemetry"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Telemetry
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="telemetry"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Telemetry
+                  </div>
                 </div>
               </div>
               <hr />
@@ -177,41 +180,47 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               data-preference-page-test="telemetry-page"
               id="telemetry-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Telemetry
               </h2>
               <div
-                class="small"
-                data-testid="telemetry-preferences-for-automatic-error-reporting"
-                id="sentry"
+                data-preference-item-test="automatic-error-reporting"
               >
                 <div
-                  class="SubTitle"
+                  class="small"
+                  data-testid="telemetry-preferences-for-automatic-error-reporting"
+                  id="sentry"
                 >
-                  Automatic Error Reporting
-                   
-                </div>
-                <label
-                  class="Checkbox flex align-center"
-                >
-                  <input
-                    type="checkbox"
-                  />
-                  <i
-                    class="box flex align-center"
-                  />
-                  <span
-                    class="label"
+                  <div
+                    class="SubTitle"
                   >
-                    Allow automatic error reporting
-                  </span>
-                </label>
-                <div
-                  class="hint"
-                >
-                  <span>
-                    Automatic error reports provide vital information about issues and application crashes. It is highly recommended to keep this feature enabled to ensure fast turnaround for issues you might encounter.
-                  </span>
+                    Automatic Error Reporting
+                     
+                  </div>
+                  <label
+                    class="Checkbox flex align-center"
+                  >
+                    <input
+                      type="checkbox"
+                    />
+                    <i
+                      class="box flex align-center"
+                    />
+                    <span
+                      class="label"
+                    >
+                      Allow automatic error reporting
+                    </span>
+                  </label>
+                  <div
+                    class="hint"
+                  >
+                    <span>
+                      Automatic error reports provide vital information about issues and application crashes. It is highly recommended to keep this feature enabled to ensure fast turnaround for issues you might encounter.
+                    </span>
+                  </div>
                 </div>
               </div>
             </section>
@@ -401,69 +410,72 @@ exports[`preferences - navigation to telemetry 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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -481,396 +493,418 @@ exports[`preferences - navigation to telemetry 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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
@@ -1058,69 +1092,84 @@ exports[`preferences - navigation to telemetry 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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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="telemetry"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Telemetry
+                  </div>
                 </div>
               </div>
               <hr />
@@ -1138,396 +1187,418 @@ exports[`preferences - navigation to telemetry 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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
@@ -1704,7 +1775,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="telemetry-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1716,82 +1786,87 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-telemetry"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Telemetry
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="telemetry"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Telemetry
+                  </div>
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -1803,38 +1878,42 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
             class="content"
           >
             <section
-              id="telemetry"
+              data-preference-page-test="telemetry-page"
+              id="telemetry-page"
             >
               <h2
-                data-testid="telemetry-header"
+                data-preference-page-title-test="true"
               >
                 Telemetry
               </h2>
-              <section
-                class="small"
-                data-testid="telemetry-preference-item-for-some-telemetry-preference-item-id"
-                id="some-telemetry-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-some-test-extension-name-item-some-telemetry-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  Some telemetry-preference item
-                   
-                </div>
-                <div
-                  data-testid="some-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="some-telemetry-preference-item-id"
                 >
                   <div
-                    data-testid="some-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    Some telemetry-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
@@ -2022,69 +2101,72 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
               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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -2102,7 +2184,9 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
               data-preference-page-test="telemetry-page"
               id="telemetry-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Telemetry
               </h2>
             </section>
diff --git a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
index 9792445da8..fb6f65b9f1 100644
--- a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
@@ -85,69 +85,72 @@ exports[`preferences - navigation to terminal 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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -165,396 +168,418 @@ exports[`preferences - navigation to terminal 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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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,69 +767,72 @@ exports[`preferences - navigation to terminal 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>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
               <hr />
@@ -822,251 +850,273 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               data-preference-page-test="terminal-page"
               id="terminal-page"
             >
-              <h2>
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Terminal
               </h2>
-              <section
-                id="shell"
+              <div
+                data-preference-item-test="terminal-shell-path"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="shell"
                 >
-                  Terminal Shell Path
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <div
+                    class="SubTitle"
                   >
+                    Terminal Shell Path
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        placeholder="some-default-shell"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                data-preference-item-test="copy-paste-from-terminal-preference-item"
+              >
+                <section
+                  id="terminalSelection"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Terminal copy & paste
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Copy on select and paste on right-click
                     <input
-                      class="input box grow"
-                      placeholder="some-default-shell"
-                      spellcheck="false"
-                      value=""
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section
-                id="terminalSelection"
+                </section>
+              </div>
+              <div
+                data-preference-item-test="terminal-theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="terminalTheme"
                 >
-                  Terminal copy & paste
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Copy on select and paste on right-click
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section
-                id="terminalTheme"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Terminal theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-terminal-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"
                   >
+                    Terminal theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-terminal-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-terminal-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-terminal-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="terminal-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-terminal-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-terminal-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="terminal-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>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font size
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      max="50"
-                      min="10"
-                      spellcheck="false"
-                      type="number"
-                      value="42"
-                    />
-                  </label>
+                </section>
+              </div>
+              <div
+                data-preference-item-test="terminal-font-size-preference-item"
+              >
+                <section>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font family
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-2-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"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                    Font size
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-2-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-2-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="react-select-2-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"
+                      <input
+                        class="input box grow"
+                        max="50"
+                        min="10"
+                        spellcheck="false"
+                        type="number"
+                        value="42"
                       />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                data-preference-item-test="terminal-font-family-preference-item"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Font family
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-2-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
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        <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-2-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-2-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="react-select-2-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
diff --git a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
index 3b1fcbfdf1..4329a94181 100644
--- a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -303,69 +303,72 @@ exports[`preferences - navigation using application menu 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 active"
-                data-preference-tab-link-test="app"
-                role="tab"
-                tabindex="0"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </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="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-preference-tab-link-test="terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <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>
               <hr />
@@ -383,396 +386,418 @@ exports[`preferences - navigation using application menu when navigating to pref
               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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="extensionRegistryUrl"
+              <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"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <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>
+              <hr />
+              <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
-                      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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="other"
+              <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>
+                </section>
+              </div>
               <hr />
-              <section
-                id="locale"
+              <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
diff --git a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
index e1e643d91f..571b3ef7d4 100644
--- a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
@@ -306,69 +306,72 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
                 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>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </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="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-preference-tab-link-test="terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <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>
                 <hr />
@@ -386,396 +389,418 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
                 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>
+                  </section>
+                </div>
                 <hr />
-                <section
-                  id="extensionRegistryUrl"
+                <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"
-                  >
-                    <label
-                      class="input-area flex gaps align-center"
-                      id=""
+                    <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>
+                <hr />
+                <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
-                        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>
+                  </section>
+                </div>
                 <hr />
-                <section
-                  id="other"
+                <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>
+                  </section>
+                </div>
                 <hr />
-                <section
-                  id="locale"
+                <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