diff --git a/package.json b/package.json
index 11d8ab41f..6f9c4c233 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "@electron/notarize": "3.1.1",
     "@graphql-codegen/cli": "6.1.0",
     "@graphql-codegen/schema-ast": "5.0.0",
+    "@octokit/openapi-types": "27.0.0",
     "@parcel/watcher": "2.5.1",
     "@primer/css": "22.0.2",
     "@primer/octicons-react": "19.21.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a57119c7..636f76e84 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,6 +48,9 @@ importers:
       '@graphql-codegen/schema-ast':
         specifier: 5.0.0
         version: 5.0.0(graphql@16.12.0)
+      '@octokit/openapi-types':
+        specifier: 27.0.0
+        version: 27.0.0
       '@parcel/watcher':
         specifier: 2.5.1
         version: 2.5.1
@@ -1620,6 +1623,9 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This functionality has been moved to @npmcli/fs
 
+  '@octokit/openapi-types@27.0.0':
+    resolution: {integrity: sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==}
+
   '@oddbird/popover-polyfill@0.5.2':
     resolution: {integrity: sha512-iFrvar5SOMtKFOSjYvs4z9UlLqDdJbMx0mgISLcPedv+g0ac5sgeETLGtipHCVIae6HJPclNEH5aCyD1RZaEHw==}
 
@@ -7902,6 +7908,8 @@ snapshots:
       mkdirp: 1.0.4
       rimraf: 3.0.2
 
+  '@octokit/openapi-types@27.0.0': {}
+
   '@oddbird/popover-polyfill@0.5.2': {}
 
   '@parcel/watcher-android-arm64@2.5.1':
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/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 6eafe8951..ad65459eb 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"
@@ -1578,7 +1558,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 +1587,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 +1616,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"
@@ -1871,7 +1848,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 +1877,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 +1906,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 +1959,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 +2039,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 +2071,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 +2100,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"
@@ -2438,7 +2408,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 +2437,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 +2466,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"
@@ -2731,7 +2698,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 +2727,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 +2756,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 +2866,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 +2946,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 +2978,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 +3007,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 +3063,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 +3143,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 +3175,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 +3204,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 +3317,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 +3397,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 +3429,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 +3458,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 +3555,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 +3635,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 +3667,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 +3696,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 +3850,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 +3930,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 +3962,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 +3991,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 +4043,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 +4123,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 +4155,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 +4184,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 +4240,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 +4320,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 +4352,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 +4381,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__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index a53d3105c..2e86e40c9 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -292,7 +292,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 +321,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 +350,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"
@@ -675,7 +672,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 +701,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 +730,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"
@@ -1063,7 +1057,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 +1086,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 +1115,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"
@@ -1394,7 +1385,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 +1414,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 +1443,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"
@@ -1782,7 +1770,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 +1799,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 +1828,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"
@@ -2113,7 +2098,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 +2127,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 +2156,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"
@@ -2501,7 +2483,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 +2512,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 +2541,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"
@@ -2832,7 +2811,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 +2840,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 +2869,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"
diff --git a/src/renderer/typesGitHub.ts b/src/renderer/typesGitHub.ts
index 7f3eb9551..559a3ebf9 100644
--- a/src/renderer/typesGitHub.ts
+++ b/src/renderer/typesGitHub.ts
@@ -1,15 +1,15 @@
+import type { components } from '@octokit/openapi-types';
+
 import type { GitifyNotification, GitifySubject, Link } from './types';
 
 // TODO: #828 Add explicit types for GitHub API response vs Gitify Notifications object
-export type Notification = GitHubNotification & GitifyNotification;
-export type Subject = GitHubSubject & GitifySubject;
 
-/**
- *
- * GitHub REST API Response Types
- *
- **/
+export interface GitHubRESTError {
+  message: string;
+  documentation_url: Link;
+}
 
+// Stronger typings for string literal attributes
 export type Reason =
   | 'approval_requested'
   | 'assign'
@@ -46,215 +46,73 @@ export type UserType =
   | 'Organization'
   | 'User';
 
