diff --git a/package.json b/package.json
index 529b47bb4..06c1fdd4b 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "@parcel/watcher": "2.5.6",
     "@primer/css": "22.2.0",
     "@primer/octicons-react": "19.28.0",
-    "@primer/react": "38.23.0",
+    "@primer/react": "38.26.0",
     "@swc-contrib/plugin-graphql-codegen-client-preset": "0.24.0",
     "@tailwindcss/vite": "4.3.0",
     "@testing-library/jest-dom": "6.9.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1906f57b4..df8bbba1a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -85,8 +85,8 @@ importers:
         specifier: 19.28.0
         version: 19.28.0(react@19.2.6)
       '@primer/react':
-        specifier: 38.23.0
-        version: 38.23.0(@types/react-dom@19.2.3(@types/react@19.2.15))(@types/react@19.2.15)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
+        specifier: 38.26.0
+        version: 38.26.0(@types/react-dom@19.2.3(@types/react@19.2.15))(@types/react@19.2.15)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
       '@swc-contrib/plugin-graphql-codegen-client-preset':
         specifier: 0.24.0
         version: 0.24.0
@@ -1247,8 +1247,8 @@ packages:
     peerDependencies:
       '@primer/primitives': 10.x || 11.x
 
-  '@primer/live-region-element@0.7.2':
-    resolution: {integrity: sha512-wdxCHfcJzE1IPPjZNFR4RTwRcSWb7TN0fRdMH5HcxphLEnuZBWy0TAxk3xPA+/6lwiN3uEJ+ZWV4UF/glXh43A==}
+  '@primer/live-region-element@0.8.0':
+    resolution: {integrity: sha512-DIp04IeZvZ+gwCUcBchIvRwJA2PikP/6hnFhcLKgwttcg5OYjBH9t0cZjLnv10Aq1jN0rAFFG+WPMd3bw4hXcA==}
 
   '@primer/octicons-react@19.27.0':
     resolution: {integrity: sha512-9bm6DPfMlRMPnAfbqKhRIk9aaYbEw89DHqE9L0k2Xph0AjR+OxCy59of5X0G0epuplMBGFCnkaNhR2HmeJnNJw==}
@@ -1265,8 +1265,8 @@ packages:
   '@primer/primitives@11.9.0':
     resolution: {integrity: sha512-yESOalhd7s7S3unV1V32v3Z0RszXiiz6pzy6hVI9xpdTh1q1Gt8vyDFxRlqIvuwc5ZaO1+gYQTDbjxb4nWBzMw==}
 
-  '@primer/react@38.23.0':
-    resolution: {integrity: sha512-BjhrGi5U3ZfMcFuOvMssx9mn3GePY2rYNBY+xUfQwtf17AuYvtUHZCA5p35Q7gcW2Qu6dnR/uj0tqIkfxGQWPg==}
+  '@primer/react@38.26.0':
+    resolution: {integrity: sha512-PH8dH9DPuW256/y6WPLXBeNXZm/KIUNAXCduehE/WJii0F8972fWTv9TwCugxSngp1SY13Mxfa5HFxuufKGrAQ==}
     engines: {node: '>=12', npm: '>=7'}
     peerDependencies:
       '@types/react': 18.x || 19.x
@@ -5512,7 +5512,7 @@ snapshots:
     dependencies:
       '@primer/primitives': 11.9.0
 
-  '@primer/live-region-element@0.7.2':
+  '@primer/live-region-element@0.8.0':
     dependencies:
       '@lit-labs/ssr-dom-shim': 1.6.0
 
@@ -5526,7 +5526,7 @@ snapshots:
 
   '@primer/primitives@11.9.0': {}
 
-  '@primer/react@38.23.0(@types/react-dom@19.2.3(@types/react@19.2.15))(@types/react@19.2.15)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)':
+  '@primer/react@38.26.0(@types/react-dom@19.2.3(@types/react@19.2.15))(@types/react@19.2.15)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)':
     dependencies:
       '@github/mini-throttle': 2.1.1
       '@github/relative-time-element': 5.0.0
@@ -5534,7 +5534,7 @@ snapshots:
       '@lit-labs/react': 1.2.1
       '@oddbird/popover-polyfill': 0.5.2
       '@primer/behaviors': 1.10.3
