From 5c01b5df5c4a36097682220b53ad686966dd5077 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Tue, 30 Dec 2025 04:21:55 +0100
Subject: [PATCH 1/9] feat: add 'Show read notifications' setting (#708)

---
 src/renderer/__mocks__/state-mocks.ts         |  1 +
 .../settings/NotificationSettings.test.tsx    | 16 +++++
 .../settings/NotificationSettings.tsx         | 21 +++++++
 src/renderer/context/defaults.ts              |  1 +
 .../__snapshots__/Settings.test.tsx.snap      | 61 +++++++++++++++++--
 src/renderer/types.ts                         |  1 +
 .../notifications/filters/filter.test.ts      | 28 +++++++++
 .../utils/notifications/filters/filter.ts     |  5 ++
 8 files changed, 128 insertions(+), 6 deletions(-)

diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 63ad1f1c0..9d05eff33 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,
+  showReadNotifications: true,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 648bf8c76..3fc3650a3 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -271,6 +271,22 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
     );
   });
 
+  it('should toggle the showReadNotifications checkbox', async () => {
+    await act(async () => {
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: updateSettingMock,
+      });
+    });
+
+    await userEvent.click(screen.getByTestId('checkbox-showReadNotifications'));
+
+    expect(updateSettingMock).toHaveBeenCalledTimes(1);
+    expect(updateSettingMock).toHaveBeenCalledWith(
+      'showReadNotifications',
+      false,
+    );
+  });
+
   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..7e1c170c1 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -328,6 +328,27 @@ export const NotificationSettings: FC = () => {
           }
         />
 
+        <Checkbox
+          checked={settings.showReadNotifications}
+          label="Show read notifications"
+          name="showReadNotifications"
+          onChange={(evt) =>
+            updateSetting('showReadNotifications', evt.target.checked)
+          }
+          tooltip={
+            <Stack direction="vertical" gap="condensed">
+              <Text>
+                When <Text as="u">checked</Text>, {APPLICATION.NAME} will
+                display both read and unread notifications.
+              </Text>
+              <Text>
+                When <Text as="u">unchecked</Text>, {APPLICATION.NAME} will only
+                display unread notifications.
+              </Text>
+            </Stack>
+          }
+        />
+
         <Checkbox
           checked={settings.markAsDoneOnOpen}
           label="Mark as done on open"