-export interface GitHubNotification {
-  id: string;
-  unread: boolean;
+// Base types from Octokit
+export type NotificationThreadSubscription =
+  components['schemas']['thread-subscription'];
+
+type BaseNotification = components['schemas']['thread'];
+type BaseUser = components['schemas']['simple-user'];
+type BaseRepository = components['schemas']['repository'];
+type BaseCommit = components['schemas']['commit'];
+type BaseCommitComment = components['schemas']['commit-comment'];
+type BaseRelease = components['schemas']['release'];
+type BaseSubject = components['schemas']['thread']['subject'];
+
+// Strengthen user-related types with explicit property overrides
+type GitHubNotification = Omit<
+  BaseNotification,
+  'reason' | 'subject' | 'repository'
+> & {
   reason: Reason;
-  updated_at: string;
-  last_read_at: string | null;
   subject: Subject;
   repository: Repository;
-  url: Link;
-  subscription_url: Link;
-}
+};
 
-interface GitHubSubject {
-  title: string;
+type GitHubSubject = Omit<
+  BaseSubject,
+  'url' | 'latest_comment_url' | 'type'
+> & {
   url: Link | null;
   latest_comment_url: Link | null;
   type: SubjectType;
-}
-
-export interface User {
-  login: string;
-  id: number;
-  node_id: string;
-  avatar_url: Link;
-  gravatar_url: Link;
-  url: Link;
-  html_url: Link;
-  followers_url: Link;
-  following_url: Link;
-  gists_url: Link;
-  starred_url: Link;
-  subscriptions_url: Link;
-  organizations_url: Link;
-  repos_url: Link;
-  events_url: Link;
-  received_events_url: Link;
-  type: UserType;
-  site_admin: boolean;
-}
-
-export interface Repository {
-  id: number;
-  node_id: string;
-  name: string;
-  full_name: string;
-  private: boolean;
-  owner: Owner;
-  html_url: Link;
-  description: string;
-  fork: boolean;
-  url: Link;
-  forks_url: Link;
-  keys_url: Link;
-  collaborators_url: Link;
-  teams_url: Link;
-  hooks_url: Link;
-  issue_events_url: Link;
-  events_url: Link;
-  assignees_url: Link;
-  branches_url: Link;
-  tags_url: Link;
-  blobs_url: Link;
-  git_tags_url: Link;
-  git_refs_url: Link;
-  trees_url: Link;
-  statuses_url: Link;
-  languages_url: Link;
-  stargazers_url: Link;
-  contributors_url: Link;
-  subscribers_url: Link;
-  subscription_url: Link;
-  commits_url: Link;
-  git_commits_url: Link;
-  comments_url: Link;
-  issue_comment_url: Link;
-  contents_url: Link;
-  compare_url: Link;
-  merges_url: Link;
-  archive_url: Link;
-  downloads_url: Link;
-  issues_url: Link;
-  pulls_url: Link;
-  milestones_url: Link;
-  notifications_url: Link;
-  labels_url: Link;
-  releases_url: Link;
-  deployments_url: Link;
-}
-
-export interface Owner {
-  login: string;
-  id: number;
-  node_id: string;
-  avatar_url: Link;
-  gravatar_id: string;
-  url: Link;
-  html_url: Link;
-  followers_url: Link;
-  following_url: Link;
-  gists_url: Link;
-  starred_url: Link;
-  subscriptions_url: Link;
-  organizations_url: Link;
-  repos_url: Link;
-  events_url: Link;
-  received_events_url: Link;
-  type: UserType;
-  site_admin: boolean;
-}
-
-export interface Commit {
-  sha: string;
-  node_id: string;
-  commit: {
-    author: CommitUser;
-    committer: CommitUser;
-    message: string;
-    tree: {
-      sha: string;
-      url: Link;
-    };
-    url: Link;
-    comment_count: number;
-    verification: {
-      verified: boolean;
-      reason: string;
-      signature: string | null;
-      payload: string | null;
-    };
-  };
-  url: Link;
-  html_url: Link;
-  comments_url: Link;
-  author: User;
-  committer: User;
-  parents: CommitParent[];
-  stats: {
-    total: number;
-    additions: number;
-    deletions: number;
-  };
-  files: CommitFiles[];
-}
+};
 
-interface CommitUser {
-  name: string;
-  email: string;
-  date: string;
-}
+type StrengthenNullable<T, K extends keyof T, Extra> = Omit<T, K> & {
+  [P in K]: T[P] extends null ? null : NonNullable<T[P]> & Extra;
+};
 
