From 326731ee806c38809f8cc625492fdd203b6e5528 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 25 Dec 2025 07:58:57 +1000
Subject: [PATCH] fix(metric): use tooltip to improve reliability of rendering

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../__snapshots__/Sidebar.test.tsx.snap       |   42 +-
 .../__snapshots__/AppLayout.test.tsx.snap     |   22 +-
 .../components/metrics/MetricGroup.tsx        |    2 +-
 .../components/metrics/MetricPill.tsx         |   32 +-
 .../__snapshots__/MetricGroup.test.tsx.snap   | 4014 +++++++++++------
 .../__snapshots__/MetricPill.test.tsx.snap    |  250 +-
 .../AccountNotifications.test.tsx.snap        |  404 +-
 .../NotificationFooter.test.tsx.snap          | 1674 ++++---
 .../NotificationRow.test.tsx.snap             | 1376 +++---
 .../RepositoryNotifications.test.tsx.snap     |   36 -
 .../__snapshots__/Header.test.tsx.snap        |    2 -
 .../__snapshots__/HoverButton.test.tsx.snap   |    2 -
 .../SettingsFooter.test.tsx.snap              |    2 +-
 .../__snapshots__/Filters.test.tsx.snap       |    3 +-
 .../routes/__snapshots__/Login.test.tsx.snap  |    6 -
 .../LoginWithOAuthApp.test.tsx.snap           |   12 +-
 ...LoginWithPersonalAccessToken.test.tsx.snap |   12 +-
 .../__snapshots__/Settings.test.tsx.snap      |   20 +-
 18 files changed, 4703 insertions(+), 3208 deletions(-)

diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 81e172b63..76c3cca09 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`renderer/components/Sidebar.tsx Filter notifications highlight filters sidebar if any are saved 1`] = `
 <button
-  aria-describedby="_r_3q_-loading-announcement _r_3p_"
+  aria-describedby="_r_3p_"
   aria-label="Filters"
   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
   data-component="IconButton"
@@ -34,7 +34,7 @@ exports[`renderer/components/Sidebar.tsx Filter notifications highlight filters
 
 exports[`renderer/components/Sidebar.tsx notifications icon renders correct icon when there are no notifications 1`] = `
 <button
-  aria-describedby="_r_1s_-loading-announcement _r_1r_"
+  aria-describedby="_r_1r_"
   aria-label="Notifications"
   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
   data-component="IconButton"
@@ -66,7 +66,7 @@ exports[`renderer/components/Sidebar.tsx notifications icon renders correct icon
 
 exports[`renderer/components/Sidebar.tsx notifications icon renders correct icon when there are notifications 1`] = `
 <button
-  aria-describedby="_r_2b_-loading-announcement _r_2a_"
+  aria-describedby="_r_2a_"
   aria-label="Notifications"
   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
   data-component="IconButton"
@@ -128,7 +128,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_2_-loading-announcement _r_1_"
+                aria-describedby="_r_1_"
                 aria-label="Gitify"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -195,7 +195,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 Home
               </span>
               <button
-                aria-describedby="_r_4_-loading-announcement _r_3_"
+                aria-describedby="_r_3_"
                 aria-label="Notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -234,7 +234,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 undefined unread notifications ↗
               </span>
               <button
-                aria-describedby="_r_6_-loading-announcement _r_5_"
+                aria-describedby="_r_5_"
                 aria-label="Filters"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -273,7 +273,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 Filter notifications
               </span>
               <button
-                aria-describedby="_r_8_-loading-announcement"
                 aria-labelledby="_r_7_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -314,7 +313,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 My issues ↗
               </span>
               <button
-                aria-describedby="_r_a_-loading-announcement"
                 aria-labelledby="_r_9_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -365,7 +363,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 data-loading-wrapper="true"
               >
                 <button
-                  aria-describedby="_r_c_-loading-announcement _r_b_"
+                  aria-describedby="_r_b_"
                   aria-label="Refresh"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -405,7 +403,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 Refresh notifications
               </span>
               <button
-                aria-describedby="_r_e_-loading-announcement"
                 aria-labelledby="_r_d_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -476,7 +473,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_2_-loading-announcement _r_1_"
+              aria-describedby="_r_1_"
               aria-label="Gitify"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -543,7 +540,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               Home
             </span>
             <button
-              aria-describedby="_r_4_-loading-announcement _r_3_"
+              aria-describedby="_r_3_"
               aria-label="Notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -582,7 +579,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               undefined unread notifications ↗
             </span>
             <button
-              aria-describedby="_r_6_-loading-announcement _r_5_"
+              aria-describedby="_r_5_"
               aria-label="Filters"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -621,7 +618,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               Filter notifications
             </span>
             <button
-              aria-describedby="_r_8_-loading-announcement"
               aria-labelledby="_r_7_"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -662,7 +658,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               My issues ↗
             </span>
             <button
-              aria-describedby="_r_a_-loading-announcement"
               aria-labelledby="_r_9_"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -713,7 +708,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-loading-wrapper="true"
             >
               <button
-                aria-describedby="_r_c_-loading-announcement _r_b_"
+                aria-describedby="_r_b_"
                 aria-label="Refresh"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -753,7 +748,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               Refresh notifications
             </span>
             <button
-              aria-describedby="_r_e_-loading-announcement"
               aria-labelledby="_r_d_"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -881,7 +875,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_h_-loading-announcement _r_g_"
+                aria-describedby="_r_g_"
                 aria-label="Gitify"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -948,7 +942,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 Home
               </span>
               <button
-                aria-describedby="_r_j_-loading-announcement _r_i_"
+                aria-describedby="_r_i_"
                 aria-label="Notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -987,7 +981,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 undefined unread notifications ↗
               </span>
               <button
-                aria-describedby="_r_l_-loading-announcement"
                 aria-labelledby="_r_k_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1028,7 +1021,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
                 My issues ↗
               </span>
               <button
-                aria-describedby="_r_n_-loading-announcement"
                 aria-labelledby="_r_m_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1076,7 +1068,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_p_-loading-announcement"
                 aria-labelledby="_r_o_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1147,7 +1138,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_h_-loading-announcement _r_g_"
+              aria-describedby="_r_g_"
               aria-label="Gitify"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1214,7 +1205,7 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               Home
             </span>
             <button
-              aria-describedby="_r_j_-loading-announcement _r_i_"
+              aria-describedby="_r_i_"
               aria-label="Notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1253,7 +1244,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               undefined unread notifications ↗
             </span>
             <button
-              aria-describedby="_r_l_-loading-announcement"
               aria-labelledby="_r_k_"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1294,7 +1284,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
               My issues ↗
             </span>
             <button
-              aria-describedby="_r_n_-loading-announcement"
               aria-labelledby="_r_m_"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1342,7 +1331,6 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_p_-loading-announcement"
               aria-labelledby="_r_o_"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index ccd967a53..f1b6ce013 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -42,7 +42,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_2_-loading-announcement _r_1_"
+                  aria-describedby="_r_1_"
                   aria-label="Gitify"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -109,7 +109,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   Home
                 </span>
                 <button
-                  aria-describedby="_r_4_-loading-announcement _r_3_"
+                  aria-describedby="_r_3_"
                   aria-label="Notifications"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -148,7 +148,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   undefined unread notifications ↗
                 </span>
                 <button
-                  aria-describedby="_r_6_-loading-announcement _r_5_"
+                  aria-describedby="_r_5_"
                   aria-label="Filters"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -187,7 +187,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   Filter notifications
                 </span>
                 <button
-                  aria-describedby="_r_8_-loading-announcement"
                   aria-labelledby="_r_7_"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -228,7 +227,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   My issues ↗
                 </span>
                 <button
-                  aria-describedby="_r_a_-loading-announcement"
                   aria-labelledby="_r_9_"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -279,7 +277,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   data-loading-wrapper="true"
                 >
                   <button
-                    aria-describedby="_r_c_-loading-announcement _r_b_"
+                    aria-describedby="_r_b_"
                     aria-label="Refresh"
                     class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                     data-component="IconButton"
@@ -319,7 +317,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                   Refresh notifications
                 </span>
                 <button
-                  aria-describedby="_r_e_-loading-announcement"
                   aria-labelledby="_r_d_"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -406,7 +403,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_2_-loading-announcement _r_1_"
+                aria-describedby="_r_1_"
                 aria-label="Gitify"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -473,7 +470,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 Home
               </span>
               <button
-                aria-describedby="_r_4_-loading-announcement _r_3_"
+                aria-describedby="_r_3_"
                 aria-label="Notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -512,7 +509,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 undefined unread notifications ↗
               </span>
               <button
-                aria-describedby="_r_6_-loading-announcement _r_5_"
+                aria-describedby="_r_5_"
                 aria-label="Filters"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -551,7 +548,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 Filter notifications
               </span>
               <button
-                aria-describedby="_r_8_-loading-announcement"
                 aria-labelledby="_r_7_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -592,7 +588,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 My issues ↗
               </span>
               <button
-                aria-describedby="_r_a_-loading-announcement"
                 aria-labelledby="_r_9_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -643,7 +638,7 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 data-loading-wrapper="true"
               >
                 <button
-                  aria-describedby="_r_c_-loading-announcement _r_b_"
+                  aria-describedby="_r_b_"
                   aria-label="Refresh"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -683,7 +678,6 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
                 Refresh notifications
               </span>
               <button
-                aria-describedby="_r_e_-loading-announcement"
                 aria-labelledby="_r_d_"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
diff --git a/src/renderer/components/metrics/MetricGroup.tsx b/src/renderer/components/metrics/MetricGroup.tsx
index fbe14cf7b..9e39bb47a 100644
--- a/src/renderer/components/metrics/MetricGroup.tsx
+++ b/src/renderer/components/metrics/MetricGroup.tsx
@@ -28,7 +28,7 @@ export const MetricGroup: FC<MetricGroupProps> = ({
 
   const labelsPillDescription = notification.subject.labels
     ?.map((label) => `🏷️ ${label}`)
-    .join('\n');
+    .join(', ');
 
   const linkedIssuesPillDescription = `Linked to ${
     notification.subject.linkedIssues?.length > 1 ? 'issues' : 'issue'
diff --git a/src/renderer/components/metrics/MetricPill.tsx b/src/renderer/components/metrics/MetricPill.tsx
index 4c330ab9b..9371fe6aa 100644
--- a/src/renderer/components/metrics/MetricPill.tsx
+++ b/src/renderer/components/metrics/MetricPill.tsx
@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 
 import type { Icon } from '@primer/octicons-react';
-import { Label, Stack, Text } from '@primer/react';
+import { Label, Stack, Text, Tooltip } from '@primer/react';
 
 import { type IconColor, Size } from '../../types';
 
@@ -16,18 +16,22 @@ export const MetricPill: FC<MetricPillProps> = (props: MetricPillProps) => {
   const Icon = props.icon;
 
   return (
-    <Label
-      className="hover:bg-gitify-notification-pill-hover"
-      size="small"
-      title={props.title}
-      variant="secondary"
-    >
-      <Stack align="center" direction="horizontal" gap="none">
-        <Icon className={props.color} size={Size.XSMALL} />
-        {props.metric ? (
-          <Text className="text-xxs px-1">{props.metric}</Text>
-        ) : null}
-      </Stack>
-    </Label>
+    <Tooltip direction="s" text={props.title}>
+      <button type="button">
+        <Label
+          className="hover:bg-gitify-notification-pill-hover"
+          size="small"
+          tabIndex={0}
+          variant="secondary"
+        >
+          <Stack align="center" direction="horizontal" gap="none">
+            <Icon className={props.color} size={Size.XSMALL} />
+            {props.metric ? (
+              <Text className="text-xxs px-1">{props.metric}</Text>
+            ) : null}
+          </Stack>
+        </Label>
+      </button>
+    </Tooltip>
   );
 };
diff --git a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
index 6e9f90ca0..cfc9fac84 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
@@ -16,12 +16,249 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
         >
           <div
             class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_e_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_e_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issues #1, #2
+            </span>
+            <button
+              aria-describedby="_r_f_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_f_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_g_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_g_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+            <button
+              aria-describedby="_r_h_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-comment text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_h_"
+              popover="auto"
+              role="tooltip"
+            >
+              1 comment
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_e_"
+            type="button"
           >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Linked to issues #1, #2"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -58,11 +295,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_e_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issues #1, #2
+          </span>
+          <button
+            aria-describedby="_r_f_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -96,11 +348,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_f_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_g_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -134,11 +401,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_g_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
+          </span>
+          <button
+            aria-describedby="_r_h_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="1 comment"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -172,178 +454,16 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issues #1, #2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
+          </button>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="1 comment"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-comment text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_h_"
+            popover="auto"
+            role="tooltip"
+          >
+            1 comment
           </span>
         </div>
       </div>
@@ -419,12 +539,249 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
         >
           <div
             class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_j_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_j_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issues #1, #2
+            </span>
+            <button
+              aria-describedby="_r_k_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_k_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_l_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_l_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+            <button
+              aria-describedby="_r_m_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-comment text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_m_"
+              popover="auto"
+              role="tooltip"
+            >
+              2 comments
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_j_"
+            type="button"
           >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Linked to issues #1, #2"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -461,11 +818,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_j_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issues #1, #2
+          </span>
+          <button
+            aria-describedby="_r_k_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -499,11 +871,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_k_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_l_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -537,11 +924,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_l_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
+          </span>
+          <button
+            aria-describedby="_r_m_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="2 comments"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -575,178 +977,16 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issues #1, #2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
+          </button>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="2 comments"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-comment text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_m_"
+            popover="auto"
+            role="tooltip"
+          >
+            2 comments
           </span>
         </div>
       </div>
@@ -822,12 +1062,196 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
         >
           <div
             class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_a_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_a_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issues #1, #2
+            </span>
+            <button
+              aria-describedby="_r_b_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_b_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_c_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_c_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_a_"
+            type="button"
           >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Linked to issues #1, #2"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -864,11 +1288,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_a_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issues #1, #2
+          </span>
+          <button
+            aria-describedby="_r_b_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -902,11 +1341,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_b_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_c_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -940,141 +1394,17 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
                 </span>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issues #1, #2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_c_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
+          </span>
         </div>
       </div>
     </div>
@@ -1149,12 +1479,302 @@ exports[`renderer/components/metrics/MetricGroup.tsx label pills should render l
         >
           <div
             class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_o_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_o_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issues #1, #2
+            </span>
+            <button
+              aria-describedby="_r_p_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_p_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_q_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_q_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+            <button
+              aria-describedby="_r_r_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-comment text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_r_"
+              popover="auto"
+              role="tooltip"
+            >
+              2 comments
+            </span>
+            <button
+              aria-describedby="_r_s_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-tag text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_s_"
+              popover="auto"
+              role="tooltip"
+            >
+              🏷️ enhancement, 🏷️ good-first-issue
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_o_"
+            type="button"
           >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Linked to issues #1, #2"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1191,11 +1811,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx label pills should render l
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_o_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issues #1, #2
+          </span>
+          <button
+            aria-describedby="_r_p_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1229,11 +1864,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx label pills should render l
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_p_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_q_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1267,11 +1917,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx label pills should render l
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_q_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
+          </span>
+          <button
+            aria-describedby="_r_r_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="2 comments"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1305,12 +1970,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx label pills should render l
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_r_"
+            popover="auto"
+            role="tooltip"
+          >
+            2 comments
+          </span>
+          <button
+            aria-describedby="_r_s_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="🏷️ enhancement
-🏷️ good-first-issue"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1344,217 +2023,16 @@ exports[`renderer/components/metrics/MetricGroup.tsx label pills should render l
                 </span>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issues #1, #2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="2 comments"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-comment text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
+          </button>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="🏷️ enhancement
-🏷️ good-first-issue"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-tag text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_s_"
+            popover="auto"
+            role="tooltip"
+          >
+            🏷️ enhancement, 🏷️ good-first-issue
           </span>
         </div>
       </div>
@@ -1630,12 +2108,196 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
         >
           <div
             class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_6_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_6_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issues #1, #2
+            </span>
+            <button
+              aria-describedby="_r_7_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_7_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_8_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_8_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_6_"
+            type="button"
           >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Linked to issues #1, #2"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1672,11 +2334,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_6_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issues #1, #2
+          </span>
+          <button
+            aria-describedby="_r_7_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1710,11 +2387,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_7_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_8_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1748,140 +2440,16 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
                 </span>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issues #1, #2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
+          </button>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_8_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
           </span>
         </div>
       </div>
@@ -1958,34 +2526,218 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
           <div
             class="flex gap-1"
           >
-            <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="Linked to issue #1"
+            <button
+              aria-describedby="_r_2_"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-issue-opened text-gitify-icon-muted"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  <path
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_2_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issue #1
+            </span>
+            <button
+              aria-describedby="_r_3_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_3_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_4_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_4_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_2_"
+            type="button"
+          >
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+              data-size="small"
+              data-variant="secondary"
+              tabindex="0"
+            >
+              <div
+                class="prc-Stack-Stack-UQ9k6"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
                     d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                   />
                   <path
@@ -1999,11 +2751,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_2_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issue #1
+          </span>
+          <button
+            aria-describedby="_r_3_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2037,11 +2804,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_3_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_4_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2075,140 +2857,16 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
                 </span>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
+          </button>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issue #1"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_4_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
           </span>
         </div>
       </div>
@@ -2284,12 +2942,350 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
         >
           <div
             class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_15_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_15_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issues #1, #2
+            </span>
+            <button
+              aria-describedby="_r_16_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_16_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_17_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_17_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+            <button
+              aria-describedby="_r_18_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-comment text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_18_"
+              popover="auto"
+              role="tooltip"
+            >
+              2 comments
+            </span>
+            <button
+              aria-describedby="_r_19_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-tag text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_19_"
+              popover="auto"
+              role="tooltip"
+            >
+              🏷️ enhancement, 🏷️ good-first-issue
+            </span>
+            <button
+              aria-describedby="_r_1a_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-milestone text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+                    />
+                  </svg>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_1a_"
+              popover="auto"
+              role="tooltip"
+            >
+              Milestone 1
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_15_"
+            type="button"
           >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Linked to issues #1, #2"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2326,11 +3322,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_15_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issues #1, #2
+          </span>
+          <button
+            aria-describedby="_r_16_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2364,11 +3375,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_16_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_17_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2402,11 +3428,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_17_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
+          </span>
+          <button
+            aria-describedby="_r_18_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="2 comments"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2440,12 +3481,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_18_"
+            popover="auto"
+            role="tooltip"
+          >
+            2 comments
+          </span>
+          <button
+            aria-describedby="_r_19_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="🏷️ enhancement
-🏷️ good-first-issue"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2479,11 +3534,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_19_"
+            popover="auto"
+            role="tooltip"
+          >
+            🏷️ enhancement, 🏷️ good-first-issue
+          </span>
+          <button
+            aria-describedby="_r_1a_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Milestone 1"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2512,250 +3582,16 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </svg>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issues #1, #2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="2 comments"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-comment text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="🏷️ enhancement
-🏷️ good-first-issue"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-tag text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
+          </button>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Milestone 1"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-milestone text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-                />
-              </svg>
-            </div>
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_1a_"
+            popover="auto"
+            role="tooltip"
+          >
+            Milestone 1
           </span>
         </div>
       </div>
@@ -2831,12 +3667,350 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
         >
           <div
             class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_u_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_u_"
+              popover="auto"
+              role="tooltip"
+            >
+              Linked to issues #1, #2
+            </span>
+            <button
+              aria-describedby="_r_v_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_v_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_10_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_10_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+            <button
+              aria-describedby="_r_11_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-comment text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_11_"
+              popover="auto"
+              role="tooltip"
+            >
+              2 comments
+            </span>
+            <button
+              aria-describedby="_r_12_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-tag text-gitify-icon-muted"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    2
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_12_"
+              popover="auto"
+              role="tooltip"
+            >
+              🏷️ enhancement, 🏷️ good-first-issue
+            </span>
+            <button
+              aria-describedby="_r_13_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-milestone text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+                    />
+                  </svg>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_13_"
+              popover="auto"
+              role="tooltip"
+            >
+              Milestone 1
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <div
+          class="flex gap-1"
+        >
+          <button
+            aria-describedby="_r_u_"
+            type="button"
           >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Linked to issues #1, #2"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2873,11 +4047,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_u_"
+            popover="auto"
+            role="tooltip"
+          >
+            Linked to issues #1, #2
+          </span>
+          <button
+            aria-describedby="_r_v_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="octocat approved these changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2911,11 +4100,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_v_"
+            popover="auto"
+            role="tooltip"
+          >
+            octocat approved these changes
+          </span>
+          <button
+            aria-describedby="_r_10_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="gitify-app requested changes"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2949,11 +4153,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_10_"
+            popover="auto"
+            role="tooltip"
+          >
+            gitify-app requested changes
+          </span>
+          <button
+            aria-describedby="_r_11_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="2 comments"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -2987,12 +4206,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_11_"
+            popover="auto"
+            role="tooltip"
+          >
+            2 comments
+          </span>
+          <button
+            aria-describedby="_r_12_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="🏷️ enhancement
-🏷️ good-first-issue"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -3026,11 +4259,26 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </span>
               </div>
             </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_12_"
+            popover="auto"
+            role="tooltip"
+          >
+            🏷️ enhancement, 🏷️ good-first-issue
+          </span>
+          <button
+            aria-describedby="_r_13_"
+            type="button"
+          >
             <span
               class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
               data-size="small"
               data-variant="secondary"
-              title="Milestone 1"
+              tabindex="0"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -3059,250 +4307,16 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
                 </svg>
               </div>
             </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Linked to issues #1, #2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
-          </span>
+          </button>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="2 comments"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-comment text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="🏷️ enhancement
-🏷️ good-first-issue"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-tag text-gitify-icon-muted"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                2
-              </span>
-            </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            title="Milestone 1"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-milestone text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-                />
-              </svg>
-            </div>
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_13_"
+            popover="auto"
+            role="tooltip"
+          >
+            Milestone 1
           </span>
         </div>
       </div>
diff --git a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
index 37c1d4046..64993852b 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
@@ -13,12 +13,83 @@ exports[`renderer/components/metrics/MetricPill.tsx should render with metric 1`
         <div
           class="prc-src-BaseStyles-aopSS"
           data-portal-root="true"
+        >
+          <button
+            aria-describedby="_r_1_"
+            type="button"
+          >
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+              data-size="small"
+              data-variant="secondary"
+              tabindex="0"
+            >
+              <div
+                class="prc-Stack-Stack-UQ9k6"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-mark-github text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                >
+                  1
+                </span>
+              </div>
+            </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_1_"
+            popover="auto"
+            role="tooltip"
+          >
+            Mock Pill
+          </span>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <button
+          aria-describedby="_r_1_"
+          type="button"
         >
           <span
             class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
             data-size="small"
             data-variant="secondary"
-            title="Mock Pill"
+            tabindex="0"
           >
             <div
               class="prc-Stack-Stack-UQ9k6"
@@ -52,57 +123,16 @@ exports[`renderer/components/metrics/MetricPill.tsx should render with metric 1`
               </span>
             </div>
           </span>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
+        </button>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          title="Mock Pill"
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="s"
+          id="_r_1_"
+          popover="auto"
+          role="tooltip"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-mark-github text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
+          Mock Pill
         </span>
       </div>
     </div>
@@ -174,12 +204,78 @@ exports[`renderer/components/metrics/MetricPill.tsx should render without metric
         <div
           class="prc-src-BaseStyles-aopSS"
           data-portal-root="true"
+        >
+          <button
+            aria-describedby="_r_3_"
+            type="button"
+          >
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+              data-size="small"
+              data-variant="secondary"
+              tabindex="0"
+            >
+              <div
+                class="prc-Stack-Stack-UQ9k6"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-mark-github text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                  />
+                </svg>
+              </div>
+            </span>
+          </button>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-Tooltip-tLeuB"
+            data-direction="s"
+            id="_r_3_"
+            popover="auto"
+            role="tooltip"
+          >
+            Mock Pill
+          </span>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-aopSS"
+        data-portal-root="true"
+      >
+        <button
+          aria-describedby="_r_3_"
+          type="button"
         >
           <span
             class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
             data-size="small"
             data-variant="secondary"
-            title="Mock Pill"
+            tabindex="0"
           >
             <div
               class="prc-Stack-Stack-UQ9k6"
@@ -208,52 +304,16 @@ exports[`renderer/components/metrics/MetricPill.tsx should render without metric
               </svg>
             </div>
           </span>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      data-color-mode="light"
-      data-dark-theme="dark"
-      data-light-theme="light"
-    >
-      <div
-        class="prc-src-BaseStyles-aopSS"
-        data-portal-root="true"
-      >
+        </button>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          title="Mock Pill"
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="s"
+          id="_r_3_"
+          popover="auto"
+          role="tooltip"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-mark-github text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-              />
-            </svg>
-          </div>
+          Mock Pill
         </span>
       </div>
     </div>
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 6eafe8951..920504776 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -23,7 +23,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_t_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -104,7 +103,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_u_-loading-announcement"
                 aria-label="My issues ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -137,7 +135,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_v_-loading-announcement"
                 aria-label="My pull requests ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -167,7 +164,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_10_-loading-announcement"
                 aria-label="No notifications for account"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -270,7 +266,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_t_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -351,7 +346,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_u_-loading-announcement"
               aria-label="My issues ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -384,7 +378,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_v_-loading-announcement"
               aria-label="My pull requests ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -414,7 +407,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_10_-loading-announcement"
               aria-label="No notifications for account"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -574,7 +566,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_o_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -655,7 +646,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_p_-loading-announcement"
                 aria-label="My issues ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -688,7 +678,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_q_-loading-announcement"
                 aria-label="My pull requests ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -718,7 +707,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_r_-loading-announcement"
                 aria-label="No notifications for account"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -821,7 +809,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_o_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -902,7 +889,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_p_-loading-announcement"
               aria-label="My issues ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -935,7 +921,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_q_-loading-announcement"
               aria-label="My pull requests ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -965,7 +950,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_r_-loading-announcement"
               aria-label="No notifications for account"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1125,7 +1109,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_6_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -1206,7 +1189,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_7_-loading-announcement"
                 aria-label="My issues ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1239,7 +1221,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_8_-loading-announcement"
                 aria-label="My pull requests ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1269,7 +1250,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_9_-loading-announcement"
                 aria-label="Hide account notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1488,81 +1468,111 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   <div
                     class="flex gap-1"
                   >
-                    <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="octocat approved these changes"
+                    <button
+                      aria-describedby="_r_b_"
+                      type="button"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-check text-gitify-icon-open"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
-                    </span>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-check text-gitify-icon-open"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
                     <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="gitify-app requested changes"
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_b_"
+                      popover="auto"
+                      role="tooltip"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      octocat approved these changes
+                    </span>
+                    <button
+                      aria-describedby="_r_c_"
+                      type="button"
+                    >
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-file-diff text-gitify-icon-closed"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-file-diff text-gitify-icon-closed"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
+                    <span
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_c_"
+                      popover="auto"
+                      role="tooltip"
+                    >
+                      gitify-app requested changes
                     </span>
                   </div>
                 </div>
@@ -1578,7 +1588,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_b_-loading-announcement"
                 aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1608,7 +1617,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_c_-loading-announcement"
                 aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1638,7 +1646,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_d_-loading-announcement"
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1683,7 +1690,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_e_"
+                aria-describedby="_r_g_"
                 type="button"
               >
                 <svg
@@ -1711,7 +1718,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_e_"
+                id="_r_g_"
                 popover="auto"
                 role="tooltip"
               >
@@ -1871,7 +1878,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_f_-loading-announcement"
                 aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1901,7 +1907,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_g_-loading-announcement"
                 aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1931,7 +1936,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_h_-loading-announcement"
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1985,7 +1989,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_6_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -2066,7 +2069,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_7_-loading-announcement"
               aria-label="My issues ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2099,7 +2101,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_8_-loading-announcement"
               aria-label="My pull requests ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2129,7 +2130,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_9_-loading-announcement"
               aria-label="Hide account notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2348,81 +2348,111 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 <div
                   class="flex gap-1"
                 >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="octocat approved these changes"
+                  <button
+                    aria-describedby="_r_b_"
+                    type="button"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
-                  </span>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="gitify-app requested changes"
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_b_"
+                    popover="auto"
+                    role="tooltip"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    octocat approved these changes
+                  </span>
+                  <button
+                    aria-describedby="_r_c_"
+                    type="button"
+                  >
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_c_"
+                    popover="auto"
+                    role="tooltip"
+                  >
+                    gitify-app requested changes
                   </span>
                 </div>
               </div>
@@ -2438,7 +2468,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_b_-loading-announcement"
               aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2468,7 +2497,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_c_-loading-announcement"
               aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2498,7 +2526,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_d_-loading-announcement"
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2543,7 +2570,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_e_"
+              aria-describedby="_r_g_"
               type="button"
             >
               <svg
@@ -2571,7 +2598,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_e_"
+              id="_r_g_"
               popover="auto"
               role="tooltip"
             >
@@ -2731,7 +2758,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_f_-loading-announcement"
               aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2761,7 +2787,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_g_-loading-announcement"
               aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2791,7 +2816,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_h_-loading-announcement"
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2902,7 +2926,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_1_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -2983,7 +3006,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_2_-loading-announcement"
                 aria-label="My issues ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -3016,7 +3038,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_3_-loading-announcement"
                 aria-label="My pull requests ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -3046,7 +3067,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_4_-loading-announcement"
                 aria-label="Hide account notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -3103,7 +3123,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_1_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -3184,7 +3203,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_2_-loading-announcement"
               aria-label="My issues ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -3217,7 +3235,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_3_-loading-announcement"
               aria-label="My pull requests ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -3247,7 +3264,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_4_-loading-announcement"
               aria-label="Hide account notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -3361,7 +3377,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_j_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -3442,7 +3457,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_k_-loading-announcement"
                 aria-label="My issues ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -3475,7 +3489,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_l_-loading-announcement"
                 aria-label="My pull requests ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -3505,7 +3518,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-describedby="_r_m_-loading-announcement"
                 aria-label="No notifications for account"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -3603,7 +3615,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_j_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -3684,7 +3695,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_k_-loading-announcement"
               aria-label="My issues ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -3717,7 +3727,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_l_-loading-announcement"
               aria-label="My pull requests ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -3747,7 +3756,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-describedby="_r_m_-loading-announcement"
               aria-label="No notifications for account"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -3902,7 +3910,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_1h_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -3983,7 +3990,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_1i_-loading-announcement"
                 aria-label="My issues ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -4016,7 +4022,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 </svg>
               </button>
               <button
-                aria-describedby="_r_1j_-loading-announcement"
                 aria-label="My pull requests ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -4046,7 +4051,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 </svg>
               </button>
               <button
-                aria-describedby="_r_1k_-loading-announcement"
                 aria-label="Show account notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -4099,7 +4103,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_1m_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -4180,7 +4183,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_1n_-loading-announcement"
                 aria-label="My issues ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -4213,7 +4215,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 </svg>
               </button>
               <button
-                aria-describedby="_r_1o_-loading-announcement"
                 aria-label="My pull requests ↗"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -4243,7 +4244,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 </svg>
               </button>
               <button
-                aria-describedby="_r_1p_-loading-announcement"
                 aria-label="Hide account notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -4300,7 +4300,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_1m_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -4381,7 +4380,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_1n_-loading-announcement"
               aria-label="My issues ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -4414,7 +4412,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
               </svg>
             </button>
             <button
-              aria-describedby="_r_1o_-loading-announcement"
               aria-label="My pull requests ↗"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -4444,7 +4441,6 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
               </svg>
             </button>
             <button
-              aria-describedby="_r_1p_-loading-announcement"
               aria-label="Hide account notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
index 97e6393d0..9b06e32f9 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -73,81 +73,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
             <div
               class="flex gap-1"
             >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+              <button
+                aria-describedby="_r_7_"
+                type="button"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
-                  >
-                    1
-                  </span>
-                </div>
-              </span>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-check text-gitify-icon-open"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
               <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_7_"
+                popover="auto"
+                role="tooltip"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                octocat approved these changes
+              </span>
+              <button
+                aria-describedby="_r_8_"
+                type="button"
+              >
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    1
-                  </span>
-                </div>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-file-diff text-gitify-icon-closed"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_8_"
+                popover="auto"
+                role="tooltip"
+              >
+                gitify-app requested changes
               </span>
             </div>
           </div>
@@ -224,81 +254,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
           <div
             class="flex gap-1"
           >
-            <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="octocat approved these changes"
+            <button
+              aria-describedby="_r_7_"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
-            </span>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="gitify-app requested changes"
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_7_"
+              popover="auto"
+              role="tooltip"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_8_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_8_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
             </span>
           </div>
         </div>
@@ -432,83 +492,113 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
             <div
               class="flex gap-1"
             >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+              <button
+                aria-describedby="_r_a_"
+                type="button"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    1
-                  </span>
-                </div>
-              </span>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-check text-gitify-icon-open"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
               <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_a_"
+                popover="auto"
+                role="tooltip"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                octocat approved these changes
+              </span>
+              <button
+                aria-describedby="_r_b_"
+                type="button"
+              >
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    1
-                  </span>
-                </div>
-              </span>
-            </div>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-file-diff text-gitify-icon-closed"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_b_"
+                popover="auto"
+                role="tooltip"
+              >
+                gitify-app requested changes
+              </span>
+            </div>
           </div>
         </div>
       </div>
@@ -583,81 +673,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
           <div
             class="flex gap-1"
           >
-            <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="octocat approved these changes"
+            <button
+              aria-describedby="_r_a_"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
-            </span>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="gitify-app requested changes"
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_a_"
+              popover="auto"
+              role="tooltip"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_b_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_b_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
             </span>
           </div>
         </div>
@@ -792,81 +912,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
             <div
               class="flex gap-1"
             >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+              <button
+                aria-describedby="_r_d_"
+                type="button"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
-                  >
-                    1
-                  </span>
-                </div>
-              </span>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-check text-gitify-icon-open"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
               <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_d_"
+                popover="auto"
+                role="tooltip"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                octocat approved these changes
+              </span>
+              <button
+                aria-describedby="_r_e_"
+                type="button"
+              >
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    1
-                  </span>
-                </div>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-file-diff text-gitify-icon-closed"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_e_"
+                popover="auto"
+                role="tooltip"
+              >
+                gitify-app requested changes
               </span>
             </div>
           </div>
@@ -944,85 +1094,115 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
           <div
             class="flex gap-1"
           >
-            <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="octocat approved these changes"
+            <button
+              aria-describedby="_r_d_"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
-            </span>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="gitify-app requested changes"
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_d_"
+              popover="auto"
+              role="tooltip"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              octocat approved these changes
             </span>
-          </div>
-        </div>
-      </div>
+            <button
+              aria-describedby="_r_e_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_e_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
+          </div>
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -1152,81 +1332,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
             <div
               class="flex gap-1"
             >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+              <button
+                aria-describedby="_r_1_"
+                type="button"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
-                  >
-                    1
-                  </span>
-                </div>
-              </span>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-check text-gitify-icon-open"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
               <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_1_"
+                popover="auto"
+                role="tooltip"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                octocat approved these changes
+              </span>
+              <button
+                aria-describedby="_r_2_"
+                type="button"
+              >
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    1
-                  </span>
-                </div>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-file-diff text-gitify-icon-closed"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_2_"
+                popover="auto"
+                role="tooltip"
+              >
+                gitify-app requested changes
               </span>
             </div>
           </div>
@@ -1303,81 +1513,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
           <div
             class="flex gap-1"
           >
-            <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="octocat approved these changes"
+            <button
+              aria-describedby="_r_1_"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
-            </span>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="gitify-app requested changes"
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_1_"
+              popover="auto"
+              role="tooltip"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_2_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_2_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
             </span>
           </div>
         </div>
@@ -1511,81 +1751,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
             <div
               class="flex gap-1"
             >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+              <button
+                aria-describedby="_r_4_"
+                type="button"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
-                  >
-                    1
-                  </span>
-                </div>
-              </span>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-check text-gitify-icon-open"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
               <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_4_"
+                popover="auto"
+                role="tooltip"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                octocat approved these changes
+              </span>
+              <button
+                aria-describedby="_r_5_"
+                type="button"
+              >
+                <span
+                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                  data-size="small"
+                  data-variant="secondary"
+                  tabindex="0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <div
+                    class="prc-Stack-Stack-UQ9k6"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
                   >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-9mHv3"
-                  >
-                    1
-                  </span>
-                </div>
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-file-diff text-gitify-icon-closed"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="12"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="12"
+                    >
+                      <path
+                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                      />
+                    </svg>
+                    <span
+                      class="text-xxs px-1 prc-Text-Text-9mHv3"
+                    >
+                      1
+                    </span>
+                  </div>
+                </span>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_5_"
+                popover="auto"
+                role="tooltip"
+              >
+                gitify-app requested changes
               </span>
             </div>
           </div>
@@ -1662,81 +1932,111 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
           <div
             class="flex gap-1"
           >
-            <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="octocat approved these changes"
+            <button
+              aria-describedby="_r_4_"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
-            </span>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              title="gitify-app requested changes"
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_4_"
+              popover="auto"
+              role="tooltip"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_5_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  1
-                </span>
-              </div>
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_5_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
             </span>
           </div>
         </div>
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index a53d3105c..8227203cc 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -202,81 +202,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   <div
                     class="flex gap-1"
                   >
-                    <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="octocat approved these changes"
+                    <button
+                      aria-describedby="_r_2_"
+                      type="button"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-check text-gitify-icon-open"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
-                    </span>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-check text-gitify-icon-open"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
                     <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="gitify-app requested changes"
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_2_"
+                      popover="auto"
+                      role="tooltip"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      octocat approved these changes
+                    </span>
+                    <button
+                      aria-describedby="_r_3_"
+                      type="button"
+                    >
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-file-diff text-gitify-icon-closed"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-file-diff text-gitify-icon-closed"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
+                    <span
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_3_"
+                      popover="auto"
+                      role="tooltip"
+                    >
+                      gitify-app requested changes
                     </span>
                   </div>
                 </div>
@@ -292,7 +322,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_2_-loading-announcement"
                 aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -322,7 +351,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_3_-loading-announcement"
                 aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -352,7 +380,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_4_-loading-announcement"
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -585,81 +612,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 <div
                   class="flex gap-1"
                 >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="octocat approved these changes"
+                  <button
+                    aria-describedby="_r_2_"
+                    type="button"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
-                  </span>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="gitify-app requested changes"
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_2_"
+                    popover="auto"
+                    role="tooltip"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    octocat approved these changes
+                  </span>
+                  <button
+                    aria-describedby="_r_3_"
+                    type="button"
+                  >
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_3_"
+                    popover="auto"
+                    role="tooltip"
+                  >
+                    gitify-app requested changes
                   </span>
                 </div>
               </div>
@@ -675,7 +732,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_2_-loading-announcement"
               aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -705,7 +761,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_3_-loading-announcement"
               aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -735,7 +790,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_4_-loading-announcement"
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -851,7 +905,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_6_"
+                aria-describedby="_r_8_"
                 type="button"
               >
                 <svg
@@ -879,7 +933,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_6_"
+                id="_r_8_"
                 popover="auto"
                 role="tooltip"
               >
@@ -973,81 +1027,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   <div
                     class="flex gap-1"
                   >
-                    <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="octocat approved these changes"
+                    <button
+                      aria-describedby="_r_9_"
+                      type="button"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-check text-gitify-icon-open"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
-                    </span>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-check text-gitify-icon-open"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
                     <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="gitify-app requested changes"
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_9_"
+                      popover="auto"
+                      role="tooltip"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      octocat approved these changes
+                    </span>
+                    <button
+                      aria-describedby="_r_a_"
+                      type="button"
+                    >
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-file-diff text-gitify-icon-closed"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-file-diff text-gitify-icon-closed"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
+                    <span
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_a_"
+                      popover="auto"
+                      role="tooltip"
+                    >
+                      gitify-app requested changes
                     </span>
                   </div>
                 </div>
@@ -1063,7 +1147,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_7_-loading-announcement"
                 aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1093,7 +1176,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_8_-loading-announcement"
                 aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1123,7 +1205,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_9_-loading-announcement"
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1182,7 +1263,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_6_"
+              aria-describedby="_r_8_"
               type="button"
             >
               <svg
@@ -1210,7 +1291,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_6_"
+              id="_r_8_"
               popover="auto"
               role="tooltip"
             >
@@ -1304,81 +1385,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 <div
                   class="flex gap-1"
                 >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="octocat approved these changes"
+                  <button
+                    aria-describedby="_r_9_"
+                    type="button"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
-                  </span>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="gitify-app requested changes"
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_9_"
+                    popover="auto"
+                    role="tooltip"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    octocat approved these changes
+                  </span>
+                  <button
+                    aria-describedby="_r_a_"
+                    type="button"
+                  >
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_a_"
+                    popover="auto"
+                    role="tooltip"
+                  >
+                    gitify-app requested changes
                   </span>
                 </div>
               </div>
@@ -1394,7 +1505,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_7_-loading-announcement"
               aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1424,7 +1534,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_8_-loading-announcement"
               aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1454,7 +1563,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_9_-loading-announcement"
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1570,7 +1678,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_b_"
+                aria-describedby="_r_f_"
                 type="button"
               >
                 <svg
@@ -1598,7 +1706,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_b_"
+                id="_r_f_"
                 popover="auto"
                 role="tooltip"
               >
@@ -1692,81 +1800,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   <div
                     class="flex gap-1"
                   >
-                    <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="octocat approved these changes"
+                    <button
+                      aria-describedby="_r_g_"
+                      type="button"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-check text-gitify-icon-open"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
-                    </span>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-check text-gitify-icon-open"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
                     <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="gitify-app requested changes"
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_g_"
+                      popover="auto"
+                      role="tooltip"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      octocat approved these changes
+                    </span>
+                    <button
+                      aria-describedby="_r_h_"
+                      type="button"
+                    >
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-file-diff text-gitify-icon-closed"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-file-diff text-gitify-icon-closed"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
+                    <span
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_h_"
+                      popover="auto"
+                      role="tooltip"
+                    >
+                      gitify-app requested changes
                     </span>
                   </div>
                 </div>
@@ -1782,7 +1920,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_c_-loading-announcement"
                 aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1812,7 +1949,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_d_-loading-announcement"
                 aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1842,7 +1978,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_e_-loading-announcement"
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1901,7 +2036,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_b_"
+              aria-describedby="_r_f_"
               type="button"
             >
               <svg
@@ -1929,7 +2064,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_b_"
+              id="_r_f_"
               popover="auto"
               role="tooltip"
             >
@@ -2023,81 +2158,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 <div
                   class="flex gap-1"
                 >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="octocat approved these changes"
+                  <button
+                    aria-describedby="_r_g_"
+                    type="button"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
-                  </span>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="gitify-app requested changes"
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_g_"
+                    popover="auto"
+                    role="tooltip"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    octocat approved these changes
+                  </span>
+                  <button
+                    aria-describedby="_r_h_"
+                    type="button"
+                  >
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_h_"
+                    popover="auto"
+                    role="tooltip"
+                  >
+                    gitify-app requested changes
                   </span>
                 </div>
               </div>
@@ -2113,7 +2278,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_c_-loading-announcement"
               aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2143,7 +2307,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_d_-loading-announcement"
               aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2173,7 +2336,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_e_-loading-announcement"
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2289,7 +2451,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_g_"
+                aria-describedby="_r_m_"
                 type="button"
               >
                 <svg
@@ -2317,7 +2479,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-tLeuB"
                 data-direction="e"
-                id="_r_g_"
+                id="_r_m_"
                 popover="auto"
                 role="tooltip"
               >
@@ -2411,81 +2573,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   <div
                     class="flex gap-1"
                   >
-                    <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="octocat approved these changes"
+                    <button
+                      aria-describedby="_r_n_"
+                      type="button"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-check text-gitify-icon-open"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
-                    </span>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-check text-gitify-icon-open"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
                     <span
-                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                      data-size="small"
-                      data-variant="secondary"
-                      title="gitify-app requested changes"
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_n_"
+                      popover="auto"
+                      role="tooltip"
                     >
-                      <div
-                        class="prc-Stack-Stack-UQ9k6"
-                        data-align="center"
-                        data-direction="horizontal"
-                        data-gap="none"
-                        data-justify="start"
-                        data-padding="none"
-                        data-wrap="nowrap"
+                      octocat approved these changes
+                    </span>
+                    <button
+                      aria-describedby="_r_o_"
+                      type="button"
+                    >
+                      <span
+                        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                        data-size="small"
+                        data-variant="secondary"
+                        tabindex="0"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="octicon octicon-file-diff text-gitify-icon-closed"
-                          display="inline-block"
-                          fill="currentColor"
-                          focusable="false"
-                          height="12"
-                          overflow="visible"
-                          style="vertical-align: text-bottom;"
-                          viewBox="0 0 16 16"
-                          width="12"
-                        >
-                          <path
-                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                          />
-                        </svg>
-                        <span
-                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        <div
+                          class="prc-Stack-Stack-UQ9k6"
+                          data-align="center"
+                          data-direction="horizontal"
+                          data-gap="none"
+                          data-justify="start"
+                          data-padding="none"
+                          data-wrap="nowrap"
                         >
-                          1
-                        </span>
-                      </div>
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-file-diff text-gitify-icon-closed"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="12"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="12"
+                          >
+                            <path
+                              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                            />
+                          </svg>
+                          <span
+                            class="text-xxs px-1 prc-Text-Text-9mHv3"
+                          >
+                            1
+                          </span>
+                        </div>
+                      </span>
+                    </button>
+                    <span
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-tLeuB"
+                      data-direction="s"
+                      id="_r_o_"
+                      popover="auto"
+                      role="tooltip"
+                    >
+                      gitify-app requested changes
                     </span>
                   </div>
                 </div>
@@ -2501,7 +2693,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_h_-loading-announcement"
                 aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -2531,7 +2722,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_i_-loading-announcement"
                 aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -2561,7 +2751,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-describedby="_r_j_-loading-announcement"
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -2620,7 +2809,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_g_"
+              aria-describedby="_r_m_"
               type="button"
             >
               <svg
@@ -2648,7 +2837,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
               data-direction="e"
-              id="_r_g_"
+              id="_r_m_"
               popover="auto"
               role="tooltip"
             >
@@ -2742,81 +2931,111 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 <div
                   class="flex gap-1"
                 >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="octocat approved these changes"
+                  <button
+                    aria-describedby="_r_n_"
+                    type="button"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
-                  </span>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    title="gitify-app requested changes"
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_n_"
+                    popover="auto"
+                    role="tooltip"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
+                    octocat approved these changes
+                  </span>
+                  <button
+                    aria-describedby="_r_o_"
+                    type="button"
+                  >
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                      data-size="small"
+                      data-variant="secondary"
+                      tabindex="0"
                     >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
+                      <div
+                        class="prc-Stack-Stack-UQ9k6"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
                       >
-                        1
-                      </span>
-                    </div>
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-9mHv3"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                  </button>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-tLeuB"
+                    data-direction="s"
+                    id="_r_o_"
+                    popover="auto"
+                    role="tooltip"
+                  >
+                    gitify-app requested changes
                   </span>
                 </div>
               </div>
@@ -2832,7 +3051,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_h_-loading-announcement"
               aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2862,7 +3080,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_i_-loading-announcement"
               aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -2892,7 +3109,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-describedby="_r_j_-loading-announcement"
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index 8ea4e1cb6..ccebe1f4b 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -23,7 +23,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_6_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -104,7 +103,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_7_-loading-announcement"
                 aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -134,7 +132,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 </svg>
               </button>
               <button
-                aria-describedby="_r_8_-loading-announcement"
                 aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -164,7 +161,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 </svg>
               </button>
               <button
-                aria-describedby="_r_9_-loading-announcement"
                 aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -224,7 +220,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_6_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -305,7 +300,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_7_-loading-announcement"
               aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -335,7 +329,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               </svg>
             </button>
             <button
-              aria-describedby="_r_8_-loading-announcement"
               aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -365,7 +358,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               </svg>
             </button>
             <button
-              aria-describedby="_r_9_-loading-announcement"
               aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -482,7 +474,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_1_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -563,7 +554,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_2_-loading-announcement"
                 aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -593,7 +583,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 </svg>
               </button>
               <button
-                aria-describedby="_r_3_-loading-announcement"
                 aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -623,7 +612,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 </svg>
               </button>
               <button
-                aria-describedby="_r_4_-loading-announcement"
                 aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -683,7 +671,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_1_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -764,7 +751,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_2_-loading-announcement"
               aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -794,7 +780,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               </svg>
             </button>
             <button
-              aria-describedby="_r_3_-loading-announcement"
               aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -824,7 +809,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               </svg>
             </button>
             <button
-              aria-describedby="_r_4_-loading-announcement"
               aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -941,7 +925,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_v_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -1029,7 +1012,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_10_-loading-announcement"
                 aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1059,7 +1041,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-describedby="_r_11_-loading-announcement"
                 aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1089,7 +1070,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-describedby="_r_12_-loading-announcement"
                 aria-label="Show repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1142,7 +1122,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_14_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -1230,7 +1209,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_15_-loading-announcement"
                 aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1260,7 +1238,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-describedby="_r_16_-loading-announcement"
                 aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1290,7 +1267,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-describedby="_r_17_-loading-announcement"
                 aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1350,7 +1326,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_14_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -1438,7 +1413,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_15_-loading-announcement"
               aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1468,7 +1442,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               </svg>
             </button>
             <button
-              aria-describedby="_r_16_-loading-announcement"
               aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1498,7 +1471,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               </svg>
             </button>
             <button
-              aria-describedby="_r_17_-loading-announcement"
               aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1615,7 +1587,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_q_-loading-announcement"
               class="prc-Button-ButtonBase-9n-Xk"
               data-has-count="true"
               data-loading="false"
@@ -1703,7 +1674,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_r_-loading-announcement"
                 aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1733,7 +1703,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 </svg>
               </button>
               <button
-                aria-describedby="_r_s_-loading-announcement"
                 aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1763,7 +1732,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 </svg>
               </button>
               <button
-                aria-describedby="_r_t_-loading-announcement"
                 aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -1823,7 +1791,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_q_-loading-announcement"
             class="prc-Button-ButtonBase-9n-Xk"
             data-has-count="true"
             data-loading="false"
@@ -1911,7 +1878,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_r_-loading-announcement"
               aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1941,7 +1907,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
               </svg>
             </button>
             <button
-              aria-describedby="_r_s_-loading-announcement"
               aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
@@ -1971,7 +1936,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
               </svg>
             </button>
             <button
-              aria-describedby="_r_t_-loading-announcement"
               aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index 2cebdca21..3440a377c 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -26,7 +26,6 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_1_-loading-announcement"
                 aria-labelledby="Go Back"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -120,7 +119,6 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_1_-loading-announcement"
               aria-labelledby="Go Back"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
diff --git a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
index fd89acc13..a1b7c9bf4 100644
--- a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
@@ -98,7 +98,6 @@ exports[`renderer/components/primitives/HoverButton.tsx should render 1`] = `
           data-portal-root="true"
         >
           <button
-            aria-describedby="_r_1_-loading-announcement"
             aria-label="Hover Button"
             class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
             data-component="IconButton"
@@ -142,7 +141,6 @@ exports[`renderer/components/primitives/HoverButton.tsx should render 1`] = `
         data-portal-root="true"
       >
         <button
-          aria-describedby="_r_1_-loading-announcement"
           aria-label="Hover Button"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
diff --git a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
index a51004f82..c936d4167 100644
--- a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
+++ b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`renderer/components/settings/SettingsFooter.tsx should show app version 1`] = `
 <button
-  aria-describedby="_r_2_-loading-announcement _r_1_"
+  aria-describedby="_r_1_"
   class="prc-Button-ButtonBase-9n-Xk"
   data-loading="false"
   data-no-visuals="true"
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index cb62368f6..6d2b51c6c 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -17,7 +17,6 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       data-wrap="nowrap"
     >
       <button
-        aria-describedby="_r_1_-loading-announcement"
         aria-labelledby="Go Back"
         class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
         data-component="IconButton"
@@ -2031,7 +2030,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       data-wrap="nowrap"
     >
       <button
-        aria-describedby="_r_r_-loading-announcement _r_q_"
+        aria-describedby="_r_q_"
         class="prc-Button-ButtonBase-9n-Xk"
         data-loading="false"
         data-size="medium"
diff --git a/src/renderer/routes/__snapshots__/Login.test.tsx.snap b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
index 7cf6f5b99..34970e437 100644
--- a/src/renderer/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
@@ -109,7 +109,6 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
                   Login with
                 </span>
                 <button
-                  aria-describedby="_r_1_-loading-announcement"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="medium"
@@ -152,7 +151,6 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
                   </span>
                 </button>
                 <button
-                  aria-describedby="_r_2_-loading-announcement"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="medium"
@@ -195,7 +193,6 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
                   </span>
                 </button>
                 <button
-                  aria-describedby="_r_3_-loading-announcement"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="medium"
@@ -349,7 +346,6 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
                 Login with
               </span>
               <button
-                aria-describedby="_r_1_-loading-announcement"
                 class="prc-Button-ButtonBase-9n-Xk"
                 data-loading="false"
                 data-size="medium"
@@ -392,7 +388,6 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
                 </span>
               </button>
               <button
-                aria-describedby="_r_2_-loading-announcement"
                 class="prc-Button-ButtonBase-9n-Xk"
                 data-loading="false"
                 data-size="medium"
@@ -435,7 +430,6 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
                 </span>
               </button>
               <button
-                aria-describedby="_r_3_-loading-announcement"
                 class="prc-Button-ButtonBase-9n-Xk"
                 data-loading="false"
                 data-size="medium"
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 4b2f55be6..b0642180d 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -30,7 +30,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_1_-loading-announcement"
                   aria-labelledby="Go Back"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -169,7 +168,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                   data-wrap="nowrap"
                 >
                   <button
-                    aria-describedby="_r_6_-loading-announcement"
                     class="prc-Button-ButtonBase-9n-Xk"
                     data-loading="false"
                     data-size="small"
@@ -302,7 +300,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                       class="TextInput-action prc-components-TextInputAction-CjGDX"
                     >
                       <button
-                        aria-describedby="_r_g_-loading-announcement"
                         aria-labelledby="_r_f_"
                         class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                         data-component="IconButton"
@@ -355,7 +352,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_i_-loading-announcement _r_h_"
+                  aria-describedby="_r_h_"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="small"
@@ -411,7 +408,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                   data-loading-wrapper="true"
                 >
                   <button
-                    aria-describedby="_r_j_-loading-announcement"
                     class="prc-Button-ButtonBase-9n-Xk"
                     data-loading="false"
                     data-size="medium"
@@ -487,7 +483,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_1_-loading-announcement"
                 aria-labelledby="Go Back"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -626,7 +621,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_6_-loading-announcement"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="small"
@@ -759,7 +753,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                     class="TextInput-action prc-components-TextInputAction-CjGDX"
                   >
                     <button
-                      aria-describedby="_r_g_-loading-announcement"
                       aria-labelledby="_r_f_"
                       class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                       data-component="IconButton"
@@ -812,7 +805,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_i_-loading-announcement _r_h_"
+                aria-describedby="_r_h_"
                 class="prc-Button-ButtonBase-9n-Xk"
                 data-loading="false"
                 data-size="small"
@@ -868,7 +861,6 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-loading-wrapper="true"
               >
                 <button
-                  aria-describedby="_r_j_-loading-announcement"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="medium"
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 7c3c717d7..0ca013fcb 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -30,7 +30,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_1_-loading-announcement"
                   aria-labelledby="Go Back"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -178,7 +177,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     data-wrap="nowrap"
                   >
                     <button
-                      aria-describedby="_r_6_-loading-announcement"
                       class="prc-Button-ButtonBase-9n-Xk"
                       data-loading="false"
                       data-size="small"
@@ -296,7 +294,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       class="TextInput-action prc-components-TextInputAction-CjGDX"
                     >
                       <button
-                        aria-describedby="_r_d_-loading-announcement"
                         aria-labelledby="_r_c_"
                         class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                         data-component="IconButton"
@@ -349,7 +346,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_f_-loading-announcement _r_e_"
+                  aria-describedby="_r_e_"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="small"
@@ -405,7 +402,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   data-loading-wrapper="true"
                 >
                   <button
-                    aria-describedby="_r_g_-loading-announcement"
                     class="prc-Button-ButtonBase-9n-Xk"
                     data-loading="false"
                     data-size="medium"
@@ -481,7 +477,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_1_-loading-announcement"
                 aria-labelledby="Go Back"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
@@ -629,7 +624,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   data-wrap="nowrap"
                 >
                   <button
-                    aria-describedby="_r_6_-loading-announcement"
                     class="prc-Button-ButtonBase-9n-Xk"
                     data-loading="false"
                     data-size="small"
@@ -747,7 +741,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     class="TextInput-action prc-components-TextInputAction-CjGDX"
                   >
                     <button
-                      aria-describedby="_r_d_-loading-announcement"
                       aria-labelledby="_r_c_"
                       class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
                       data-component="IconButton"
@@ -800,7 +793,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_f_-loading-announcement _r_e_"
+                aria-describedby="_r_e_"
                 class="prc-Button-ButtonBase-9n-Xk"
                 data-loading="false"
                 data-size="small"
@@ -856,7 +849,6 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 data-loading-wrapper="true"
               >
                 <button
-                  aria-describedby="_r_g_-loading-announcement"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
                   data-size="medium"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index d7b540c29..a49af8031 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -17,7 +17,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
       data-wrap="nowrap"
     >
       <button
-        aria-describedby="_r_1_-loading-announcement"
         aria-labelledby="Go Back"
         class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
         data-component="IconButton"
@@ -304,7 +303,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <div>
                 <button
-                  aria-describedby="_r_3_-loading-announcement"
                   aria-label="Zoom out"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -338,7 +336,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_4_-loading-announcement"
                   aria-label="Zoom percentage"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
@@ -365,7 +362,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_5_-loading-announcement"
                   aria-label="Zoom in"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -399,7 +395,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_6_-loading-announcement"
                   aria-label="Reset zoom"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -730,7 +725,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <div>
                 <button
-                  aria-describedby="_r_a_-loading-announcement"
                   aria-label="Decrease fetch interval"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -761,7 +755,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_b_-loading-announcement"
                   aria-label="Fetch interval"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
@@ -787,7 +780,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_c_-loading-announcement"
                   aria-label="Increase fetch interval"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -818,7 +810,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_d_-loading-announcement"
                   aria-label="Reset fetch interval"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -1727,7 +1718,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <div>
                 <button
-                  aria-describedby="_r_s_-loading-announcement"
                   aria-label="Volume down"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -1763,7 +1753,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_t_-loading-announcement"
                   aria-label="Volume percentage"
                   class="prc-Button-ButtonBase-9n-Xk"
                   data-loading="false"
@@ -1790,7 +1779,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_u_-loading-announcement"
                   aria-label="Volume up"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -1822,7 +1810,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_v_-loading-announcement"
                   aria-label="Reset volume"
                   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                   data-component="IconButton"
@@ -1912,7 +1899,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_11_-loading-announcement"
           class="prc-Button-ButtonBase-9n-Xk w-[200px]"
           data-loading="false"
           data-no-visuals="true"
@@ -1957,7 +1943,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_13_-loading-announcement _r_12_"
+          aria-describedby="_r_12_"
           class="prc-Button-ButtonBase-9n-Xk"
           data-loading="false"
           data-no-visuals="true"
@@ -2002,7 +1988,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_15_-loading-announcement _r_14_"
+          aria-describedby="_r_14_"
           aria-label="Accounts"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
@@ -2041,7 +2027,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           Accounts
         </span>
         <button
-          aria-describedby="_r_17_-loading-announcement _r_16_"
+          aria-describedby="_r_16_"
           aria-label="Quit Gitify"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"