diff --git a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index 6a003f99d3..65585b20cd 100644
--- a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -87,13 +87,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -105,7 +107,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -117,7 +120,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -129,7 +133,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -141,7 +146,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -151,11 +157,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -167,6 +169,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -689,13 +692,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -707,7 +712,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -719,7 +725,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -731,7 +738,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -743,7 +751,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -753,11 +762,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -769,6 +774,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -1302,13 +1308,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1320,7 +1328,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1332,7 +1341,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1344,7 +1354,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1356,7 +1367,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1366,11 +1378,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -1382,6 +1390,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -2026,13 +2035,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2044,7 +2055,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2056,7 +2068,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2068,7 +2081,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2080,7 +2094,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2090,11 +2105,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -2106,6 +2117,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -2647,13 +2659,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2665,7 +2679,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2677,7 +2692,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2689,7 +2705,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2701,7 +2718,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2711,11 +2729,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -2727,6 +2741,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -3371,13 +3386,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3389,7 +3406,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3401,7 +3419,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3413,7 +3432,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3425,7 +3445,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3435,11 +3456,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -3451,6 +3468,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -4277,13 +4295,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4295,7 +4315,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4307,7 +4328,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4319,7 +4341,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4331,7 +4354,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4341,11 +4365,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -4357,6 +4377,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -5001,13 +5022,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5019,7 +5042,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5031,7 +5055,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5043,7 +5068,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5055,7 +5081,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5065,11 +5092,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -5081,6 +5104,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -5907,13 +5931,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5925,7 +5951,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5937,7 +5964,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5949,7 +5977,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5961,7 +5990,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5971,11 +6001,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -5987,6 +6013,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -6632,13 +6659,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6650,7 +6679,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6662,7 +6692,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6674,7 +6705,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6686,7 +6718,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6696,11 +6729,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -6712,6 +6741,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -7253,13 +7283,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7271,7 +7303,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7283,7 +7316,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7295,7 +7329,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7307,7 +7342,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7317,11 +7353,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -7333,6 +7365,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
@@ -7863,13 +7896,15 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-app"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7881,7 +7916,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7893,7 +7929,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7905,7 +7942,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7917,7 +7955,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7927,11 +7966,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                     Terminal
                   </div>
                 </div>
-                <div
-                  class="header"
-                >
-                  Extensions
-                </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -7943,6 +7978,7 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
                 <h2