-interface CommitParent {
-  sha: string;
-  url: Link;
-  html_url: Link;
-}
-
-interface CommitFiles {
-  sha: string;
-  filename: string;
-  status: string;
-  additions: number;
-  deletions: number;
-  changes: number;
-  blob_url: Link;
-  raw_url: Link;
-  contents_url: Link;
-  patch: string;
-}
+// Exported strengthened types
+export type Notification = GitHubNotification & GitifyNotification;
 
-export interface CommitComment {
-  url: Link;
-  html_url: Link;
-  issue_url: Link;
-  id: number;
-  node_id: string;
-  user: User;
-  created_at: string;
-  updated_at: string;
-  body: string;
-}
+export type Subject = GitHubSubject & GitifySubject;
 
-export interface Release {
-  url: Link;
-  assets_url: Link;
-  upload_url: Link;
+export type Repository = Omit<BaseRepository, 'html_url' | 'owner'> & {
   html_url: Link;
-  id: number;
-  author: User;
-  node_id: string;
-  tag_name: string;
-  target_commitish: string;
-  name: string | null;
-  body: string | null;
-  draft: boolean;
-  prerelease: boolean;
-  created_at: string;
-  published_at: string | null;
-}
+  owner: Owner;
+};
 
-export interface GitHubRESTError {
-  message: string;
-  documentation_url: Link;
-}
+export type User = Omit<BaseUser, 'type'> & { type: UserType };
 
-export interface NotificationThreadSubscription {
-  subscribed: boolean;
-  ignored: boolean;
-  reason: string | null;
-  created_at: string;
-  url: Link;
-  thread_url: Link;
-}
+export type Owner = Omit<
+  NonNullable<BaseRepository['owner']>,
+  'type' | 'avatar_url'
+> & {
+  type: UserType;
+  avatar_url: Link;
+};
+
+export type Commit = StrengthenNullable<
+  BaseCommit,
+  'author',
+  { type: UserType }
+>;
+export type CommitComment = StrengthenNullable<
+  BaseCommitComment,
+  'user',
+  { type: UserType }
+>;
+export type Release = StrengthenNullable<
+  BaseRelease,
+  'author',
+  { type: UserType }
+>;
diff --git a/src/renderer/utils/api/__mocks__/response-mocks.ts b/src/renderer/utils/api/__mocks__/response-mocks.ts
index dd2e8d4ad..4a514d7ed 100644
--- a/src/renderer/utils/api/__mocks__/response-mocks.ts
+++ b/src/renderer/utils/api/__mocks__/response-mocks.ts
@@ -3,36 +3,43 @@ import {
   mockGitHubEnterpriseServerAccount,
 } from '../../../__mocks__/account-mocks';
 import type { Link } from '../../../types';
-import type { Notification, Repository, User } from '../../../typesGitHub';
+import type {
+  Notification,
+  Owner,
+  Repository,
+  User,
+} from '../../../typesGitHub';
 
-export const mockNotificationUser: User = {
-  login: 'octocat',
+export const mockNotificationUser = {
   id: 123456789,
-  node_id: 'MDQ6VXNlcjE=',
+  login: 'octocat',
   avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
-  gravatar_url: '' as Link,
   url: 'https://api.github.com/users/octocat' as Link,
   html_url: 'https://github.com/octocat' as Link,
-  followers_url: 'https://api.github.com/users/octocat/followers' as Link,
-  following_url:
-    'https://api.github.com/users/octocat/following{/other_user}' as Link,
-  gists_url: 'https://api.github.com/users/octocat/gists{/gist_id}' as Link,
-  starred_url:
-    'https://api.github.com/users/octocat/starred{/owner}{/repo}' as Link,
-  subscriptions_url:
-    'https://api.github.com/users/octocat/subscriptions' as Link,
-  organizations_url: 'https://api.github.com/users/octocat/orgs' as Link,
-  repos_url: 'https://api.github.com/users/octocat/repos' as Link,
-  events_url: 'https://api.github.com/users/octocat/events{/privacy}' as Link,
-  received_events_url:
-    'https://api.github.com/users/octocat/received_events' as Link,
   type: 'User',
-  site_admin: false,
-};
+} satisfies Partial<User>;
 
 // 2 Notifications
 // Hostname : 'github.com'
 // Repository : 'gitify-app/notifications-test'
