diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 63ad1f1c0..529aa94c5 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -43,6 +43,7 @@ const mockNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
+  fetchReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index f4c7ae55c..2925ddee8 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -35,7 +35,7 @@ export const Sidebar: FC = () => {
     status,
     settings,
     auth,
-    unreadNotificationCount,
+    notificationCount,
     hasUnreadNotifications,
   } = useAppContext();
 
@@ -91,7 +91,7 @@ export const Sidebar: FC = () => {
         <IconButton
           aria-label="Notifications"
           data-testid="sidebar-notifications"
-          description={`${unreadNotificationCount} unread notifications ↗`}
+          description={`${notificationCount} ${settings.fetchReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
           icon={BellIcon}
           onClick={() => openGitHubNotifications(primaryAccountHostname)}
           size="small"
diff --git a/src/renderer/components/notifications/NotificationRow.test.tsx b/src/renderer/components/notifications/NotificationRow.test.tsx
index 14ed55fc6..58e22aadc 100644
--- a/src/renderer/components/notifications/NotificationRow.test.tsx
+++ b/src/renderer/components/notifications/NotificationRow.test.tsx
@@ -154,6 +154,24 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       expect(markNotificationsAsReadMock).toHaveBeenCalledTimes(1);
     });
 
+    it('should hide mark as read button when notification is already read', async () => {
+      const readNotification = {
+        ...mockSingleNotification,
+        unread: false,
+      };
+
+      const props = {
+        notification: readNotification,
+        account: mockGitHubCloudAccount,
+      };
+
+      renderWithAppContext(<NotificationRow {...props} />);
+
+      expect(
+        screen.queryByTestId('notification-mark-as-read'),
+      ).not.toBeInTheDocument();
+    });
+
     it('should mark notifications as done', async () => {
       const markNotificationsAsDoneMock = jest.fn();
 
diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index c158689c6..560fe1bed 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -138,6 +138,14 @@ export const NotificationRow: FC<NotificationRowProps> = ({
 
       {!animateExit && (
         <HoverGroup bgColor="group-hover:bg-gitify-notification-hover">
+          <HoverButton
+            action={actionMarkAsRead}
+            enabled={!isNotificationRead}
+            icon={ReadIcon}
+            label="Mark as read"
+            testid="notification-mark-as-read"
+          />
+
           <HoverButton
             action={actionMarkAsDone}
             enabled={isMarkAsDoneFeatureSupported(notification.account)}
@@ -146,13 +154,6 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             testid="notification-mark-as-done"
           />
 
-          <HoverButton
-            action={actionMarkAsRead}
-            icon={ReadIcon}
-            label="Mark as read"
-            testid="notification-mark-as-read"
-          />
-
           <HoverButton
             action={actionUnsubscribeFromThread}
             icon={BellSlashIcon}
diff --git a/src/renderer/components/notifications/RepositoryNotifications.test.tsx b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
index fc0a2220b..bfe3538dc 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.test.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
@@ -23,6 +23,13 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
     repoNotifications: mockGitHubNotifications,
   };
 
+  beforeEach(() => {
+    // Reset mock notification state between tests since it's mutated
+    for (const n of mockGitHubNotifications) {
+      n.unread = true;
+    }
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });
diff --git a/src/renderer/components/notifications/RepositoryNotifications.tsx b/src/renderer/components/notifications/RepositoryNotifications.tsx
index 7f2f3ce0d..a0e2a363f 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -91,6 +91,14 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
 
         {!animateExit && (
           <HoverGroup bgColor="group-hover:bg-gitify-repository">
+            <HoverButton
+              action={actionMarkAsRead}
+              enabled={!areAllRepoNotificationsRead}
+              icon={ReadIcon}
+              label="Mark repository as read"
+              testid="repository-mark-as-read"
+            />
+
             <HoverButton
               action={actionMarkAsDone}
               enabled={isMarkAsDoneFeatureSupported(
@@ -101,13 +109,6 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
               testid="repository-mark-as-done"
             />
 
-            <HoverButton
-              action={actionMarkAsRead}
-              icon={ReadIcon}
-              label="Mark repository as read"
-              testid="repository-mark-as-read"
-            />
-
             <HoverButton
               action={actionToggleRepositoryNotifications}
               icon={Chevron.icon}
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 920504776..e49f20bc6 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -1588,20 +1588,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1612,25 +1612,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1641,7 +1641,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1878,20 +1878,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1902,25 +1902,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1931,7 +1931,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -2468,20 +2468,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2492,25 +2492,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2521,7 +2521,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -2758,20 +2758,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2782,25 +2782,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2811,7 +2811,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 8227203cc..cf0f804e6 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -322,20 +322,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -346,25 +346,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -375,7 +375,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -732,20 +732,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -756,25 +756,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -785,7 +785,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1147,20 +1147,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1171,25 +1171,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1200,7 +1200,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1505,20 +1505,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1529,25 +1529,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1558,7 +1558,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1920,20 +1920,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Mark as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-done"
+                data-testid="notification-mark-as-read"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Mark as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1944,25 +1944,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark as read"
+                aria-label="Mark as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="notification-mark-as-read"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1973,7 +1973,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -2278,20 +2278,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Mark as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-done"
+              data-testid="notification-mark-as-read"
               data-variant="invisible"
-              title="Mark as done"
+              title="Mark as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2302,25 +2302,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark as read"
+              aria-label="Mark as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="notification-mark-as-read"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Mark as read"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2331,7 +2331,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -2721,35 +2721,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   />
                 </svg>
               </button>
-              <button
-                aria-label="Mark as read"
-                class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="notification-mark-as-read"
-                data-variant="invisible"
-                title="Mark as read"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-read"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-                  />
-                </svg>
-              </button>
               <button
                 aria-label="Unsubscribe from thread"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
@@ -3079,35 +3050,6 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 />
               </svg>
             </button>
-            <button
-              aria-label="Mark as read"
-              class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="notification-mark-as-read"
-              data-variant="invisible"
-              title="Mark as read"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-read"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-                />
-              </svg>
-            </button>
             <button
               aria-label="Unsubscribe from thread"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index ccebe1f4b..e70eee124 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -131,35 +131,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   />
                 </svg>
               </button>
-              <button
-                aria-label="Mark repository as read"
-                class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="repository-mark-as-read"
-                data-variant="invisible"
-                title="Mark repository as read"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-read"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-                  />
-                </svg>
-              </button>
               <button
                 aria-label="Hide repository notifications"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
@@ -328,35 +299,6 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 />
               </svg>
             </button>
-            <button
-              aria-label="Mark repository as read"
-              class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="repository-mark-as-read"
-              data-variant="invisible"
-              title="Mark repository as read"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-read"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-                />
-              </svg>
-            </button>
             <button
               aria-label="Hide repository notifications"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
@@ -554,20 +496,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -578,25 +520,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -607,7 +549,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -751,20 +693,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark repository as done"
+              aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-mark-as-read"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Mark repository as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -775,25 +717,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as read"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-read"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -804,7 +746,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -917,7 +859,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
           data-portal-root="true"
         >
           <div
-            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+            class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="horizontal"
             data-justify="start"
@@ -1012,20 +954,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1036,25 +978,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1065,7 +1007,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1114,7 +1056,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
           data-portal-root="true"
         >
           <div
-            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+            class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="horizontal"
             data-justify="start"
@@ -1209,20 +1151,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1233,25 +1175,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1262,7 +1204,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1318,7 +1260,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
         data-portal-root="true"
       >
         <div
-          class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+          class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
           data-align="stretch"
           data-direction="horizontal"
           data-justify="start"
@@ -1413,20 +1355,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark repository as done"
+              aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-mark-as-read"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Mark repository as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1437,25 +1379,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as read"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-read"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1466,7 +1408,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1579,7 +1521,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
           data-portal-root="true"
         >
           <div
-            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+            class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="horizontal"
             data-justify="start"
@@ -1674,20 +1616,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark repository as done"
+                aria-label="Mark repository as read"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-done"
+                data-testid="repository-mark-as-read"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Mark repository as read"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-read"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1698,25 +1640,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Mark repository as read"
+                aria-label="Mark repository as done"
                 class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
                 data-component="IconButton"
                 data-loading="false"
                 data-no-visuals="true"
                 data-size="small"
-                data-testid="repository-mark-as-read"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1727,7 +1669,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1783,7 +1725,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
         data-portal-root="true"
       >
         <div
-          class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+          class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
           data-align="stretch"
           data-direction="horizontal"
           data-justify="start"
@@ -1878,20 +1820,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark repository as done"
+              aria-label="Mark repository as read"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-done"
+              data-testid="repository-mark-as-read"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Mark repository as read"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-read"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1902,25 +1844,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Mark repository as read"
+              aria-label="Mark repository as done"
               class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
               data-component="IconButton"
               data-loading="false"
               data-no-visuals="true"
               data-size="small"
-              data-testid="repository-mark-as-read"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1931,7 +1873,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 648bf8c76..630988cb1 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -271,6 +271,24 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
     );
   });
 
+  it('should toggle the fetchReadNotifications checkbox', async () => {
+    await act(async () => {
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: updateSettingMock,
+      });
+    });
+
+    await userEvent.click(
+      screen.getByTestId('checkbox-fetchReadNotifications'),
+    );
+
+    expect(updateSettingMock).toHaveBeenCalledTimes(1);
+    expect(updateSettingMock).toHaveBeenCalledWith(
+      'fetchReadNotifications',
+      true,
+    );
+  });
+
   it('should toggle the markAsDoneOnOpen checkbox', async () => {
     await act(async () => {
       renderWithAppContext(<NotificationSettings />, {
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 66bb02de7..102e53843 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -328,6 +328,31 @@ export const NotificationSettings: FC = () => {
           }
         />
 
+        <Checkbox
+          checked={settings.fetchReadNotifications}
+          label="Fetch read notifications"
+          name="fetchReadNotifications"
+          onChange={(evt) =>
+            updateSetting('fetchReadNotifications', evt.target.checked)
+          }
+          tooltip={
+            <Stack direction="vertical" gap="condensed">
+              <Text>
+                When <Text as="u">checked</Text>, {APPLICATION.NAME} will fetch
+                and display both read and unread notifications.
+              </Text>
+              <Text>
+                When <Text as="u">unchecked</Text>, {APPLICATION.NAME} will only
+                fetch and display unread notifications.
+              </Text>
+              <Text className="text-gitify-caution">
+                ⚠️ Enabling this setting will increase API usage and may cause
+                rate limiting for users with many notifications.
+              </Text>
+            </Stack>
+          }
+        />
+
         <Checkbox
           checked={settings.markAsDoneOnOpen}
           label="Mark as done on open"
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index 4ca7a5f40..6b5e2f03f 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -291,7 +291,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     setUseUnreadActiveIcon(settings.useUnreadActiveIcon);
     setUseAlternateIdleIcon(settings.useAlternateIdleIcon);
 
-    const trayCount = status === 'error' ? -1 : unreadNotificationCount;
+    const trayCount = status === 'error' ? -1 : notificationCount;
     setTrayIconColorAndTitle(trayCount, settings);
   }, [
     settings.showNotificationsCountInTray,
diff --git a/src/renderer/context/defaults.ts b/src/renderer/context/defaults.ts
index b37fc260a..e26199f98 100644
--- a/src/renderer/context/defaults.ts
+++ b/src/renderer/context/defaults.ts
@@ -36,6 +36,7 @@ const defaultNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
+  fetchReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/hooks/useNotifications.test.ts b/src/renderer/hooks/useNotifications.test.ts
index e99f84bdc..8b7cb706f 100644
--- a/src/renderer/hooks/useNotifications.test.ts
+++ b/src/renderer/hooks/useNotifications.test.ts
@@ -88,11 +88,11 @@ describe('renderer/hooks/useNotifications.ts', () => {
       ];
 
       nock('https://api.github.com')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .reply(200, notifications);
 
       nock('https://github.gitify.io/api/v3')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .reply(200, notifications);
 
       const { result } = renderHook(() => useNotifications());
@@ -214,7 +214,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
       ];
 
       nock('https://api.github.com')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .reply(200, mockNotifications);
 
       nock('https://api.github.com')
@@ -322,7 +322,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
       const message = 'Bad credentials';
 
       nock('https://api.github.com/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
@@ -334,7 +334,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
         });
 
       nock('https://github.gitify.io/api/v3/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
@@ -365,7 +365,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
       const code = AxiosError.ERR_BAD_REQUEST;
 
       nock('https://api.github.com/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
@@ -377,7 +377,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
         });
 
       nock('https://github.gitify.io/api/v3/')
-        .get('/notifications?participating=false')
+        .get('/notifications?participating=false&all=false')
         .replyWithError({
           code,
           response: {
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index a49af8031..f0f90e965 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1098,6 +1098,54 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </svg>
             </button>
           </div>
+          <div
+            class="text-sm prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-fetchReadNotifications"
+              id="fetchReadNotifications"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="fetchReadNotifications"
+            >
+              Fetch read notifications
+            </label>
+            <button
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="tooltip-fetchReadNotifications"
+              data-testid="tooltip-tooltip-fetchReadNotifications"
+              id="tooltip-fetchReadNotifications"
+              tabindex="0"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-question text-gitify-tooltip-icon"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                />
+              </svg>
+            </button>
+          </div>
           <div
             class="text-sm prc-Stack-Stack-UQ9k6"
             data-align="center"
@@ -1943,7 +1991,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_12_"
+          aria-describedby="_r_13_"
           class="prc-Button-ButtonBase-9n-Xk"
           data-loading="false"
           data-no-visuals="true"
@@ -1971,7 +2019,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="ne"
-          id="_r_12_"
+          id="_r_13_"
           popover="auto"
           role="tooltip"
         >
@@ -1988,7 +2036,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_14_"
+          aria-describedby="_r_15_"
           aria-label="Accounts"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
@@ -2020,14 +2068,14 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="n"
-          id="_r_14_"
+          id="_r_15_"
           popover="auto"
           role="tooltip"
         >
           Accounts
         </span>
         <button
-          aria-describedby="_r_16_"
+          aria-describedby="_r_17_"
           aria-label="Quit Gitify"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
@@ -2059,7 +2107,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-tLeuB"
           data-direction="nw"
-          id="_r_16_"
+          id="_r_17_"
           popover="auto"
           role="tooltip"
         >
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index 7939504a5..89e3a1eed 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -109,6 +109,7 @@ export interface NotificationSettingsState {
   showPills: boolean;
   showNumber: boolean;
   participating: boolean;
+  fetchReadNotifications: boolean;
   markAsDoneOnOpen: boolean;
   markAsDoneOnUnsubscribe: boolean;
   delayNotificationState: boolean;
diff --git a/src/renderer/utils/api/client.test.ts b/src/renderer/utils/api/client.test.ts
index 0b16d0467..036cb8b60 100644
--- a/src/renderer/utils/api/client.test.ts
+++ b/src/renderer/utils/api/client.test.ts
@@ -43,6 +43,7 @@ describe('renderer/utils/api/client.ts', () => {
     it('should list only participating notifications for user', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: true,
+        fetchReadNotifications: false,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -51,7 +52,7 @@ describe('renderer/utils/api/client.ts', () => {
       );
 
       expect(axios).toHaveBeenCalledWith({
-        url: 'https://api.github.com/notifications?participating=true',
+        url: 'https://api.github.com/notifications?participating=true&all=false',
         headers: mockNonCachedAuthHeaders,
         method: 'GET',
         data: {},
@@ -61,6 +62,7 @@ describe('renderer/utils/api/client.ts', () => {
     it('should list participating and watching notifications for user', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: false,
+        fetchReadNotifications: false,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -69,7 +71,45 @@ describe('renderer/utils/api/client.ts', () => {
       );
 
       expect(axios).toHaveBeenCalledWith({
-        url: 'https://api.github.com/notifications?participating=false',
+        url: 'https://api.github.com/notifications?participating=false&all=false',
+        headers: mockNonCachedAuthHeaders,
+        method: 'GET',
+        data: {},
+      });
+    });
+
+    it('should include all=true when fetchReadNotifications is enabled', async () => {
+      const mockSettings: Partial<SettingsState> = {
+        participating: false,
+        fetchReadNotifications: true,
+      };
+
+      await listNotificationsForAuthenticatedUser(
+        mockGitHubCloudAccount,
+        mockSettings as SettingsState,
+      );
+
+      expect(axios).toHaveBeenCalledWith({
+        url: 'https://api.github.com/notifications?participating=false&all=true',
+        headers: mockNonCachedAuthHeaders,
+        method: 'GET',
+        data: {},
+      });
+    });
+
+    it('should include all=false when fetchReadNotifications is disabled', async () => {
+      const mockSettings: Partial<SettingsState> = {
+        participating: false,
+        fetchReadNotifications: false,
+      };
+
+      await listNotificationsForAuthenticatedUser(
+        mockGitHubCloudAccount,
+        mockSettings as SettingsState,
+      );
+
+      expect(axios).toHaveBeenCalledWith({
+        url: 'https://api.github.com/notifications?participating=false&all=false',
         headers: mockNonCachedAuthHeaders,
         method: 'GET',
         data: {},
diff --git a/src/renderer/utils/api/client.ts b/src/renderer/utils/api/client.ts
index 7806dc75b..6c33a80c3 100644
--- a/src/renderer/utils/api/client.ts
+++ b/src/renderer/utils/api/client.ts
@@ -66,6 +66,7 @@ export function listNotificationsForAuthenticatedUser(
   const url = getGitHubAPIBaseUrl(account.hostname);
   url.pathname += 'notifications';
   url.searchParams.append('participating', String(settings.participating));
+  url.searchParams.append('all', String(settings.fetchReadNotifications));
 
   return apiRequestAuth(
     url.toString() as Link,
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index 3d53bcef6..a8c7501b6 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -63,7 +63,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
     ];
 
     describe('filterBaseNotifications', () => {
-      it('should filter notifications by subject type when provided', async () => {
+      it('should filter notifications by subject type when provided', () => {
         mockNotifications[0].subject.type = 'Issue';
         mockNotifications[1].subject.type = 'PullRequest';
         const result = filterBaseNotifications(mockNotifications, {
@@ -75,7 +75,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications by reasons when provided', async () => {
+      it('should filter notifications by reasons when provided', () => {
         mockNotifications[0].reason = 'subscribed';
         mockNotifications[1].reason = 'manual';
         const result = filterBaseNotifications(mockNotifications, {
@@ -87,7 +87,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[1]]);
       });
 
-      it('should filter notifications that match include organization', async () => {
+      it('should filter notifications that match include organization', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
           filterIncludeSearchTokens: ['org:gitify-app' as SearchToken],
@@ -97,7 +97,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications that match exclude organization', async () => {
+      it('should filter notifications that match exclude organization', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
           filterExcludeSearchTokens: ['org:github' as SearchToken],
@@ -107,7 +107,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications that match include repository', async () => {
+      it('should filter notifications that match include repository', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
           filterIncludeSearchTokens: ['repo:gitify-app/gitify' as SearchToken],
@@ -117,7 +117,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications that match exclude repository', async () => {
+      it('should filter notifications that match exclude repository', () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
           filterExcludeSearchTokens: ['repo:github/github' as SearchToken],