-      '@primer/live-region-element': 0.7.2
+      '@primer/live-region-element': 0.8.0
       '@primer/octicons-react': 19.27.0(react@19.2.6)
       '@primer/primitives': 11.9.0
       '@tanstack/react-virtual': 3.14.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index d78bd8843..9dbbbeb5c 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -202,6 +202,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -280,6 +281,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -358,6 +360,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -436,6 +439,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -515,6 +519,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -591,6 +596,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -679,6 +685,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -757,6 +764,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -886,6 +894,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -964,6 +973,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -1043,6 +1053,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -1119,6 +1130,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
@@ -1205,6 +1217,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         >
           <kbd
             class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-component="KeybindingHint"
             data-testid="keybinding-hint"
           >
             <span
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index ec762201a..beff9156e 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -38,6 +38,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           </svg>
           <h4
             class="prc-Heading-Heading-MtWFE"
+            data-component="Heading"
           >
             FilterSectionTitle
           </h4>
@@ -312,6 +313,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           </svg>
           <h4
             class="prc-Heading-Heading-MtWFE"
+            data-component="Heading"
           >
             FilterSectionTitle
           </h4>
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index 42ad345a1..7071d1d3e 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -38,6 +38,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           </svg>
           <h4
             class="prc-Heading-Heading-MtWFE"