+const mockGitHubOwner = {
+  id: 6333409,
+  login: 'gitify-app',
+  avatar_url:
+    'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
+  url: 'https://api.github.com/users/gitify-app' as Link,
+  html_url: 'https://github.com/gitify-app' as Link,
+  type: 'User',
+} satisfies Partial<Owner>;
+
+const mockGitHubRepository = {
+  id: 57216596,
+  name: 'notifications-test',
+  full_name: 'gitify-app/notifications-test',
+  owner: mockGitHubOwner as unknown as Owner,
+  html_url: 'https://github.com/gitify-app/notifications-test' as Link,
+} satisfies Partial<Repository>;
+
 export const mockGitHubNotifications: Notification[] = [
   {
     account: mockGitHubCloudAccount,
@@ -71,118 +78,7 @@ export const mockGitHubNotifications: Notification[] = [
         },
       ],
     },
-    repository: {
-      id: 57216596,
-      node_id: 'MDEwOlJlcG9zaXRvcnkzNjAyOTcwNg==',
-      name: 'notifications-test',
-      full_name: 'gitify-app/notifications-test',
-      url: 'https://api.github.com/gitify-app/notifications-test' as Link,
-      owner: {
-        login: 'gitify-app',
-        id: 6333409,
-        node_id: 'MDQ6VXNlcjYzMzM0MDk=',
-        avatar_url:
-          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
-        gravatar_id: '',
-        url: 'https://api.github.com/users/gitify-app' as Link,
-        html_url: 'https://github.com/gitify-app' as Link,
-        followers_url:
-          'https://api.github.com/users/gitify-app/followers' as Link,
-        following_url:
-          'https://api.github.com/users/gitify-app/following{/other_user}' as Link,
-        gists_url:
-          'https://api.github.com/users/gitify-app/gists{/gist_id}' as Link,
-        starred_url:
-          'https://api.github.com/users/gitify-app/starred{/owner}{/repo}' as Link,
-        subscriptions_url:
-          'https://api.github.com/users/gitify-app/subscriptions' as Link,
-        organizations_url:
-          'https://api.github.com/users/gitify-app/orgs' as Link,
-        repos_url: 'https://api.github.com/users/gitify-app/repos' as Link,
-        events_url:
-          'https://api.github.com/users/gitify-app/events{/privacy}' as Link,
-        received_events_url:
-          'https://api.github.com/users/gitify-app/received_events' as Link,
-        type: 'User',
-        site_admin: false,
-      },
-      private: true,
-      description: 'Test Repository',
-      fork: false,
-      archive_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/{archive_format}{/ref}' as Link,
-      assignees_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/assignees{/user}' as Link,
-      blobs_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/git/blobs{/sha}' as Link,
-      branches_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/branches{/branch}' as Link,
-      collaborators_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/collaborators{/collaborator}' as Link,
-      comments_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/comments{/number}' as Link,
-      commits_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/commits{/sha}' as Link,
-      compare_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/compare/{base}...{head}' as Link,
-      contents_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/contents/{+path}' as Link,
-      contributors_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/contributors' as Link,
-      deployments_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/deployments' as Link,
-      downloads_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/downloads' as Link,
-      events_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/events' as Link,
-      forks_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/forks' as Link,
-      git_commits_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/git/commits{/sha}' as Link,
-      git_refs_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/git/refs{/sha}' as Link,
-      git_tags_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/git/tags{/sha}' as Link,
-      hooks_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/hooks' as Link,
-      html_url: 'https://github.com/gitify-app/notifications-test' as Link,
-      issue_comment_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/issues/comments{/number}' as Link,
-      issue_events_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/issues/events{/number}' as Link,
-      issues_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/issues{/number}' as Link,
-      keys_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/keys{/key_id}' as Link,
-      labels_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/labels{/name}' as Link,
-      languages_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/languages' as Link,
-      merges_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/merges' as Link,
-      milestones_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/milestones{/number}' as Link,
-      notifications_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/notifications{?since,all,participating}' as Link,
-      pulls_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/pulls{/number}' as Link,
-      releases_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/releases{/id}' as Link,
-      stargazers_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/stargazers' as Link,
-      statuses_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/statuses/{sha}' as Link,
-      subscribers_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/subscribers' as Link,
-      subscription_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/subscription' as Link,
-      tags_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/tags' as Link,
-      teams_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/teams' as Link,
-      trees_url:
-        'https://api.github.com/repos/gitify-app/notifications-test/git/trees{/sha}' as Link,
-    },
+    repository: mockGitHubRepository as unknown as Repository,
     url: 'https://api.github.com/notifications/threads/138661096' as Link,
     subscription_url:
       'https://api.github.com/notifications/threads/138661096/subscription' as Link,
