diff --git a/package.json b/package.json
index 1f2c8824e..4818ac4fb 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@parcel/watcher": "2.5.6",
     "@primer/css": "22.1.1",
     "@primer/octicons-react": "19.25.0",
-    "@primer/react": "38.20.0",
+    "@primer/react": "38.21.0",
     "@swc-contrib/plugin-graphql-codegen-client-preset": "0.21.0",
     "@tailwindcss/vite": "4.2.4",
     "@testing-library/jest-dom": "6.9.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index de54975fd..e271f89e3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -88,8 +88,8 @@ importers:
         specifier: 19.25.0
         version: 19.25.0(react@19.2.5)
       '@primer/react':
-        specifier: 38.20.0
-        version: 38.20.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@19.2.5)(react@19.2.5)
+        specifier: 38.21.0
+        version: 38.21.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@19.2.5)(react@19.2.5)
       '@swc-contrib/plugin-graphql-codegen-client-preset':
         specifier: 0.21.0
         version: 0.21.0
@@ -1027,8 +1027,8 @@ packages:
   '@primer/primitives@11.7.1':
     resolution: {integrity: sha512-+ch43fCGwMHe22AOvgVEg9UTCbqU3XevnnMzxk7J+jajPA0GouIJPrLFLN00uV7Fp6ZxqTj3F3vxigumEIg6Kw==}
 
-  '@primer/react@38.20.0':
-    resolution: {integrity: sha512-jH1IC07uC4vn0NKLE/Wr+ziw+K3WSDPkQtjmQLkYj1JzVGH9imEKcglNqIXaP5mBItLkhzJCMRI2ODRlK8fWvw==}
+  '@primer/react@38.21.0':
+    resolution: {integrity: sha512-Aes92LpOq+M/WfU1dqbeJLW4YKepDfZxil3g0zqZLTHlDUZWJOeCWEQSYjXrstfNJR4+I0CpPAFq5TTJsZcSKw==}
     engines: {node: '>=12', npm: '>=7'}
     peerDependencies:
       '@types/react': 18.x || 19.x
@@ -5000,7 +5000,7 @@ snapshots:
 
   '@primer/primitives@11.7.1': {}
 
-  '@primer/react@38.20.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@19.2.5)(react@19.2.5)':
+  '@primer/react@38.21.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@19.2.5)(react@19.2.5)':
     dependencies:
       '@github/mini-throttle': 2.1.1
       '@github/relative-time-element': 5.0.0
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index ca874fa2b..d78bd8843 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -178,6 +178,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -197,6 +198,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -254,6 +256,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -273,6 +276,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -330,6 +334,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -349,6 +354,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -406,6 +412,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -425,6 +432,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -484,6 +492,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
       >
@@ -502,6 +511,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -558,6 +568,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
       >
@@ -576,6 +587,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -643,6 +655,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -662,6 +675,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -719,6 +733,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -738,6 +753,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -846,6 +862,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -865,6 +882,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -922,6 +940,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
         role="tooltip"
@@ -941,6 +960,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -1000,6 +1020,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
       >
@@ -1018,6 +1039,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -1074,6 +1096,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
       >
@@ -1092,6 +1115,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -1158,6 +1182,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         popover="auto"
       >
@@ -1176,6 +1201,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <span
           aria-hidden="true"
           class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          data-component="Tooltip.KeybindingHintContainer"
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 35edfe5fc..6a173be78 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -89,6 +89,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
           role="tooltip"
@@ -108,6 +109,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -165,6 +167,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
           role="tooltip"
@@ -184,6 +187,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -241,6 +245,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
           role="tooltip"
@@ -260,6 +265,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -317,6 +323,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
           role="tooltip"
@@ -336,6 +343,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -395,6 +403,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
         >
@@ -413,6 +422,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -469,6 +479,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
         >
@@ -487,6 +498,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -554,6 +566,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
           role="tooltip"
@@ -573,6 +586,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -630,6 +644,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="e"
           popover="auto"
           role="tooltip"
@@ -649,6 +664,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
diff --git a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
index 4dddf0e9f..6298a61c0 100644
--- a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
@@ -49,6 +49,7 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with 1 comment 1
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_0_"
     popover="auto"
@@ -108,6 +109,7 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with multiple co
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_1_"
     popover="auto"