diff --git a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 6857cbcfb0..50a4a8a5e2 100644
--- a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -87,13 +87,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -105,7 +107,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -117,7 +120,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -129,7 +133,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -141,7 +146,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -151,6 +157,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -162,16 +169,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -684,13 +692,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -702,7 +712,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -714,7 +725,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -726,7 +738,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -738,7 +751,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -748,6 +762,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -759,16 +774,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -1292,13 +1308,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1310,7 +1328,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1322,7 +1341,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1334,7 +1354,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1346,7 +1367,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1356,6 +1378,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -1367,16 +1390,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -1953,13 +1977,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1971,7 +1997,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1983,7 +2010,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1995,7 +2023,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2007,7 +2036,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2017,6 +2047,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -2028,16 +2059,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -2561,13 +2593,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2579,7 +2613,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2591,7 +2626,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2603,7 +2639,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2615,7 +2652,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2625,6 +2663,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -2636,16 +2675,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -3169,13 +3209,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3187,7 +3229,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3199,7 +3242,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3211,7 +3255,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3223,7 +3268,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3233,6 +3279,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -3244,16 +3291,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -3766,13 +3814,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3784,7 +3834,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3796,7 +3847,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3808,7 +3860,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3820,7 +3873,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3830,6 +3884,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -3841,16 +3896,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -4408,13 +4464,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4426,7 +4484,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4438,7 +4497,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4450,7 +4510,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4462,7 +4523,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4472,6 +4534,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -4483,16 +4546,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -5113,13 +5177,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5131,7 +5197,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5143,7 +5210,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5155,7 +5223,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5167,7 +5236,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5177,6 +5247,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -5188,16 +5259,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -5755,13 +5827,15 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5773,7 +5847,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5785,7 +5860,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5797,7 +5873,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5809,7 +5886,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5819,6 +5897,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -5830,16 +5909,17 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
diff --git a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 9084aceca4..3416770a0e 100644
--- a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -87,13 +87,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -105,7 +107,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -117,7 +120,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -129,7 +133,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -141,7 +146,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -151,6 +157,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -162,16 +169,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -684,13 +692,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -702,7 +712,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -714,7 +725,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -726,7 +738,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -738,7 +751,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -748,6 +762,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -759,16 +774,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -1281,13 +1297,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1299,7 +1317,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1311,7 +1330,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1323,7 +1343,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1335,7 +1356,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1345,6 +1367,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -1356,16 +1379,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -1770,13 +1794,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1788,7 +1814,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1800,7 +1827,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1812,7 +1840,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1824,7 +1853,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1834,6 +1864,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -1845,16 +1876,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -2367,13 +2399,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2385,7 +2419,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2397,7 +2432,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2409,7 +2445,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2421,7 +2458,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2431,6 +2469,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -2442,16 +2481,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -2856,13 +2896,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2874,7 +2916,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2886,7 +2929,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2898,7 +2942,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2910,7 +2955,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2920,6 +2966,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -2931,16 +2978,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -3453,13 +3501,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3471,7 +3521,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3483,7 +3534,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3495,7 +3547,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3507,7 +3560,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3517,6 +3571,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -3528,16 +3583,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -4095,13 +4151,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4113,7 +4171,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4125,7 +4184,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4137,7 +4197,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4149,7 +4210,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4159,6 +4221,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -4170,16 +4233,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -4584,13 +4648,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4602,7 +4668,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4614,7 +4681,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4626,7 +4694,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4638,7 +4707,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4648,6 +4718,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -4659,16 +4730,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -5073,13 +5145,15 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5091,7 +5165,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5103,7 +5178,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5115,7 +5191,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5127,7 +5204,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5137,6 +5215,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -5148,16 +5227,17 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
diff --git a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index d5b1c6b99e..65709c9bf5 100644
--- a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -87,13 +87,15 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -105,7 +107,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -117,7 +120,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -129,7 +133,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -141,7 +146,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -151,6 +157,7 @@ exports[`remove helm repository from list of active repositories in preferences
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -162,16 +169,17 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -684,13 +692,15 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -702,7 +712,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -714,7 +725,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -726,7 +738,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -738,7 +751,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -748,6 +762,7 @@ exports[`remove helm repository from list of active repositories in preferences
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -759,16 +774,17 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -1292,13 +1308,15 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1310,7 +1328,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1322,7 +1341,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1334,7 +1354,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1346,7 +1367,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1356,6 +1378,7 @@ exports[`remove helm repository from list of active repositories in preferences
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -1367,16 +1390,17 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
@@ -1900,13 +1924,15 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1918,7 +1944,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1930,7 +1957,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1942,7 +1970,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1954,7 +1983,8 @@ exports[`remove helm repository from list of active repositories in preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1964,6 +1994,7 @@ exports[`remove helm repository from list of active repositories in preferences
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -1975,16 +2006,17 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
+                data-preference-page-test="kubernetes"
                 id="kubernetes"
               >
+                <h2
+                  data-testid="kubernetes-header"
+                >
+                  Kubernetes
+                </h2>
                 <section
                   id="kubectl"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
-                  >
-                    Kubernetes
-                  </h2>
                   <section>
                     <div
                       class="SubTitle"
diff --git a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index 65c18e1f5a..4986ce3052 100644
--- a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -86,13 +86,15 @@ exports[`preferences - closing-preferences given accessing preferences directly
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
+                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
+                data-preference-tab-link-test="app"
+                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -104,7 +106,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
+                data-preference-tab-link-test="proxy"
+                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -116,7 +119,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
+                data-preference-tab-link-test="kubernetes"
+                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -128,7 +132,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
+                data-preference-tab-link-test="editor"
+                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -140,7 +145,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
+                data-preference-tab-link-test="terminal"
+                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -152,16 +158,18 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
                 <div
                   class="label"
                 >
-                  Some preference navigation item
+                  Test tab
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -173,6 +181,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
             class="content"
           >
             <section
+              data-preference-page-test="application"
               id="application"
             >
               <h2
@@ -743,7 +752,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="some-test-id-for-test-tab"
+        data-testid="some-test-id-for-some-test-tab-id"
       >
         <nav
           class="sidebarRegion"
@@ -755,13 +764,15 @@ exports[`preferences - closing-preferences given accessing preferences directly
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
+                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
+                data-preference-tab-link-test="app"
+                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -773,7 +784,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
+                data-preference-tab-link-test="proxy"
+                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -785,7 +797,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
+                data-preference-tab-link-test="kubernetes"
+                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -797,7 +810,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
+                data-preference-tab-link-test="editor"
+                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -809,7 +823,8 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
+                data-preference-tab-link-test="terminal"
+                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -821,16 +836,18 @@ exports[`preferences - closing-preferences given accessing preferences directly
               </div>
               <div
                 class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
                 <div
                   class="label"
                 >
-                  Some preference navigation item
+                  Test tab
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -840,7 +857,11 @@ exports[`preferences - closing-preferences given accessing preferences directly
         >
           <div
             class="content"
-          />
+          >
+            <div>
+              irrelevant
+            </div>
+          </div>
           <div
             class="toolsRegion"
           >
@@ -1309,13 +1330,15 @@ exports[`preferences - closing-preferences given already in a page and then navi
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
+                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
+                data-preference-tab-link-test="app"
+                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1327,7 +1350,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
+                data-preference-tab-link-test="proxy"
+                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1339,7 +1363,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
+                data-preference-tab-link-test="kubernetes"
+                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1351,7 +1376,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
+                data-preference-tab-link-test="editor"
+                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1363,7 +1389,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
+                data-preference-tab-link-test="terminal"
+                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1375,16 +1402,18 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
                 <div
                   class="label"
                 >
-                  Some preference navigation item
+                  Test tab
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -1396,6 +1425,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
             class="content"
           >
             <section
+              data-preference-page-test="application"
               id="application"
             >
               <h2
@@ -1966,7 +1996,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="some-test-id-for-test-tab"
+        data-testid="some-test-id-for-some-test-tab-id"
       >
         <nav
           class="sidebarRegion"
@@ -1978,13 +2008,15 @@ exports[`preferences - closing-preferences given already in a page and then navi
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
+                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
+                data-preference-tab-link-test="app"
+                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1996,7 +2028,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
+                data-preference-tab-link-test="proxy"
+                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2008,7 +2041,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
+                data-preference-tab-link-test="kubernetes"
+                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2020,7 +2054,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
+                data-preference-tab-link-test="editor"
+                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2032,7 +2067,8 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
+                data-preference-tab-link-test="terminal"
+                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2044,16 +2080,18 @@ exports[`preferences - closing-preferences given already in a page and then navi
               </div>
               <div
                 class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
                 <div
                   class="label"
                 >
-                  Some preference navigation item
+                  Test tab
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -2063,7 +2101,11 @@ exports[`preferences - closing-preferences given already in a page and then navi
         >
           <div
             class="content"
-          />
+          >
+            <div>
+              irrelevant
+            </div>
+          </div>
           <div
             class="toolsRegion"
           >
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 37c4fe3bd3..47acd7d674 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
@@ -87,37 +87,15 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-extension-some-extension-nav-item-some-other-preference-tab-id"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Some other title
-                  </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-extension-some-extension-nav-item-some-preference-tab-id"
-                  role="tab"
-                  tabindex="0"
-                >
-                  <div
-                    class="label"
-                  >
-                    Some title
-                  </div>
-                </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -129,7 +107,8 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -141,7 +120,8 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -153,7 +133,8 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -165,7 +146,8 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -175,6 +157,7 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -186,6 +169,7 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
               class="content"
             >
               <section
+                data-preference-page-test="application"
                 id="application"
               >
                 <h2
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 320b19728f..f7b432b3cd 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
@@ -86,13 +86,14 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
                 data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
+                data-preference-tab-link-test="app"
                 data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -105,6 +106,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="proxy"
                 data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -117,6 +119,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="kubernetes"
                 data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -129,6 +132,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="editor"
                 data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -141,6 +145,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="terminal"
                 data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -151,6 +156,8 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
                   Terminal
                 </div>
               </div>
+              <hr />
+              <hr />
             </div>
           </div>
         </nav>
@@ -162,6 +169,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
             class="content"
           >
             <section
+              data-preference-page-test="application"
               id="application"
             >
               <h2
@@ -743,13 +751,14 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
                 data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
+                data-preference-tab-link-test="app"
                 data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -762,6 +771,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="proxy"
                 data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -774,6 +784,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="kubernetes"
                 data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -786,6 +797,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="editor"
                 data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -798,6 +810,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="terminal"
                 data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -808,14 +821,16 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
                   Terminal
                 </div>
               </div>
+              <hr />
               <div
-                class="header"
+                class="header flex items-center"
                 data-testid="some-tab-group-test-id"
               >
                 Some tab group label
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="irrelevant"
                 data-testid="some-tab-with-items"
                 role="tab"
                 tabindex="0"
@@ -826,6 +841,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
                   Some label for tab with items
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -837,6 +853,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
             class="content"
           >
             <section
+              data-preference-page-test="application"
               id="application"
             >
               <h2
@@ -1418,13 +1435,14 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
                 data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
+                data-preference-tab-link-test="app"
                 data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -1437,6 +1455,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="proxy"
                 data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -1449,6 +1468,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="kubernetes"
                 data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -1461,6 +1481,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="editor"
                 data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -1473,6 +1494,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="terminal"
                 data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
@@ -1483,14 +1505,16 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
                   Terminal
                 </div>
               </div>
+              <hr />
               <div
-                class="header"
+                class="header flex items-center"
                 data-testid="some-tab-group-test-id"
               >
                 Some tab group label
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="irrelevant"
                 data-testid="some-tab-with-items"
                 role="tab"
                 tabindex="0"
@@ -1503,6 +1527,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
               </div>
               <div
                 class="Tab flex gaps align-center"
+                data-preference-tab-link-test="irrelevant"
                 data-testid="some-tab-without-items"
                 role="tab"
                 tabindex="0"
@@ -1513,6 +1538,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
                   Some label for tab without items
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -1524,6 +1550,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
             class="content"
           >
             <section
+              data-preference-page-test="application"
               id="application"
             >
               <h2
diff --git a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index 7d1082e4e3..121e1e8100 100644
--- a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -1388,13 +1388,15 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
+                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
+                data-preference-tab-link-test="app"
+                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1406,7 +1408,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
+                data-preference-tab-link-test="proxy"
+                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1418,7 +1421,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
+                data-preference-tab-link-test="kubernetes"
+                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1430,7 +1434,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
+                data-preference-tab-link-test="editor"
+                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1442,7 +1447,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
+                data-preference-tab-link-test="terminal"
+                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1452,6 +1458,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
                   Terminal
                 </div>
               </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -1463,6 +1470,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
             class="content"
           >
             <section
+              data-preference-page-test="application"
               id="application"
             >
               <h2
@@ -2045,13 +2053,15 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="Tabs flex column"
             >
               <div
-                class="header"
+                class="header flex items-center"
+                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
+                data-preference-tab-link-test="app"
+                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2063,7 +2073,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
+                data-preference-tab-link-test="proxy"
+                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2075,7 +2086,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
+                data-preference-tab-link-test="kubernetes"
+                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2087,7 +2099,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
+                data-preference-tab-link-test="editor"
+                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2099,7 +2112,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
               </div>
               <div
                 class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
+                data-preference-tab-link-test="terminal"
+                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2109,41 +2123,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
                   Terminal
                 </div>
               </div>
-              <div
-                data-testid="extension-settings"
-              >
-                <hr />
-                <div
-                  class="header flex items-center"
-                >
-                  <i
-                    class="Icon mr-3 material focusable smallest"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="extension"
-                    >
-                      extension
-                    </span>
-                  </i>
-                   
-                  Extensions
-                </div>
-                <div>
-                  <div
-                    class="Tab flex gaps align-center"
-                    data-testid="tab-link-for-extension-some-test-extension-id"
-                    role="tab"
-                    tabindex="0"
-                  >
-                    <div
-                      class="label"
-                    >
-                      some-test-extension-id
-                    </div>
-                  </div>
-                </div>
-              </div>
+              <hr />
             </div>
           </div>
         </nav>
@@ -2155,6 +2135,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
             class="content"
           >
             <section
+              data-preference-page-test="application"
               id="application"
             >
               <h2
@@ -3331,177 +3312,40 @@ exports[`preferences - navigation to extension specific preferences when navigat
       <div
         id="lens-views"
       />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
+      <section
+        id="extensions"
       >
-        <nav
-          class="sidebarRegion"
+        <h2
+          data-testid="extension-preferences-page-title"
+        >
+          Metrics tab
+        </h2>
+        <section
+          class="small"
+          data-testid="extension-preference-item-for-another-metrics-preference-item-id"
+          id="another-metrics-preference-item-id"
         >
           <div
-            class="sidebar"
+            class="SubTitle"
           >
-            <div
-              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"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="extensions"
-            >
-              <h2
-                data-testid="extension-preferences-page-title"
-              >
-                Metrics tab
-              </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-another-metrics-preference-item-id"
-                id="another-metrics-preference-item-id"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Another metrics
-                   
-                </div>
-                <div
-                  data-testid="another-metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
-                >
-                  <div
-                    data-testid="another-metrics-preference-item-hint"
-                  />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
-            </section>
+            Another metrics
+             
           </div>
           <div
-            class="toolsRegion"
+            data-testid="another-metrics-preference-item-input"
+          />
+          <div
+            class="hint"
           >
             <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
+              data-testid="another-metrics-preference-item-hint"
+            />
           </div>
-        </div>
-      </div>
+        </section>
+        <hr
+          class="small"
+        />
+      </section>
     </main>
     <div
       class="HotbarMenu flex column"
@@ -3638,177 +3482,40 @@ exports[`preferences - navigation to extension specific preferences when navigat
       <div
         id="lens-views"
       />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
+      <section
+        id="extensions"
       >
-        <nav
-          class="sidebarRegion"
+        <h2
+          data-testid="extension-preferences-page-title"
+        >
+          extension-using-someone-else-tab-id preferences
+        </h2>
+        <section
+          class="small"
+          data-testid="extension-preference-item-for-my-preferences-item-id"
+          id="my-preferences-item-id"
         >
           <div
-            class="sidebar"
+            class="SubTitle"
           >
-            <div
-              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"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="extensions"
-            >
-              <h2
-                data-testid="extension-preferences-page-title"
-              >
-                extension-using-someone-else-tab-id preferences
-              </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-my-preferences-item-id"
-                id="my-preferences-item-id"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  My preferences
-                   
-                </div>
-                <div
-                  data-testid="my-preferences-item-input"
-                />
-                <div
-                  class="hint"
-                >
-                  <div
-                    data-testid="my-preferences-item-hint"
-                  />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
-            </section>
+            My preferences
+             
           </div>
           <div
-            class="toolsRegion"
+            data-testid="my-preferences-item-input"
+          />
+          <div
+            class="hint"
           >
             <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
+              data-testid="my-preferences-item-hint"
+            />
           </div>
-        </div>
-      </div>
+        </section>
+        <hr
+          class="small"
+        />
+      </section>
     </main>
     <div
       class="HotbarMenu flex column"
diff --git a/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
index 68e843396f..01339abb81 100644
--- a/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -305,13 +305,15 @@ exports[`welcome - navigation using application menu when navigated somewhere el
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
+                  class="header flex items-center"
+                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-application"
+                  data-preference-tab-link-test="app"
+                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -323,7 +325,8 @@ exports[`welcome - navigation using application menu when navigated somewhere el
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
+                  data-preference-tab-link-test="proxy"
+                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -335,7 +338,8 @@ exports[`welcome - navigation using application menu when navigated somewhere el
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-kubernetes"
+                  data-preference-tab-link-test="kubernetes"
+                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -347,7 +351,8 @@ exports[`welcome - navigation using application menu when navigated somewhere el
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
+                  data-preference-tab-link-test="editor"
+                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -359,7 +364,8 @@ exports[`welcome - navigation using application menu when navigated somewhere el
                 </div>
                 <div
                   class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
+                  data-preference-tab-link-test="terminal"
+                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -369,6 +375,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
                     Terminal
                   </div>
                 </div>
+                <hr />
               </div>
             </div>
           </nav>
@@ -380,6 +387,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
               class="content"
             >
               <section
+                data-preference-page-test="application"
                 id="application"
               >
                 <h2