@@ -203,44 +99,7 @@ export const mockGitHubNotifications: Notification[] = [
       type: 'Issue',
       reviews: null,
     },
-    repository: {
-      id: 57216596,
-      name: 'notifications-test',
-      full_name: 'gitify-app/notifications-test',
-      owner: {
-        login: 'gitify-app',
-        id: 6333409,
-        avatar_url:
-          'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
-        gravatar_id: '',
-        url: 'https://api.github.com/users/gitify-app' as Link,
-        html_url: 'https://github.com/gitify-app' as Link,
-        followers_url:
-          'https://api.github.com/users/gitify-app/followers' as Link,
-        following_url:
-          'https://api.github.com/users/gitify-app/following{/other_user}' as Link,
-        gists_url:
-          'https://api.github.com/users/gitify-app/gists{/gist_id}' as Link,
-        starred_url:
-          'https://api.github.com/users/gitify-app/starred{/owner}{/repo}' as Link,
-        subscriptions_url:
-          'https://api.github.com/users/gitify-app/subscriptions' as Link,
-        organizations_url:
-          'https://api.github.com/users/gitify-app/orgs' as Link,
-        repos_url: 'https://api.github.com/users/gitify-app/repos' as Link,
-        events_url:
-          'https://api.github.com/users/gitify-app/events{/privacy}' as Link,
-        received_events_url:
-          'https://api.github.com/users/gitify-app/received_events' as Link,
-        type: 'User',
-        site_admin: false,
-      },
-      private: true,
-      html_url: 'https://github.com/gitify-app/notifications-test',
-      description: null,
-      fork: false,
-      // Removed the rest of the properties
-    } as unknown as Repository,
+    repository: mockGitHubRepository as unknown as Repository,
     url: 'https://api.github.com/notifications/threads/148827438' as Link,
     subscription_url:
       'https://api.github.com/notifications/threads/148827438/subscription' as Link,