diff --git a/src/renderer/context/defaults.ts b/src/renderer/context/defaults.ts
index b37fc260a..5ab2ae413 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,
+  showReadNotifications: true,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index a49af8031..3fba1e5aa 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1098,6 +1098,55 @@ 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
+              checked=""
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-showReadNotifications"
+              id="showReadNotifications"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="showReadNotifications"
+            >
+              Show read notifications
+            </label>
+            <button
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="tooltip-showReadNotifications"
+              data-testid="tooltip-tooltip-showReadNotifications"
+              id="tooltip-showReadNotifications"
+              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 +1992,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 +2020,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 +2037,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 +2069,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 +2108,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..cff635f35 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -109,6 +109,7 @@ export interface NotificationSettingsState {
   showPills: boolean;
   showNumber: boolean;
   participating: boolean;
+  showReadNotifications: boolean;
   markAsDoneOnOpen: boolean;
   markAsDoneOnUnsubscribe: boolean;
   delayNotificationState: boolean;
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index 3d53bcef6..139860547 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -63,6 +63,34 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
     ];
 
     describe('filterBaseNotifications', () => {
+      it('should show all notifications when showReadNotifications is enabled', () => {
+        const notifications = [
+          { ...mockNotifications[0], unread: true },
+          { ...mockNotifications[1], unread: false },
+        ];
+        const result = filterBaseNotifications(notifications, {
+          ...mockSettings,
+          showReadNotifications: true,
+        });
+
+        expect(result.length).toBe(2);
+        expect(result).toEqual(notifications);
+      });
+
+      it('should filter out read notifications when showReadNotifications is disabled', () => {
+        const notifications = [
+          { ...mockNotifications[0], unread: true },
+          { ...mockNotifications[1], unread: false },
+        ];
+        const result = filterBaseNotifications(notifications, {
+          ...mockSettings,
+          showReadNotifications: false,
+        });
+
+        expect(result.length).toBe(1);
+        expect(result[0].unread).toBe(true);
+      });
+
       it('should filter notifications by subject type when provided', async () => {
         mockNotifications[0].subject.type = 'Issue';
         mockNotifications[1].subject.type = 'PullRequest';
diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts
index a48619093..bc8b713b0 100644
--- a/src/renderer/utils/notifications/filters/filter.ts
+++ b/src/renderer/utils/notifications/filters/filter.ts
@@ -24,6 +24,11 @@ export function filterBaseNotifications(
   return notifications.filter((notification) => {
     let passesFilters = true;
 
+    // Filter out read notifications if showReadNotifications is disabled
+    if (!settings.showReadNotifications && !notification.unread) {
+      return false;
+    }
+
     // Apply base qualifier include/exclude filters (org, repo, etc.)
     for (const qualifier of BASE_SEARCH_QUALIFIERS) {
       if (!passesFilters) {

From a94c5246dd0f7e08e34b39bb73a952c551704348 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Tue, 30 Dec 2025 14:34:30 +0100
Subject: [PATCH 2/9] fix: hide mark as read button on read notifications

---
 .../notifications/NotificationRow.test.tsx     | 18 ++++++++++++++++++
 .../notifications/NotificationRow.tsx          |  1 +
 2 files changed, 19 insertions(+)

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..6f61ea8ba 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -148,6 +148,7 @@ export const NotificationRow: FC<NotificationRowProps> = ({
 
           <HoverButton
             action={actionMarkAsRead}
+            enabled={!isNotificationRead}
             icon={ReadIcon}
             label="Mark as read"
             testid="notification-mark-as-read"

From e7c223a4e72632d3636f83f7b175f59d13c6d69c Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Tue, 30 Dec 2025 16:52:49 +0100
Subject: [PATCH 3/9] fix: fetch read notifications from API when setting
 enabled

---
 src/renderer/__mocks__/state-mocks.ts         |  2 +-
 .../NotificationRow.test.tsx.snap             | 58 -------------------
 .../settings/NotificationSettings.test.tsx    |  2 +-
 .../settings/NotificationSettings.tsx         | 10 +++-
 src/renderer/context/defaults.ts              |  2 +-
 src/renderer/utils/api/client.test.ts         | 38 ++++++++++++
 src/renderer/utils/api/client.ts              |  4 ++
 .../notifications/filters/filter.test.ts      |  6 ++
 8 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 9d05eff33..15f057f96 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -43,7 +43,7 @@ const mockNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: true,
+  showReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 8227203cc..59230905d 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -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/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 3fc3650a3..c50c65f9d 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -283,7 +283,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
     expect(updateSettingMock).toHaveBeenCalledTimes(1);
     expect(updateSettingMock).toHaveBeenCalledWith(
       'showReadNotifications',
-      false,
+      true,
     );
   });
 
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 7e1c170c1..a042e08fd 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -338,12 +338,16 @@ export const NotificationSettings: FC = () => {
           tooltip={
             <Stack direction="vertical" gap="condensed">
               <Text>
-                When <Text as="u">checked</Text>, {APPLICATION.NAME} will
-                display both read and unread notifications.
+                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
-                display unread notifications.
+                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>
           }
diff --git a/src/renderer/context/defaults.ts b/src/renderer/context/defaults.ts
index 5ab2ae413..6b615a99d 100644
--- a/src/renderer/context/defaults.ts
+++ b/src/renderer/context/defaults.ts
@@ -36,7 +36,7 @@ const defaultNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: true,
+  showReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/utils/api/client.test.ts b/src/renderer/utils/api/client.test.ts
index 0b16d0467..967a5f43c 100644
--- a/src/renderer/utils/api/client.test.ts
+++ b/src/renderer/utils/api/client.test.ts
@@ -75,6 +75,44 @@ describe('renderer/utils/api/client.ts', () => {
         data: {},
       });
     });
+
+    it('should include all=true when showReadNotifications is enabled', async () => {
+      const mockSettings: Partial<SettingsState> = {
+        participating: false,
+        showReadNotifications: 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 not include all parameter when showReadNotifications is disabled', async () => {
+      const mockSettings: Partial<SettingsState> = {
+        participating: false,
+        showReadNotifications: false,
+      };
+
+      await listNotificationsForAuthenticatedUser(
+        mockGitHubCloudAccount,
+        mockSettings as SettingsState,
+      );
+
+      expect(axios).toHaveBeenCalledWith({
+        url: 'https://api.github.com/notifications?participating=false',
+        headers: mockNonCachedAuthHeaders,
+        method: 'GET',
+        data: {},
+      });
+    });
   });
 
   it('markNotificationThreadAsRead - should mark notification thread as read', async () => {
diff --git a/src/renderer/utils/api/client.ts b/src/renderer/utils/api/client.ts
index 7806dc75b..be43454cc 100644
--- a/src/renderer/utils/api/client.ts
+++ b/src/renderer/utils/api/client.ts
@@ -67,6 +67,10 @@ export function listNotificationsForAuthenticatedUser(
   url.pathname += 'notifications';
   url.searchParams.append('participating', String(settings.participating));
 
+  if (settings.showReadNotifications) {
+    url.searchParams.append('all', 'true');
+  }
+
   return apiRequestAuth(
     url.toString() as Link,
     'GET',
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index 139860547..e9ff59d33 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -96,6 +96,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         mockNotifications[1].subject.type = 'PullRequest';
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterSubjectTypes: ['Issue'],
         });
 
@@ -108,6 +109,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         mockNotifications[1].reason = 'manual';
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterReasons: ['manual'],
         });
 
@@ -118,6 +120,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match include organization', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterIncludeSearchTokens: ['org:gitify-app' as SearchToken],
         });
 
@@ -128,6 +131,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match exclude organization', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterExcludeSearchTokens: ['org:github' as SearchToken],
         });
 
@@ -138,6 +142,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match include repository', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterIncludeSearchTokens: ['repo:gitify-app/gitify' as SearchToken],
         });
 
@@ -148,6 +153,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       it('should filter notifications that match exclude repository', async () => {
         const result = filterBaseNotifications(mockNotifications, {
           ...mockSettings,
+          showReadNotifications: true,
           filterExcludeSearchTokens: ['repo:github/github' as SearchToken],
         });
 

From 4eba5e388ce060fd950c145cef8aa7d81731958a Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Wed, 31 Dec 2025 02:39:58 +0100
Subject: [PATCH 4/9] test: update Settings snapshot for showReadNotifications
 default

---
 src/renderer/routes/__snapshots__/Settings.test.tsx.snap | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 3fba1e5aa..4a486e97b 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1108,7 +1108,6 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             data-wrap="nowrap"
           >
             <input
-              checked=""
               class="size-4 rounded-sm cursor-pointer"
               data-testid="checkbox-showReadNotifications"
               id="showReadNotifications"

From c766a04ea6b8639d32dd65f237c2db2dbc6cb181 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 14:45:17 +0100
Subject: [PATCH 5/9] refactor: address PR feedback for showReadNotifications

---
 src/renderer/components/Sidebar.tsx           |   2 +-
 .../notifications/NotificationRow.tsx         |  16 +--
 .../NotificationRow.test.tsx.snap             | 120 +++++++++---------
 .../settings/NotificationSettings.tsx         |   2 +-
 .../__snapshots__/Settings.test.tsx.snap      |   2 +-
 .../notifications/filters/filter.test.ts      |  46 +------
 .../utils/notifications/filters/filter.ts     |   5 -
 7 files changed, 77 insertions(+), 116 deletions(-)

diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index f4c7ae55c..9a1543862 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -91,7 +91,7 @@ export const Sidebar: FC = () => {
         <IconButton
           aria-label="Notifications"
           data-testid="sidebar-notifications"
-          description={`${unreadNotificationCount} unread notifications ↗`}
+          description={`${unreadNotificationCount} ${settings.showReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
           icon={BellIcon}
           onClick={() => openGitHubNotifications(primaryAccountHostname)}
           size="small"
diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 6f61ea8ba..560fe1bed 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -138,14 +138,6 @@ export const NotificationRow: FC<NotificationRowProps> = ({
 
       {!animateExit && (
         <HoverGroup bgColor="group-hover:bg-gitify-notification-hover">
-          <HoverButton
-            action={actionMarkAsDone}
-            enabled={isMarkAsDoneFeatureSupported(notification.account)}
-            icon={CheckIcon}
-            label="Mark as done"
-            testid="notification-mark-as-done"
-          />
-
           <HoverButton
             action={actionMarkAsRead}
             enabled={!isNotificationRead}
@@ -154,6 +146,14 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             testid="notification-mark-as-read"
           />
 
+          <HoverButton
+            action={actionMarkAsDone}
+            enabled={isMarkAsDoneFeatureSupported(notification.account)}
+            icon={CheckIcon}
+            label="Mark as done"
+            testid="notification-mark-as-done"
+          />
+
           <HoverButton
             action={actionUnsubscribeFromThread}
             icon={BellSlashIcon}
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 59230905d..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>
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index a042e08fd..7f2e52a7d 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -330,7 +330,7 @@ export const NotificationSettings: FC = () => {
 
         <Checkbox
           checked={settings.showReadNotifications}
-          label="Show read notifications"
+          label="Fetch read notifications"
           name="showReadNotifications"
           onChange={(evt) =>
             updateSetting('showReadNotifications', evt.target.checked)
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 4a486e97b..3af260936 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1117,7 +1117,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               class="font-medium text-gitify-font cursor-pointer"
               for="showReadNotifications"
             >
-              Show read notifications
+              Fetch read notifications
             </label>
             <button
               aria-expanded="false"
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index e9ff59d33..a8c7501b6 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -63,40 +63,11 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
     ];
 
     describe('filterBaseNotifications', () => {
-      it('should show all notifications when showReadNotifications is enabled', () => {
-        const notifications = [
-          { ...mockNotifications[0], unread: true },
-          { ...mockNotifications[1], unread: false },
-        ];
-        const result = filterBaseNotifications(notifications, {
-          ...mockSettings,
-          showReadNotifications: true,
-        });
-
-        expect(result.length).toBe(2);
-        expect(result).toEqual(notifications);
-      });
-
-      it('should filter out read notifications when showReadNotifications is disabled', () => {
-        const notifications = [
-          { ...mockNotifications[0], unread: true },
-          { ...mockNotifications[1], unread: false },
-        ];
-        const result = filterBaseNotifications(notifications, {
-          ...mockSettings,
-          showReadNotifications: false,
-        });
-
-        expect(result.length).toBe(1);
-        expect(result[0].unread).toBe(true);
-      });
-
-      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, {
           ...mockSettings,
-          showReadNotifications: true,
           filterSubjectTypes: ['Issue'],
         });
 
@@ -104,12 +75,11 @@ 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, {
           ...mockSettings,
-          showReadNotifications: true,
           filterReasons: ['manual'],
         });
 
@@ -117,10 +87,9 @@ 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,
-          showReadNotifications: true,
           filterIncludeSearchTokens: ['org:gitify-app' as SearchToken],
         });
 
@@ -128,10 +97,9 @@ 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,
-          showReadNotifications: true,
           filterExcludeSearchTokens: ['org:github' as SearchToken],
         });
 
@@ -139,10 +107,9 @@ 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,
-          showReadNotifications: true,
           filterIncludeSearchTokens: ['repo:gitify-app/gitify' as SearchToken],
         });
 
@@ -150,10 +117,9 @@ 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,
-          showReadNotifications: true,
           filterExcludeSearchTokens: ['repo:github/github' as SearchToken],
         });
 
diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts
index bc8b713b0..a48619093 100644
--- a/src/renderer/utils/notifications/filters/filter.ts
+++ b/src/renderer/utils/notifications/filters/filter.ts
@@ -24,11 +24,6 @@ export function filterBaseNotifications(
   return notifications.filter((notification) => {
     let passesFilters = true;
 
-    // Filter out read notifications if showReadNotifications is disabled
-    if (!settings.showReadNotifications && !notification.unread) {
-      return false;
-    }
-
     // Apply base qualifier include/exclude filters (org, repo, etc.)
     for (const qualifier of BASE_SEARCH_QUALIFIERS) {
       if (!passesFilters) {

From fed50479a06313327eb3499395894ed0a78db326 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 14:51:12 +0100
Subject: [PATCH 6/9] refactor: move mark as done button to far right

---
 .../notifications/NotificationRow.tsx         |  14 +-
 .../AccountNotifications.test.tsx.snap        | 120 ++++++-------
 .../NotificationRow.test.tsx.snap             | 160 +++++++++---------
 3 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 560fe1bed..2bb2ef615 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -146,6 +146,13 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             testid="notification-mark-as-read"
           />
 
+          <HoverButton
+            action={actionUnsubscribeFromThread}
+            icon={BellSlashIcon}
+            label="Unsubscribe from thread"
+            testid="notification-unsubscribe-from-thread"
+          />
+
           <HoverButton
             action={actionMarkAsDone}
             enabled={isMarkAsDoneFeatureSupported(notification.account)}
@@ -153,13 +160,6 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             label="Mark as done"
             testid="notification-mark-as-done"
           />
-
-          <HoverButton
-            action={actionUnsubscribeFromThread}
-            icon={BellSlashIcon}
-            label="Unsubscribe from thread"
-            testid="notification-unsubscribe-from-thread"
-          />
         </HoverGroup>
       )}
     </div>
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 920504776..2e932725f 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="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1641,25 +1641,25 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1670,7 +1670,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as read"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1931,25 +1931,25 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1960,7 +1960,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as read"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2521,25 +2521,25 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2550,7 +2550,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as read"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2811,25 +2811,25 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2840,7 +2840,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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 cf0f804e6..f73d7918d 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -351,20 +351,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -375,25 +375,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -404,7 +404,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
@@ -761,20 +761,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -785,25 +785,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -814,7 +814,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
@@ -1176,20 +1176,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1200,25 +1200,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1229,7 +1229,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
@@ -1534,20 +1534,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1558,25 +1558,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1587,7 +1587,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
@@ -1949,20 +1949,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1973,25 +1973,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2002,7 +2002,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
@@ -2307,20 +2307,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2331,25 +2331,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2360,7 +2360,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
@@ -2693,20 +2693,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2717,25 +2717,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2746,7 +2746,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
@@ -3022,20 +3022,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3046,25 +3046,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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3075,7 +3075,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>

From 3b5bfc63f48d4b6d160036789b83deb906cfdf93 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 19:57:58 +0100
Subject: [PATCH 7/9] refactor: address PR review feedback from setchy

---
 src/renderer/__mocks__/state-mocks.ts         |   2 +-
 src/renderer/components/Sidebar.tsx           |   4 +-
 .../RepositoryNotifications.test.tsx          |   7 +
 .../notifications/RepositoryNotifications.tsx |  21 +-
 .../RepositoryNotifications.test.tsx.snap     | 318 +++++++-----------
 .../settings/NotificationSettings.test.tsx    |   6 +-
 .../settings/NotificationSettings.tsx         |   6 +-
 src/renderer/context/App.tsx                  |   2 +-
 src/renderer/context/defaults.ts              |   2 +-
 src/renderer/hooks/useNotifications.test.ts   |  14 +-
 .../__snapshots__/Settings.test.tsx.snap      |  12 +-
 src/renderer/types.ts                         |   2 +-
 src/renderer/utils/api/client.test.ts         |  16 +-
 src/renderer/utils/api/client.ts              |   5 +-
 14 files changed, 183 insertions(+), 234 deletions(-)

diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 15f057f96..529aa94c5 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -43,7 +43,7 @@ const mockNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: false,
+  fetchReadNotifications: false,
   markAsDoneOnOpen: false,
   markAsDoneOnUnsubscribe: false,
   delayNotificationState: false,
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 9a1543862..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} ${settings.showReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
+          description={`${notificationCount} ${settings.fetchReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
           icon={BellIcon}
           onClick={() => openGitHubNotifications(primaryAccountHostname)}
           size="small"
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..f1266f453 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -91,18 +91,9 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
 
         {!animateExit && (
           <HoverGroup bgColor="group-hover:bg-gitify-repository">
-            <HoverButton
-              action={actionMarkAsDone}
-              enabled={isMarkAsDoneFeatureSupported(
-                repoNotifications[0].account,
-              )}
-              icon={CheckIcon}
-              label="Mark repository as done"
-              testid="repository-mark-as-done"
-            />
-
             <HoverButton
               action={actionMarkAsRead}
+              enabled={!areAllRepoNotificationsRead}
               icon={ReadIcon}
               label="Mark repository as read"
               testid="repository-mark-as-read"
@@ -114,6 +105,16 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
               label={Chevron.label}
               testid="repository-toggle"
             />
+
+            <HoverButton
+              action={actionMarkAsDone}
+              enabled={isMarkAsDoneFeatureSupported(
+                repoNotifications[0].account,
+              )}
+              icon={CheckIcon}
+              label="Mark repository as done"
+              testid="repository-mark-as-done"
+            />
           </HoverGroup>
         )}
       </Stack>
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index ccebe1f4b..d5ba93f08 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -103,49 +103,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                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-done"
-                data-variant="invisible"
-                title="Mark repository as done"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check"
-                  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="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>
-              <button
-                aria-label="Mark repository as read"
+                aria-label="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -156,25 +127,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -185,7 +156,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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>
@@ -300,49 +271,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              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-done"
-              data-variant="invisible"
-              title="Mark repository as done"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check"
-                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="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>
-            <button
-              aria-label="Mark repository as read"
+              aria-label="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -353,25 +295,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -382,7 +324,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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>
@@ -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="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -607,25 +549,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -636,7 +578,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -804,25 +746,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -833,7 +775,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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="Show repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Show repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-right"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1065,25 +1007,25 @@ 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="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Show repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Show repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-right"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1094,7 +1036,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
+                    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="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1262,25 +1204,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1291,7 +1233,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1466,25 +1408,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1495,7 +1437,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as read"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-read"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1727,25 +1669,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1756,7 +1698,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as read"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-read"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1931,25 +1873,25 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1960,7 +1902,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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 c50c65f9d..12742e136 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -271,18 +271,18 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
     );
   });
 
-  it('should toggle the showReadNotifications checkbox', async () => {
+  it('should toggle the fetchReadNotifications checkbox', async () => {
     await act(async () => {
       renderWithAppContext(<NotificationSettings />, {
         updateSetting: updateSettingMock,
       });
     });
 
-    await userEvent.click(screen.getByTestId('checkbox-showReadNotifications'));
+    await userEvent.click(screen.getByTestId('checkbox-fetchReadNotifications'));
 
     expect(updateSettingMock).toHaveBeenCalledTimes(1);
     expect(updateSettingMock).toHaveBeenCalledWith(
-      'showReadNotifications',
+      'fetchReadNotifications',
       true,
     );
   });
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 7f2e52a7d..102e53843 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -329,11 +329,11 @@ export const NotificationSettings: FC = () => {
         />
 
         <Checkbox
-          checked={settings.showReadNotifications}
+          checked={settings.fetchReadNotifications}
           label="Fetch read notifications"
-          name="showReadNotifications"
+          name="fetchReadNotifications"
           onChange={(evt) =>
-            updateSetting('showReadNotifications', evt.target.checked)
+            updateSetting('fetchReadNotifications', evt.target.checked)
           }
           tooltip={
             <Stack direction="vertical" gap="condensed">
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 6b615a99d..e26199f98 100644
--- a/src/renderer/context/defaults.ts
+++ b/src/renderer/context/defaults.ts
@@ -36,7 +36,7 @@ const defaultNotificationSettings: NotificationSettingsState = {
   showPills: true,
   showNumber: true,
   participating: false,
-  showReadNotifications: 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 3af260936..f0f90e965 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1109,22 +1109,22 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           >
             <input
               class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-showReadNotifications"
-              id="showReadNotifications"
+              data-testid="checkbox-fetchReadNotifications"
+              id="fetchReadNotifications"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="showReadNotifications"
+              for="fetchReadNotifications"
             >
               Fetch read notifications
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-showReadNotifications"
-              data-testid="tooltip-tooltip-showReadNotifications"
-              id="tooltip-showReadNotifications"
+              aria-label="tooltip-fetchReadNotifications"
+              data-testid="tooltip-tooltip-fetchReadNotifications"
+              id="tooltip-fetchReadNotifications"
               tabindex="0"
               type="button"
             >
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index cff635f35..89e3a1eed 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -109,7 +109,7 @@ export interface NotificationSettingsState {
   showPills: boolean;
   showNumber: boolean;
   participating: boolean;
-  showReadNotifications: 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 967a5f43c..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,17 +71,17 @@ 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 showReadNotifications is enabled', async () => {
+    it('should include all=true when fetchReadNotifications is enabled', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: false,
-        showReadNotifications: true,
+        fetchReadNotifications: true,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -95,10 +97,10 @@ describe('renderer/utils/api/client.ts', () => {
       });
     });
 
-    it('should not include all parameter when showReadNotifications is disabled', async () => {
+    it('should include all=false when fetchReadNotifications is disabled', async () => {
       const mockSettings: Partial<SettingsState> = {
         participating: false,
-        showReadNotifications: false,
+        fetchReadNotifications: false,
       };
 
       await listNotificationsForAuthenticatedUser(
@@ -107,7 +109,7 @@ 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: {},
diff --git a/src/renderer/utils/api/client.ts b/src/renderer/utils/api/client.ts
index be43454cc..6c33a80c3 100644
--- a/src/renderer/utils/api/client.ts
+++ b/src/renderer/utils/api/client.ts
@@ -66,10 +66,7 @@ export function listNotificationsForAuthenticatedUser(
   const url = getGitHubAPIBaseUrl(account.hostname);
   url.pathname += 'notifications';
   url.searchParams.append('participating', String(settings.participating));
-
-  if (settings.showReadNotifications) {
-    url.searchParams.append('all', 'true');
-  }
+  url.searchParams.append('all', String(settings.fetchReadNotifications));
 
   return apiRequestAuth(
     url.toString() as Link,

From a6e3664ae4093cdf9b0a446e7cb8439d58dbf39c Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 1 Jan 2026 20:03:35 +0100
Subject: [PATCH 8/9] style: fix formatting in NotificationSettings test

---
 .../components/settings/NotificationSettings.test.tsx         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 12742e136..630988cb1 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -278,7 +278,9 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
       });
     });
 
-    await userEvent.click(screen.getByTestId('checkbox-fetchReadNotifications'));
+    await userEvent.click(
+      screen.getByTestId('checkbox-fetchReadNotifications'),
+    );
 
     expect(updateSettingMock).toHaveBeenCalledTimes(1);
     expect(updateSettingMock).toHaveBeenCalledWith(

From df0a8bb815bf2d37d2112efd2d463c0eff3c4e20 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 1 Jan 2026 10:24:27 -1000
Subject: [PATCH 9/9] refactor: reorder hover group buttons to keep chevron as
 right-most item

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../notifications/NotificationRow.tsx         |  14 +-
 .../notifications/RepositoryNotifications.tsx |  14 +-
 .../AccountNotifications.test.tsx.snap        |  80 ++++----
 .../NotificationRow.test.tsx.snap             | 160 ++++++++--------
 .../RepositoryNotifications.test.tsx.snap     | 180 +++++++++---------
 5 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 2bb2ef615..560fe1bed 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -146,13 +146,6 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             testid="notification-mark-as-read"
           />
 
-          <HoverButton
-            action={actionUnsubscribeFromThread}
-            icon={BellSlashIcon}
-            label="Unsubscribe from thread"
-            testid="notification-unsubscribe-from-thread"
-          />
-
           <HoverButton
             action={actionMarkAsDone}
             enabled={isMarkAsDoneFeatureSupported(notification.account)}
@@ -160,6 +153,13 @@ export const NotificationRow: FC<NotificationRowProps> = ({
             label="Mark as done"
             testid="notification-mark-as-done"
           />
+
+          <HoverButton
+            action={actionUnsubscribeFromThread}
+            icon={BellSlashIcon}
+            label="Unsubscribe from thread"
+            testid="notification-unsubscribe-from-thread"
+          />
         </HoverGroup>
       )}
     </div>
diff --git a/src/renderer/components/notifications/RepositoryNotifications.tsx b/src/renderer/components/notifications/RepositoryNotifications.tsx
index f1266f453..a0e2a363f 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -99,13 +99,6 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
               testid="repository-mark-as-read"
             />
 
-            <HoverButton
-              action={actionToggleRepositoryNotifications}
-              icon={Chevron.icon}
-              label={Chevron.label}
-              testid="repository-toggle"
-            />
-
             <HoverButton
               action={actionMarkAsDone}
               enabled={isMarkAsDoneFeatureSupported(
@@ -115,6 +108,13 @@ export const RepositoryNotifications: FC<RepositoryNotificationsProps> = ({
               label="Mark repository as done"
               testid="repository-mark-as-done"
             />
+
+            <HoverButton
+              action={actionToggleRepositoryNotifications}
+              icon={Chevron.icon}
+              label={Chevron.label}
+              testid="repository-toggle"
+            />
           </HoverGroup>
         )}
       </Stack>
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 2e932725f..e49f20bc6 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -1617,20 +1617,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1641,25 +1641,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1670,7 +1670,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -1907,20 +1907,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1931,25 +1931,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1960,7 +1960,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -2497,20 +2497,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2521,25 +2521,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2550,7 +2550,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -2787,20 +2787,20 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2811,25 +2811,25 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2840,7 +2840,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </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 f73d7918d..cf0f804e6 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -351,20 +351,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -375,25 +375,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -404,7 +404,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -761,20 +761,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -785,25 +785,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -814,7 +814,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -1176,20 +1176,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1200,25 +1200,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1229,7 +1229,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -1534,20 +1534,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1558,25 +1558,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1587,7 +1587,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -1949,20 +1949,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 </svg>
               </button>
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1973,25 +1973,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2002,7 +2002,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -2307,20 +2307,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               </svg>
             </button>
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2331,25 +2331,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2360,7 +2360,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
@@ -2693,20 +2693,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               data-wrap="nowrap"
             >
               <button
-                aria-label="Unsubscribe from thread"
+                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-unsubscribe-from-thread"
+                data-testid="notification-mark-as-done"
                 data-variant="invisible"
-                title="Unsubscribe from thread"
+                title="Mark as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell-slash"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2717,25 +2717,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                   width="16"
                 >
                   <path
-                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                    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>
               <button
-                aria-label="Mark as done"
+                aria-label="Unsubscribe from thread"
                 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-unsubscribe-from-thread"
                 data-variant="invisible"
-                title="Mark as done"
+                title="Unsubscribe from thread"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-bell-slash"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -2746,7 +2746,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                   />
                 </svg>
               </button>
@@ -3022,20 +3022,20 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-wrap="nowrap"
           >
             <button
-              aria-label="Unsubscribe from thread"
+              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-unsubscribe-from-thread"
+              data-testid="notification-mark-as-done"
               data-variant="invisible"
-              title="Unsubscribe from thread"
+              title="Mark as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell-slash"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3046,25 +3046,25 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 width="16"
               >
                 <path
-                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  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>
             <button
-              aria-label="Mark as done"
+              aria-label="Unsubscribe from thread"
               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-unsubscribe-from-thread"
               data-variant="invisible"
-              title="Mark as done"
+              title="Unsubscribe from thread"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-bell-slash"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -3075,7 +3075,7 @@ 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="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
                 />
               </svg>
             </button>
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index d5ba93f08..e70eee124 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -103,20 +103,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               data-wrap="nowrap"
             >
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -127,25 +127,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -156,7 +156,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -271,20 +271,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
             data-wrap="nowrap"
           >
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -295,25 +295,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -324,7 +324,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -525,20 +525,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -549,25 +549,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -578,7 +578,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -722,20 +722,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -746,25 +746,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -775,7 +775,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -983,20 +983,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-label="Show repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Show repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-right"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1007,25 +1007,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
+                    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>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Show repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Show repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-right"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1036,7 +1036,7 @@ 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="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
                   />
                 </svg>
               </button>
@@ -1180,20 +1180,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1204,25 +1204,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1233,7 +1233,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1384,20 +1384,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1408,25 +1408,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1437,7 +1437,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>
@@ -1645,20 +1645,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 </svg>
               </button>
               <button
-                aria-label="Hide repository notifications"
+                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-toggle"
+                data-testid="repository-mark-as-done"
                 data-variant="invisible"
-                title="Hide repository notifications"
+                title="Mark repository as done"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-chevron-down"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1669,25 +1669,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   width="16"
                 >
                   <path
-                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                    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>
               <button
-                aria-label="Mark repository as done"
+                aria-label="Hide repository notifications"
                 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-toggle"
                 data-variant="invisible"
-                title="Mark repository as done"
+                title="Hide repository notifications"
                 type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check"
+                  class="octicon octicon-chevron-down"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1698,7 +1698,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                   />
                 </svg>
               </button>
@@ -1849,20 +1849,20 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
               </svg>
             </button>
             <button
-              aria-label="Hide repository notifications"
+              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-toggle"
+              data-testid="repository-mark-as-done"
               data-variant="invisible"
-              title="Hide repository notifications"
+              title="Mark repository as done"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-chevron-down"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1873,25 +1873,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 width="16"
               >
                 <path
-                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  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>
             <button
-              aria-label="Mark repository as done"
+              aria-label="Hide repository notifications"
               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-toggle"
               data-variant="invisible"
-              title="Mark repository as done"
+              title="Hide repository notifications"
               type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check"
+                class="octicon octicon-chevron-down"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1902,7 +1902,7 @@ 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="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
                 />
               </svg>
             </button>