diff --git a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
index 93a5f1d2e..41637ec33 100644
--- a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
@@ -49,6 +49,7 @@ exports[`renderer/components/metrics/LabelsPill.tsx > renders with labels 1`] =
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_0_"
     popover="auto"
diff --git a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
index 0eb2c5444..29a6ce689 100644
--- a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
@@ -52,6 +52,7 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_1_"
     popover="auto"
@@ -114,6 +115,7 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_0_"
     popover="auto"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
index ace47e83e..bfa262c10 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
@@ -54,6 +54,7 @@ exports[`renderer/components/metrics/MetricGroup.tsx > should render pills when
     <span
       aria-hidden="true"
       class="prc-TooltipV2-Tooltip-tLeuB"
+      data-component="Tooltip"
       data-direction="s"
       id="_r_0_"
       popover="auto"
@@ -108,6 +109,7 @@ exports[`renderer/components/metrics/MetricGroup.tsx > should render pills when
     <span
       aria-hidden="true"
       class="prc-TooltipV2-Tooltip-tLeuB"
+      data-component="Tooltip"
       data-direction="s"
       id="_r_1_"
       popover="auto"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
index fc7cffa8d..eba3e6e9f 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
@@ -49,6 +49,7 @@ exports[`renderer/components/metrics/MetricPill.tsx > should render with metric
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_0_"
     popover="auto"
@@ -103,6 +104,7 @@ exports[`renderer/components/metrics/MetricPill.tsx > should render without metr
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_1_"
     popover="auto"
diff --git a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
index 741da2696..997b02c5f 100644
--- a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
@@ -44,6 +44,7 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders closed mileston
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_1_"
     popover="auto"
@@ -98,6 +99,7 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders open milestone
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_0_"
     popover="auto"
diff --git a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
index 510390c34..3573e077d 100644
--- a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
@@ -49,6 +49,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when multiple r
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_1_"
     popover="auto"
@@ -241,6 +242,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when one reacti
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_0_"
     popover="auto"
diff --git a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
index e313eb638..a732f67e5 100644
--- a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
@@ -51,6 +51,7 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_0_"
     popover="auto"
@@ -105,6 +106,7 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
   <span
     aria-hidden="true"
     class="prc-TooltipV2-Tooltip-tLeuB"
+    data-component="Tooltip"
     data-direction="s"
     id="_r_1_"
     popover="auto"
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index c5a33832a..f36af3be4 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -249,6 +250,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -486,6 +488,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -701,6 +704,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         id="_r_8_"
         popover="auto"
@@ -903,6 +907,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_9_"
               popover="auto"
@@ -957,6 +962,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_a_"
               popover="auto"
@@ -1111,6 +1117,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         id="_r_e_"
         popover="auto"
@@ -1387,6 +1394,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -1578,6 +1586,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -1810,6 +1819,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should tog
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
index 1132c0cf4..e9d859ee5 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -108,6 +108,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_2_"
         popover="auto"
@@ -162,6 +163,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_3_"
         popover="auto"
@@ -282,6 +284,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_4_"
         popover="auto"
@@ -336,6 +339,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_5_"
         popover="auto"
@@ -458,6 +462,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_6_"
         popover="auto"
@@ -512,6 +517,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_7_"
         popover="auto"
@@ -632,6 +638,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should rende
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_0_"
         popover="auto"
@@ -686,6 +693,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should rende
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="s"
         id="_r_1_"
         popover="auto"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 6fd42b010..dc816e3b7 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -44,6 +44,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         id="_r_0_"
         popover="auto"
@@ -246,6 +247,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_1_"
               popover="auto"
@@ -300,6 +302,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_2_"
               popover="auto"
@@ -459,6 +462,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         id="_r_6_"
         popover="auto"
@@ -607,6 +611,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_7_"
               popover="auto"
@@ -661,6 +666,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_8_"
               popover="auto"
@@ -820,6 +826,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         id="_r_c_"
         popover="auto"
@@ -968,6 +975,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_d_"
               popover="auto"
@@ -1022,6 +1030,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_e_"
               popover="auto"
@@ -1181,6 +1190,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="e"
         id="_r_i_"
         popover="auto"
@@ -1329,6 +1339,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_j_"
               popover="auto"
@@ -1383,6 +1394,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="s"
               id="_r_k_"
               popover="auto"
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index 84e1c0cf8..8a71295c3 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -143,6 +144,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -334,6 +336,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
@@ -533,6 +536,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
   >
     <button
       class="prc-Button-ButtonBase-9n-Xk"
+      data-component="Button"
       data-has-count="true"
       data-loading="false"
       data-no-visuals="true"
diff --git a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
index aa6bd052e..fa7825987 100644
--- a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
+++ b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`renderer/components/settings/SettingsFooter.tsx > should show app versi
 <button
   aria-describedby="_r_0_"
   class="prc-Button-ButtonBase-9n-Xk"
+  data-component="Button"
   data-loading="false"
   data-no-visuals="true"
   data-size="medium"
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index ef3ede770..eb2bc64b6 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -226,6 +226,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <span
                 class="prc-TextInputWithTokens-TextInputWrapper-HAIfc prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
                 data-block="true"
+                data-component="TextInputWithTokens"
                 data-size="small"
               >
                 <div
@@ -238,6 +239,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                     <input
                       aria-invalid="false"
                       class="prc-TextInputWithTokens-UnstyledTextInput-XwhBc prc-components-Input-IwWrt"
+                      data-component="TextInputWithTokens.Input"
                       tabindex="0"
                       title="Include searches"
                       type="text"
@@ -299,6 +301,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <span
                 class="prc-TextInputWithTokens-TextInputWrapper-HAIfc prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
                 data-block="true"
+                data-component="TextInputWithTokens"
                 data-size="small"
               >
                 <div
@@ -311,6 +314,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                     <input
                       aria-invalid="false"
                       class="prc-TextInputWithTokens-UnstyledTextInput-XwhBc prc-components-Input-IwWrt"
+                      data-component="TextInputWithTokens.Input"
                       tabindex="0"
                       title="Exclude searches"
                       type="text"
@@ -2092,6 +2096,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
       <button
         aria-describedby="_r_1j_"
         class="prc-Button-ButtonBase-9n-Xk"
+        data-component="Button"
         data-loading="false"
         data-size="medium"
         data-testid="filters-clear"
@@ -2136,6 +2141,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
       <span
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
         data-direction="n"
         id="_r_1j_"
         popover="auto"
diff --git a/src/renderer/routes/__snapshots__/Login.test.tsx.snap b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
index 1d0130324..9233e943b 100644
--- a/src/renderer/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
@@ -98,6 +98,7 @@ exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
         </span>
         <button
           class="prc-Button-ButtonBase-9n-Xk"
+          data-component="Button"
           data-loading="false"
           data-size="medium"
           data-testid="login-github"
@@ -141,6 +142,7 @@ exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
         </button>
         <button
           class="prc-Button-ButtonBase-9n-Xk"
+          data-component="Button"
           data-loading="false"
           data-size="medium"
           data-testid="login-pat"
@@ -184,6 +186,7 @@ exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
         </button>
         <button
           class="prc-Button-ButtonBase-9n-Xk"
+          data-component="Button"
           data-loading="false"
           data-size="medium"
           data-testid="login-oauth-app"
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 4a80af439..14c3fd0d7 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -123,6 +123,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
             aria-busy="false"
             class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
+            data-component="TextInput"
           >
             <input
               aria-describedby="_r_1_-caption"
@@ -160,6 +161,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
         >
           <button
             class="prc-Button-ButtonBase-9n-Xk"
+            data-component="Button"
             data-loading="false"
             data-size="small"
             data-testid="login-create-oauth-app"
@@ -237,6 +239,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
             aria-busy="false"
             class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
+            data-component="TextInput"
           >
             <input
               aria-invalid="false"
@@ -276,6 +279,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
             aria-busy="false"
             class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
+            data-component="TextInput"
             data-trailing-action="true"
           >
             <input
@@ -292,6 +296,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
             />
             <span
               class="TextInput-action prc-components-TextInputAction-CjGDX"
+              data-component="TextInput.Action"
             >
               <button
                 aria-labelledby="_r_k_"
@@ -324,6 +329,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
               <span
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
+                data-component="Tooltip"
                 data-direction="s"
                 id="_r_k_"
                 popover="auto"
@@ -349,6 +355,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
         <button
           aria-describedby="_r_m_"
           class="prc-Button-ButtonBase-9n-Xk"
+          data-component="Button"
           data-loading="false"
           data-size="small"
           data-testid="login-docs"
@@ -393,6 +400,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="s"
           id="_r_m_"
           popover="auto"
@@ -405,6 +413,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
         >
           <button
             class="prc-Button-ButtonBase-9n-Xk"
+            data-component="Button"
             data-loading="false"
             data-size="medium"
             data-testid="login-submit"
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 0a4a1e5bb..6967d816e 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -123,6 +123,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
             aria-busy="false"
             class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
+            data-component="TextInput"
           >
             <input
               aria-describedby="_r_1_-caption"
@@ -169,6 +170,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
           >
             <button
               class="prc-Button-ButtonBase-9n-Xk"
+              data-component="Button"
               data-loading="false"
               data-size="small"
               data-testid="login-create-token"
@@ -234,6 +236,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
+              data-component="Tooltip"
               data-direction="se"
               id="_r_8_"
               popover="auto"
@@ -269,6 +272,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
             aria-busy="false"
             class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
+            data-component="TextInput"
             data-trailing-action="true"
           >
             <input
@@ -285,6 +289,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
             />
             <span
               class="TextInput-action prc-components-TextInputAction-CjGDX"
+              data-component="TextInput.Action"
             >
               <button
                 aria-labelledby="_r_f_"
@@ -317,6 +322,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
               <span
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
+                data-component="Tooltip"
                 data-direction="s"
                 id="_r_f_"
                 popover="auto"
@@ -342,6 +348,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
         <button
           aria-describedby="_r_h_"
           class="prc-Button-ButtonBase-9n-Xk"
+          data-component="Button"
           data-loading="false"
           data-size="small"
           data-testid="login-docs"
@@ -386,6 +393,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="ne"
           id="_r_h_"
           popover="auto"
@@ -398,6 +406,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
         >
           <button
             class="prc-Button-ButtonBase-9n-Xk"
+            data-component="Button"
             data-loading="false"
             data-size="medium"
             data-testid="login-submit"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index b27febd1f..bf0640eec 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -164,6 +164,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             </label>
             <span
               class="prc-Select-TextInputWrapper-5NYFF prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
+              data-component="TextInput"
             >
               <select
                 aria-invalid="false"
@@ -343,6 +344,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                 <button
                   aria-label="Zoom percentage"
                   class="prc-Button-ButtonBase-9n-Xk"
+                  data-component="Button"
                   data-loading="false"
                   data-no-visuals="true"
                   data-size="small"
@@ -769,6 +771,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                 <button
                   aria-label="Fetch interval"
                   class="prc-Button-ButtonBase-9n-Xk"
+                  data-component="Button"
                   data-loading="false"
                   data-no-visuals="true"
                   data-size="small"
@@ -1814,6 +1817,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                 <button
                   aria-label="Global shortcut"
                   class="prc-Button-ButtonBase-9n-Xk"
+                  data-component="Button"
                   data-loading="false"
                   data-no-visuals="true"
                   data-size="small"
@@ -1998,6 +2002,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                 <button
                   aria-label="Volume percentage"
                   class="prc-Button-ButtonBase-9n-Xk"
+                  data-component="Button"
                   data-loading="false"
                   data-no-visuals="true"
                   data-size="small"
@@ -2145,6 +2150,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
       >
         <button
           class="prc-Button-ButtonBase-9n-Xk w-[200px]"
+          data-component="Button"
           data-loading="false"
           data-no-visuals="true"
           data-size="medium"
@@ -2190,6 +2196,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
         <button
           aria-describedby="_r_1p_"
           class="prc-Button-ButtonBase-9n-Xk"
+          data-component="Button"
           data-loading="false"
           data-no-visuals="true"
           data-size="medium"
@@ -2215,6 +2222,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="ne"
           id="_r_1p_"
           popover="auto"
@@ -2265,6 +2273,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="n"
           popover="auto"
           role="tooltip"
@@ -2284,6 +2293,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
@@ -2341,6 +2351,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
         <span
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
           data-direction="nw"
           popover="auto"
           role="tooltip"
@@ -2360,6 +2371,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           <span
             aria-hidden="true"
             class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+            data-component="Tooltip.KeybindingHintContainer"
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"