@@ -250,6 +109,23 @@ export const mockGitHubNotifications: Notification[] = [
 // 2 Notifications
 // Hostname : 'github.gitify.io'
 // Repository : 'myorg/notifications-test'
+const mockEnterpriseOwner = {
+  login: 'myorg',
+  id: 4,
+  avatar_url: 'https://github.gitify.io/avatars/u/4?' as Link,
+  url: 'https://github.gitify.io/api/v3/users/myorg',
+  html_url: 'https://github.gitify.io/myorg' as Link,
+  type: 'Organization',
+} satisfies Partial<Owner>;
+
+const mockEnterpriseRepository = {
+  id: 1,
+  name: 'notifications-test',
+  full_name: 'myorg/notifications-test',
+  owner: mockEnterpriseOwner as unknown as Owner,
+  html_url: 'https://github.gitify.io/myorg/notifications-test' as Link,
+} satisfies Partial<Repository>;
+
 export const mockEnterpriseNotifications: Notification[] = [
   {
     account: mockGitHubEnterpriseServerAccount,
@@ -267,43 +143,7 @@ export const mockEnterpriseNotifications: Notification[] = [
       type: 'Release',
       reviews: null,
     },
-    repository: {
-      id: 1,
-      name: 'notifications-test',
-      full_name: 'myorg/notifications-test',
-      owner: {
-        login: 'myorg',
-        id: 4,
-        avatar_url: 'https://github.gitify.io/avatars/u/4?' as Link,
-        gravatar_id: '',
-        url: 'https://github.gitify.io/api/v3/users/myorg',
-        html_url: 'https://github.gitify.io/myorg' as Link,
-        followers_url:
-          'https://github.gitify.io/api/v3/users/myorg/followers' as Link,
-        following_url:
-          'https://github.gitify.io/api/v3/users/myorg/following{/other_user}' as Link,
-        gists_url:
-          'https://github.gitify.io/api/v3/users/myorg/gists{/gist_id}' as Link,
-        starred_url:
-          'https://github.gitify.io/api/v3/users/myorg/starred{/owner}{/repo}' as Link,
-        subscriptions_url:
-          'https://github.gitify.io/api/v3/users/myorg/subscriptions' as Link,
-        organizations_url:
-          'https://github.gitify.io/api/v3/users/myorg/orgs' as Link,
-        repos_url: 'https://github.gitify.io/api/v3/users/myorg/repos' as Link,
-        events_url:
-          'https://github.gitify.io/api/v3/users/myorg/events{/privacy}' as Link,
-        received_events_url:
-          'https://github.gitify.io/api/v3/users/myorg/received_events' as Link,
-        type: 'Organization',
-        site_admin: false,
-      },
-      private: true,
-      html_url: 'https://github.gitify.io/myorg/notifications-test' as Link,
-      description: null,
-      fork: false,
-      // Removed the rest of the properties
-    } as unknown as Repository,
+    repository: mockEnterpriseRepository as unknown as Repository,
     url: 'https://github.gitify.io/api/v3/notifications/threads/4' as Link,
     subscription_url:
       'https://github.gitify.io/api/v3/notifications/threads/4/subscription' as Link,
@@ -324,43 +164,7 @@ export const mockEnterpriseNotifications: Notification[] = [
       type: 'PullRequest',
       reviews: null,
     },
-    repository: {
-      id: 1,
-      name: 'notifications-test',
-      full_name: 'myorg/notifications-test',
-      owner: {
-        login: 'myorg',
-        id: 4,
-        avatar_url: 'https://github.gitify.io/avatars/u/4?' as Link,
-        gravatar_id: '',
-        url: 'https://github.gitify.io/api/v3/users/myorg' as Link,
-        html_url: 'https://github.gitify.io/myorg' as Link,
-        followers_url:
-          'https://github.gitify.io/api/v3/users/myorg/followers' as Link,
-        following_url:
-          'https://github.gitify.io/api/v3/users/myorg/following{/other_user}' as Link,
-        gists_url:
-          'https://github.gitify.io/api/v3/users/myorg/gists{/gist_id}' as Link,
-        starred_url:
-          'https://github.gitify.io/api/v3/users/myorg/starred{/owner}{/repo}' as Link,
-        subscriptions_url:
-          'https://github.gitify.io/api/v3/users/myorg/subscriptions' as Link,
-        organizations_url:
-          'https://github.gitify.io/api/v3/users/myorg/orgs' as Link,
-        repos_url: 'https://github.gitify.io/api/v3/users/myorg/repos' as Link,
-        events_url:
-          'https://github.gitify.io/api/v3/users/myorg/events{/privacy}' as Link,
-        received_events_url:
-          'https://github.gitify.io/api/v3/users/myorg/received_events' as Link,
-        type: 'Organization',
-        site_admin: false,
-      },
-      private: true,
-      html_url: 'https://github.gitify.io/myorg/notifications-test' as Link,
-      description: null,
-      fork: false,
-      // Removed the rest of the properties
-    } as unknown as Repository,
+    repository: mockEnterpriseRepository as unknown as Repository,
     url: 'https://github.gitify.io/api/v3/notifications/threads/3' as Link,
     subscription_url:
       'https://github.gitify.io/api/v3/notifications/threads/3/subscription' as Link,
diff --git a/src/renderer/utils/notifications/handlers/commit.ts b/src/renderer/utils/notifications/handlers/commit.ts
index cc13f5bcd..4187c5056 100644
--- a/src/renderer/utils/notifications/handlers/commit.ts
+++ b/src/renderer/utils/notifications/handlers/commit.ts
@@ -5,10 +5,11 @@ import { GitCommitIcon } from '@primer/octicons-react';
 
 import type {
   GitifyNotificationState,
+  GitifyNotificationUser,
   GitifySubject,
   SettingsState,
 } from '../../../types';
-import type { Notification, Subject, User } from '../../../typesGitHub';
+import type { Notification, Subject } from '../../../typesGitHub';
 import { getCommit, getCommitComment } from '../../api/client';
 import { isStateFilteredOut } from '../filters/filter';
 import { DefaultHandler } from './default';
@@ -28,7 +29,7 @@ class CommitHandler extends DefaultHandler {
       return null;
     }
 
-    let user: User;
+    let user: GitifyNotificationUser;
 
     if (notification.subject.latest_comment_url) {
       const commitComment = (
@@ -44,7 +45,12 @@ class CommitHandler extends DefaultHandler {
         await getCommit(notification.subject.url, notification.account.token)
       ).data;
 
-      user = commit.author;
+      user = {
+        login: commit.author.login,
+        avatar_url: commit.author.avatar_url,
+        html_url: commit.author.html_url,
+        type: commit.author.type,
+      };
     }
 
     return {