+            data-component="Heading"
           >
             Reason
           </h4>
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index 8469ecbc7..8d3ab7898 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -41,6 +41,7 @@ exports[`renderer/components/filters/StateFilter.tsx > should render itself & it
           </svg>
           <h4
             class="prc-Heading-Heading-MtWFE"
+            data-component="Heading"
           >
             State
           </h4>
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index 6c286defc..f28d4ed1e 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -38,6 +38,7 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx > should render itsel
           </svg>
           <h4
             class="prc-Heading-Heading-MtWFE"
+            data-component="Heading"
           >
             Type
           </h4>
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index 47620f6ee..948dbf6a0 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -38,6 +38,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx > should render itself &
           </svg>
           <h4
             class="prc-Heading-Heading-MtWFE"
+            data-component="Heading"
           >
             User Type
           </h4>
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 6a173be78..6909a44c9 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -113,6 +113,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -191,6 +192,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -269,6 +271,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -347,6 +350,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -426,6 +430,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -502,6 +507,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -590,6 +596,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -668,6 +675,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
diff --git a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
index 6298a61c0..d10ea645b 100644
--- a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with 1 comment 1
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -68,6 +69,7 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with multiple co
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
diff --git a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
index 41637ec33..cab397930 100644
--- a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`renderer/components/metrics/LabelsPill.tsx > renders with labels 1`] =
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -57,6 +58,7 @@ exports[`renderer/components/metrics/LabelsPill.tsx > renders with labels 1`] =
   >
     <ul
       class="prc-LabelGroup-Container-E-ePP"
+      data-component="LabelGroup"
       data-list="true"
       data-overflow="inline"
     >
diff --git a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
index 29a6ce689..546cabada 100644
--- a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -71,6 +72,7 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
index bfa262c10..07bc87560 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
@@ -13,6 +13,7 @@ exports[`renderer/components/metrics/MetricGroup.tsx > should render pills when
     >
       <span
         class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+        data-component="Label"
         data-size="small"
         data-variant="secondary"
         tabindex="0"
@@ -68,6 +69,7 @@ exports[`renderer/components/metrics/MetricGroup.tsx > should render pills when
     >
       <span
         class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+        data-component="Label"
         data-size="small"
         data-variant="secondary"
         tabindex="0"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
index eba3e6e9f..bc057990a 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`renderer/components/metrics/MetricPill.tsx > should render with metric
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -68,6 +69,7 @@ exports[`renderer/components/metrics/MetricPill.tsx > should render without metr
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
diff --git a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
index 997b02c5f..3d8db52ee 100644
--- a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders closed mileston
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -63,6 +64,7 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders open milestone
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
diff --git a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
index 3573e077d..4646cc91d 100644
--- a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when multiple r
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -57,6 +58,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when multiple r
   >
     <ul
       class="prc-LabelGroup-Container-E-ePP"
+      data-component="LabelGroup"
       data-list="true"
       data-overflow="inline"
     >
@@ -201,6 +203,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when one reacti
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -250,6 +253,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when one reacti
   >
     <ul
       class="prc-LabelGroup-Container-E-ePP"
+      data-component="LabelGroup"
       data-list="true"
       data-overflow="inline"
     >
diff --git a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
index a732f67e5..ca411a424 100644
--- a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
@@ -10,6 +10,7 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
@@ -65,6 +66,7 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
   >
     <span
       class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-component="Label"
       data-size="small"
       data-variant="secondary"
       tabindex="0"
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index f36af3be4..75bded530 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -866,6 +866,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -921,6 +922,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
index e9d859ee5..6c0c0c9af 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -67,6 +67,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
@@ -122,6 +123,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
@@ -243,6 +245,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
@@ -298,6 +301,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
@@ -421,6 +425,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
@@ -476,6 +481,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
@@ -597,6 +603,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should rende
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
@@ -652,6 +659,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should rende
       >
         <span
           class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-component="Label"
           data-size="small"
           data-variant="secondary"
           tabindex="0"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index dc816e3b7..a93609922 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -206,6 +206,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -261,6 +262,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -570,6 +572,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -625,6 +628,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -934,6 +938,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -989,6 +994,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -1298,6 +1304,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
@@ -1353,6 +1360,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
             >
               <span
                 class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-component="Label"
                 data-size="small"
                 data-variant="secondary"
                 tabindex="0"
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index c88f5be97..161436475 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -75,6 +75,7 @@ exports[`renderer/components/primitives/Header.tsx > should render itself & its
             </svg>
             <h4
               class="prc-Heading-Heading-MtWFE"
+              data-component="Heading"
             >
               Test Header
             </h4>
diff --git a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
index e119529e9..968aef728 100644
--- a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
@@ -35,6 +35,7 @@ exports[`renderer/routes/components/primitives/Title.tsx > should render the tit
         </svg>
         <h4
           class="prc-Heading-Heading-MtWFE"
+          data-component="Heading"
         >
           Legend
         </h4>
@@ -79,6 +80,7 @@ exports[`renderer/routes/components/primitives/Title.tsx > should render the tit
         </svg>
         <h4
           class="prc-Heading-Heading-MtWFE"
+          data-component="Heading"
         >
           Legend
         </h4>
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index 55053b714..f43a0d143 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -78,6 +78,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
             </svg>
             <h4
               class="prc-Heading-Heading-MtWFE"
+              data-component="Heading"
             >
               Filters
             </h4>
@@ -134,6 +135,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Account
               </h4>
@@ -266,6 +268,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Search
               </h4>
@@ -361,6 +364,9 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 class="prc-TextInputWithTokens-TextInputWrapper-HAIfc prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
                 data-block="true"
                 data-component="TextInputWithTokens"
+                data-no-leading-visual="true"
+                data-no-trailing-action="true"
+                data-no-trailing-visual="true"
                 data-size="small"
               >
                 <div
@@ -436,6 +442,9 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 class="prc-TextInputWithTokens-TextInputWrapper-HAIfc prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
                 data-block="true"
                 data-component="TextInputWithTokens"
+                data-no-leading-visual="true"
+                data-no-trailing-action="true"
+                data-no-trailing-visual="true"
                 data-size="small"
               >
                 <div
@@ -496,6 +505,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 User Type
               </h4>
@@ -684,6 +694,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Type
               </h4>
@@ -1064,6 +1075,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 State
               </h4>
@@ -1360,6 +1372,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Reason
               </h4>
diff --git a/src/renderer/routes/__snapshots__/Login.test.tsx.snap b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
index ab77be341..f9d0e0bcf 100644
--- a/src/renderer/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
@@ -80,11 +80,13 @@ exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
       >
         <h2
           class="prc-Heading-Heading-MtWFE"
+          data-component="Heading"
         >
           Notifications
         </h2>
         <h3
           class="prc-Heading-Heading-MtWFE"
+          data-component="Heading"
         >
           on your menu bar
         </h3>
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 14c3fd0d7..30d654912 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -79,6 +79,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Login with OAuth App
               </h4>
@@ -101,10 +102,12 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
       >
         <div
           class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-component="FormControl"
           data-has-label=""
         >
           <label
             class="prc-components-Label-2mrqP"
+            data-component="FormControl.Label"
             for="_r_1_"
             id="_r_1_-label"
           >
@@ -124,6 +127,9 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
             class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
             data-component="TextInput"
+            data-no-leading-visual="true"
+            data-no-trailing-action="true"
+            data-no-trailing-visual="true"
           >
             <input
               aria-describedby="_r_1_-caption"
@@ -141,6 +147,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
           </span>
           <span
             class="prc-FormControl-Caption-GNJPU prc-Text-Text-9mHv3"
+            data-component="FormControl.Caption"
             id="_r_1_-caption"
           >
             <i
@@ -217,10 +224,12 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
         </div>
         <div
           class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-component="FormControl"
           data-has-label=""
         >
           <label
             class="prc-components-Label-2mrqP"
+            data-component="FormControl.Label"
             for="_r_8_"
             id="_r_8_-label"
           >
@@ -240,6 +249,9 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
             class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
             data-component="TextInput"
+            data-no-leading-visual="true"
+            data-no-trailing-action="true"
+            data-no-trailing-visual="true"
           >
             <input
               aria-invalid="false"
@@ -257,10 +269,12 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
         </div>
         <div
           class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-component="FormControl"
           data-has-label=""
         >
           <label
             class="prc-components-Label-2mrqP"
+            data-component="FormControl.Label"
             for="_r_e_"
             id="_r_e_-label"
           >
@@ -280,6 +294,8 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
             class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
             data-component="TextInput"
+            data-no-leading-visual="true"
+            data-no-trailing-visual="true"
             data-trailing-action="true"
           >
             <input
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 6967d816e..1969cba49 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -79,6 +79,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Login with Personal Access Token
               </h4>
@@ -101,10 +102,12 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
       >
         <div
           class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-component="FormControl"
           data-has-label=""
         >
           <label
             class="prc-components-Label-2mrqP"
+            data-component="FormControl.Label"
             for="_r_1_"
             id="_r_1_-label"
           >
@@ -124,6 +127,9 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
             class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
             data-component="TextInput"
+            data-no-leading-visual="true"
+            data-no-trailing-action="true"
+            data-no-trailing-visual="true"
           >
             <input
               aria-describedby="_r_1_-caption"
@@ -141,6 +147,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
           </span>
           <span
             class="prc-FormControl-Caption-GNJPU prc-Text-Text-9mHv3"
+            data-component="FormControl.Caption"
             id="_r_1_-caption"
           >
             <i
@@ -250,10 +257,12 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
         </div>
         <div
           class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-component="FormControl"
           data-has-label=""
         >
           <label
             class="prc-components-Label-2mrqP"
+            data-component="FormControl.Label"
             for="_r_9_"
             id="_r_9_-label"
           >
@@ -273,6 +282,8 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
             class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
             data-block="true"
             data-component="TextInput"
+            data-no-leading-visual="true"
+            data-no-trailing-visual="true"
             data-trailing-action="true"
           >
             <input
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 1bf776433..6f6463f23 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -78,6 +78,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             </svg>
             <h4
               class="prc-Heading-Heading-MtWFE"
+              data-component="Heading"
             >
               Settings
             </h4>
@@ -132,6 +133,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Appearance
               </h4>
@@ -165,6 +167,9 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             <span
               class="prc-Select-TextInputWrapper-5NYFF prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
               data-component="TextInput"
+              data-no-leading-visual="true"
+              data-no-trailing-action="true"
+              data-no-trailing-visual="true"
             >
               <select
                 aria-invalid="false"
@@ -305,6 +310,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             </label>
             <div
               class="ml-2 prc-ButtonGroup-ButtonGroup-vFUrY"
+              data-component="ButtonGroup"
             >
               <div>
                 <button
@@ -519,6 +525,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Notifications
               </h4>
@@ -735,6 +742,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             </label>
             <div
               class="ml-2 prc-ButtonGroup-ButtonGroup-vFUrY"
+              data-component="ButtonGroup"
             >
               <div>
                 <button
@@ -1412,6 +1420,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 Tray
               </h4>
@@ -1612,6 +1621,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               </svg>
               <h4
                 class="prc-Heading-Heading-MtWFE"
+                data-component="Heading"
               >
                 System
               </h4>
@@ -1780,6 +1790,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             </div>
             <div
               class="ml-2 prc-ButtonGroup-ButtonGroup-vFUrY"
+              data-component="ButtonGroup"
               data-testid="settings-shortcut-group"
             >
               <div>
@@ -1961,6 +1972,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             </div>
             <div
               class="ml-2 prc-ButtonGroup-ButtonGroup-vFUrY"
+              data-component="ButtonGroup"
               data-testid="settings-volume-group"
             >
               <div>
@@ -2346,6 +2358,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span
@@ -2424,6 +2437,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           >
             <kbd
               class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-component="KeybindingHint"
               data-testid="keybinding-hint"
             >
               <span