diff --git a/src/__mocks__/mock-state.ts b/src/__mocks__/mock-state.ts
index 01cb113a3..657f846fb 100644
--- a/src/__mocks__/mock-state.ts
+++ b/src/__mocks__/mock-state.ts
@@ -18,4 +18,5 @@ export const mockSettings: SettingsState = {
   detailedNotifications: false,
   markAsDoneOnOpen: false,
   showAccountHostname: false,
+  showAllNotifications: false,
 };
diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
index 517b5d7f9..42ea6b755 100644
--- a/src/components/NotificationRow.tsx
+++ b/src/components/NotificationRow.tsx
@@ -16,6 +16,7 @@ import {
 import { AppContext } from '../context/App';
 import type { Notification } from '../typesGithub';
 import { openExternalLink } from '../utils/comms';
+import Constants from '../utils/constants';
 import { formatForDisplay, openInBrowser } from '../utils/helpers';
 import {
   getNotificationTypeIcon,
@@ -32,9 +33,9 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   const {
     settings,
     accounts,
-    removeNotificationFromState,
     markNotificationRead,
     markNotificationDone,
+    removeNotificationFromState,
     unsubscribeNotification,
     notifications,
   } = useContext(AppContext);
@@ -44,10 +45,8 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
 
     if (settings.markAsDoneOnOpen) {
       markNotificationDone(notification.id, hostname);
-    } else {
-      // no need to mark as read, github does it by default when opening it
-      removeNotificationFromState(notification.id, hostname);
     }
+    handleNotificationState();
   }, [notifications, notification, accounts, settings]); // notifications required here to prevent weird state issues
 
   const unsubscribe = (event: MouseEvent<HTMLElement>) => {
@@ -55,6 +54,18 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
     event.stopPropagation();
 
     unsubscribeNotification(notification.id, hostname);
+    markNotificationRead(notification.id, hostname);
+    handleNotificationState();
+  };
+
+  const markAsRead = () => {
+    markNotificationRead(notification.id, hostname);
+    handleNotificationState();
+  };
+
+  const markAsDone = () => {
+    markNotificationDone(notification.id, hostname);
+    handleNotificationState();
   };
 
   const openUserProfile = (
@@ -66,6 +77,20 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
     openExternalLink(notification.subject.user.html_url);
   };
 
+  const handleNotificationState = useCallback(() => {
+    if (!settings.showAllNotifications) {
+      removeNotificationFromState(notification.id, hostname);
+    }
+
+    if (notification.unread) {
+      const notificationRow = document.getElementById(notification.id);
+      notificationRow.className += Constants.READ_CLASS_NAME;
+    }
+
+    // TODO FIXME - this is not updating the notification count
+    notification.unread = false;
+  }, [notification, notifications]);
+
   const reason = formatReason(notification.reason);
   const NotificationIcon = getNotificationTypeIcon(notification.subject);
   const iconColor = getNotificationTypeIconColor(notification.subject);
@@ -82,18 +107,21 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
   ]);
 
   return (
-    <div className="flex space-x-3 py-2 px-3 bg-white dark:bg-gray-dark dark:text-white hover:bg-gray-100 dark:hover:bg-gray-darker border-b border-gray-100 dark:border-gray-darker group">
+    <div
+      id={notification.id}
+      className={`flex space-x-3 py-2 px-3 bg-white border-b border-gray-100 dark:border-gray-darker group dark:bg-gray-dark dark:text-white hover:bg-gray-100 dark:hover:bg-gray-darker
+          ${!notification.unread ? Constants.READ_CLASS_NAME : ''}`}
+    >
       <div
-        className={`flex justify-center items-center w-5 ${iconColor}`}
+        className={`flex flex-col justify-center items-center w-5 ${iconColor}`}
         title={notificationTitle}
       >
         <NotificationIcon size={18} aria-label={notification.subject.type} />
       </div>
-
       <div
         className="flex-1 overflow-hidden"
-        onClick={() => openNotification()}
-        onKeyDown={() => openNotification()}
+        onClick={openNotification}
+        onKeyDown={openNotification}
       >
         <div
           className="mb-1 text-sm whitespace-nowrap overflow-ellipsis overflow-hidden cursor-pointer"
@@ -141,7 +169,7 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
           type="button"
           className="focus:outline-none h-full hover:text-green-500"
           title="Mark as Done"
-          onClick={() => markNotificationDone(notification.id, hostname)}
+          onClick={markAsDone}
         >
           <CheckIcon size={16} aria-label="Mark as Done" />
         </button>
@@ -155,14 +183,18 @@ export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
           <BellSlashIcon size={14} aria-label="Unsubscribe" />
         </button>
 
-        <button
-          type="button"
-          className="focus:outline-none h-full hover:text-green-500"
-          title="Mark as Read"
-          onClick={() => markNotificationRead(notification.id, hostname)}
-        >
-          <ReadIcon size={14} aria-label="Mark as Read" />
-        </button>
+        {notification.unread ? (
+          <button
+            type="button"
+            className="focus:outline-none h-full hover:text-green-500"
+            title="Mark as Read"
+            onClick={markAsRead}
+          >
+            <ReadIcon size={14} aria-label="Mark as Read" />
+          </button>
+        ) : (
+          <div className="w-[14px]" />
+        )}
       </div>
     </div>
   );
diff --git a/src/components/Repository.test.tsx b/src/components/Repository.test.tsx
index a2e5d877f..75973f5ab 100644
--- a/src/components/Repository.test.tsx
+++ b/src/components/Repository.test.tsx
@@ -10,7 +10,7 @@ jest.mock('./NotificationRow', () => ({
 }));
 
 describe('components/Repository.tsx', () => {
-  const markRepoNotifications = jest.fn();
+  const markRepoNotificationsRead = jest.fn();
   const markRepoNotificationsDone = jest.fn();
 
   const props = {
@@ -20,7 +20,7 @@ describe('components/Repository.tsx', () => {
   };
 
   beforeEach(() => {
-    markRepoNotifications.mockReset();
+    markRepoNotificationsRead.mockReset();
 
     jest.spyOn(shell, 'openExternal');
   });
@@ -51,14 +51,14 @@ describe('components/Repository.tsx', () => {
 
   it('should mark a repo as read', () => {
     render(
-      <AppContext.Provider value={{ markRepoNotifications }}>
+      <AppContext.Provider value={{ markRepoNotificationsRead }}>
         <RepositoryNotifications {...props} />
       </AppContext.Provider>,
     );
 
     fireEvent.click(screen.getByTitle('Mark Repository as Read'));
 
-    expect(markRepoNotifications).toHaveBeenCalledWith(
+    expect(markRepoNotificationsRead).toHaveBeenCalledWith(
       'manosim/notifications-test',
       'github.com',
     );
diff --git a/src/components/Repository.tsx b/src/components/Repository.tsx
index 28bef678f..d0d72b21b 100644
--- a/src/components/Repository.tsx
+++ b/src/components/Repository.tsx
@@ -6,6 +6,7 @@ import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import { AppContext } from '../context/App';
 import type { Notification } from '../typesGithub';
 import { openExternalLink } from '../utils/comms';
+import Constants from '../utils/constants';
 import { NotificationRow } from './NotificationRow';
 
 interface IProps {
@@ -19,8 +20,13 @@ export const RepositoryNotifications: FC<IProps> = ({
   repoNotifications,
   hostname,
 }) => {
-  const { markRepoNotifications, markRepoNotificationsDone } =
-    useContext(AppContext);
+  const {
+    markRepoNotificationsRead,
+    markRepoNotificationsDone,
+    settings,
+    notifications,
+    removeNotificationsFromState,
+  } = useContext(AppContext);
 
   const openBrowser = useCallback(() => {
     const url = repoNotifications[0].repository.html_url;
@@ -29,14 +35,35 @@ export const RepositoryNotifications: FC<IProps> = ({
 
   const markRepoAsRead = useCallback(() => {
     const repoSlug = repoNotifications[0].repository.full_name;
-    markRepoNotifications(repoSlug, hostname);
+    markRepoNotificationsRead(repoSlug, hostname);
+    handleNotificationState(repoSlug);
   }, [repoNotifications, hostname]);
 
   const markRepoAsDone = useCallback(() => {
     const repoSlug = repoNotifications[0].repository.full_name;
     markRepoNotificationsDone(repoSlug, hostname);
+    handleNotificationState(repoSlug);
   }, [repoNotifications, hostname]);
 
+  const handleNotificationState = useCallback(
+    (repoSlug: string) => {
+      if (!settings.showAllNotifications) {
+        removeNotificationsFromState(repoSlug, notifications, hostname);
+      }
+
+      for (const notification of repoNotifications) {
+        if (notification.unread) {
+          const notificationRow = document.getElementById(notification.id);
+          notificationRow.className += Constants.READ_CLASS_NAME;
+        }
+
+        // TODO FIXME - this is not updating the notification count
+        notification.unread = false;
+      }
+    },
+    [repoNotifications, hostname, notifications],
+  );
+
   const avatarUrl = repoNotifications[0].repository.owner.avatar_url;
   const repoSlug = repoNotifications[0].repository.full_name;
 
@@ -74,14 +101,18 @@ export const RepositoryNotifications: FC<IProps> = ({
 
           <div className="w-[14px]" />
 
-          <button
-            type="button"
-            className="focus:outline-none h-full hover:text-green-500"
-            title="Mark Repository as Read"
-            onClick={markRepoAsRead}
-          >
-            <ReadIcon size={14} aria-label="Mark Repository as Read" />
-          </button>
+          {repoNotifications.some((notification) => notification.unread) ? (
+            <button
+              type="button"
+              className="focus:outline-none h-full hover:text-green-500"
+              title="Mark Repository as Read"
+              onClick={markRepoAsRead}
+            >
+              <ReadIcon size={14} aria-label="Mark Repository as Read" />
+            </button>
+          ) : (
+            <div className="w-[14px]" />
+          )}
         </div>
       </div>
 
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 216e5b2a4..91edfce2f 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -13,7 +13,7 @@ import { Logo } from '../components/Logo';
 import { AppContext } from '../context/App';
 import { openExternalLink } from '../utils/comms';
 import { Constants } from '../utils/constants';
-import { getNotificationCount } from '../utils/notifications';
+import { getUnreadNotificationCount } from '../utils/notifications';
 
 export const Sidebar: FC = () => {
   const navigate = useNavigate();
@@ -35,7 +35,7 @@ export const Sidebar: FC = () => {
   }, []);
 
   const notificationsCount = useMemo(() => {
-    return getNotificationCount(notifications);
+    return getUnreadNotificationCount(notifications);
   }, [notifications]);
 
   const sidebarButtonClasses =
diff --git a/src/context/App.test.tsx b/src/context/App.test.tsx
index 3280d5773..65fc8dad4 100644
--- a/src/context/App.test.tsx
+++ b/src/context/App.test.tsx
@@ -37,11 +37,11 @@ describe('context/App.tsx', () => {
 
   describe('api methods', () => {
     const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
-    const getNotificationCountMock = jest.spyOn(
+    const getUnreadNotificationCountMock = jest.spyOn(
       notifications,
-      'getNotificationCount',
+      'getUnreadNotificationCount',
     );
-    getNotificationCountMock.mockReturnValue(1);
+    getUnreadNotificationCountMock.mockReturnValue(1);
 
     const fetchNotificationsMock = jest.fn();
     const markNotificationReadMock = jest.fn();
@@ -193,15 +193,15 @@ describe('context/App.tsx', () => {
       );
     });
 
-    it('should call markRepoNotifications', async () => {
+    it('should call markRepoNotificationsRead', async () => {
       const TestComponent = () => {
-        const { markRepoNotifications } = useContext(AppContext);
+        const { markRepoNotificationsRead } = useContext(AppContext);
 
         return (
           <button
             type="button"
             onClick={() =>
-              markRepoNotifications('manosim/gitify', 'github.com')
+              markRepoNotificationsRead('manosim/gitify', 'github.com')
             }
           >
             Test Case
diff --git a/src/context/App.tsx b/src/context/App.tsx
index 3907fb975..92bc609d4 100644
--- a/src/context/App.tsx
+++ b/src/context/App.tsx
@@ -23,7 +23,7 @@ import { addAccount, authGitHub, getToken, getUserData } from '../utils/auth';
 import { setAutoLaunch, updateTrayTitle } from '../utils/comms';
 import Constants from '../utils/constants';
 import { generateGitHubAPIUrl } from '../utils/helpers';
-import { getNotificationCount } from '../utils/notifications';
+import { getUnreadNotificationCount } from '../utils/notifications';
 import { clearState, loadState, saveState } from '../utils/storage';
 import { setTheme } from '../utils/theme';
 
@@ -44,6 +44,7 @@ export const defaultSettings: SettingsState = {
   detailedNotifications: false,
   markAsDoneOnOpen: false,
   showAccountHostname: false,
+  showAllNotifications: false,
 };
 
 interface AppContextState {
@@ -59,11 +60,16 @@ interface AppContextState {
   requestFailed: boolean;
   errorDetails: GitifyError;
   removeNotificationFromState: (id: string, hostname: string) => void;
+  removeNotificationsFromState: (
+    repoSlug: string,
+    notifications: AccountNotifications[],
+    hostname: string,
+  ) => void;
   fetchNotifications: () => Promise<void>;
   markNotificationRead: (id: string, hostname: string) => Promise<void>;
   markNotificationDone: (id: string, hostname: string) => Promise<void>;
   unsubscribeNotification: (id: string, hostname: string) => Promise<void>;
-  markRepoNotifications: (id: string, hostname: string) => Promise<void>;
+  markRepoNotificationsRead: (id: string, hostname: string) => Promise<void>;
   markRepoNotificationsDone: (id: string, hostname: string) => Promise<void>;
 
   settings: SettingsState;
@@ -85,10 +91,11 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     errorDetails,
     isFetching,
     removeNotificationFromState,
+    removeNotificationsFromState,
     markNotificationRead,
     markNotificationDone,
     unsubscribeNotification,
-    markRepoNotifications,
+    markRepoNotificationsRead,
     markRepoNotificationsDone,
   } = useNotifications();
 
@@ -107,6 +114,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     settings.participating,
     settings.showBots,
     settings.detailedNotifications,
+    settings.showAllNotifications,
     accounts.token,
     accounts.enterpriseAccounts.length,
   ]);
@@ -117,7 +125,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: We need to update tray title when settings or notifications changes.
   useEffect(() => {
-    const count = getNotificationCount(notifications);
+    const count = getUnreadNotificationCount(notifications);
 
     if (settings.showNotificationsCountInTray && count > 0) {
       updateTrayTitle(count.toString());
@@ -222,7 +230,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const markRepoNotificationsWithAccounts = useCallback(
     async (repoSlug: string, hostname: string) =>
-      await markRepoNotifications(accounts, repoSlug, hostname),
+      await markRepoNotificationsRead(accounts, repoSlug, hostname),
     [accounts, notifications],
   );
 
@@ -247,11 +255,12 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
         requestFailed,
         errorDetails,
         removeNotificationFromState,
+        removeNotificationsFromState,
         fetchNotifications: fetchNotificationsWithAccounts,
         markNotificationRead: markNotificationReadWithAccounts,
         markNotificationDone: markNotificationDoneWithAccounts,
         unsubscribeNotification: unsubscribeNotificationWithAccounts,
-        markRepoNotifications: markRepoNotificationsWithAccounts,
+        markRepoNotificationsRead: markRepoNotificationsWithAccounts,
         markRepoNotificationsDone: markRepoNotificationsDoneWithAccounts,
 
         settings,
diff --git a/src/hooks/useNotifications.test.ts b/src/hooks/useNotifications.test.ts
index 6eb889fc6..8cefac895 100644
--- a/src/hooks/useNotifications.test.ts
+++ b/src/hooks/useNotifications.test.ts
@@ -796,7 +796,11 @@ describe('hooks/useNotifications.ts', () => {
         const { result } = renderHook(() => useNotifications());
 
         act(() => {
-          result.current.markRepoNotifications(accounts, repoSlug, hostname);
+          result.current.markRepoNotificationsRead(
+            accounts,
+            repoSlug,
+            hostname,
+          );
         });
 
         await waitFor(() => {
@@ -814,7 +818,11 @@ describe('hooks/useNotifications.ts', () => {
         const { result } = renderHook(() => useNotifications());
 
         act(() => {
-          result.current.markRepoNotifications(accounts, repoSlug, hostname);
+          result.current.markRepoNotificationsRead(
+            accounts,
+            repoSlug,
+            hostname,
+          );
         });
 
         await waitFor(() => {
@@ -837,7 +845,11 @@ describe('hooks/useNotifications.ts', () => {
         const { result } = renderHook(() => useNotifications());
 
         act(() => {
-          result.current.markRepoNotifications(accounts, repoSlug, hostname);
+          result.current.markRepoNotificationsRead(
+            accounts,
+            repoSlug,
+            hostname,
+          );
         });
 
         await waitFor(() => {
@@ -855,7 +867,11 @@ describe('hooks/useNotifications.ts', () => {
         const { result } = renderHook(() => useNotifications());
 
         act(() => {
-          result.current.markRepoNotifications(accounts, repoSlug, hostname);
+          result.current.markRepoNotificationsRead(
+            accounts,
+            repoSlug,
+            hostname,
+          );
         });
 
         await waitFor(() => {
diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 112b6db13..8302a5989 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -29,6 +29,11 @@ import { getGitifySubjectDetails } from '../utils/subject';
 interface NotificationsState {
   notifications: AccountNotifications[];
   removeNotificationFromState: (id: string, hostname: string) => void;
+  removeNotificationsFromState: (
+    repoSlug: string,
+    notifications: AccountNotifications[],
+    hostname: string,
+  ) => void;
   fetchNotifications: (
     accounts: AuthState,
     settings: SettingsState,
@@ -48,7 +53,7 @@ interface NotificationsState {
     id: string,
     hostname: string,
   ) => Promise<void>;
-  markRepoNotifications: (
+  markRepoNotificationsRead: (
     accounts: AuthState,
     repoSlug: string,
     hostname: string,
@@ -75,7 +80,7 @@ export const useNotifications = (): NotificationsState => {
   const fetchNotifications = useCallback(
     async (accounts: AuthState, settings: SettingsState) => {
       function getNotifications(hostname: string, token: string): AxiosPromise {
-        const endpointSuffix = `notifications?participating=${settings.participating}`;
+        const endpointSuffix = `notifications?all=${settings.showAllNotifications}&participating=${settings.participating}`;
         const url = `${generateGitHubAPIUrl(hostname)}${endpointSuffix}`;
         return apiRequestAuth(url, 'GET', token);
       }
@@ -224,14 +229,6 @@ export const useNotifications = (): NotificationsState => {
           {},
         );
 
-        const updatedNotifications = removeNotification(
-          id,
-          notifications,
-          hostname,
-        );
-
-        setNotifications(updatedNotifications);
-        setTrayIconColor(updatedNotifications);
         setIsFetching(false);
       } catch (err) {
         setIsFetching(false);
@@ -257,14 +254,6 @@ export const useNotifications = (): NotificationsState => {
           {},
         );
 
-        const updatedNotifications = removeNotification(
-          id,
-          notifications,
-          hostname,
-        );
-
-        setNotifications(updatedNotifications);
-        setTrayIconColor(updatedNotifications);
         setIsFetching(false);
       } catch (err) {
         setIsFetching(false);
@@ -291,7 +280,8 @@ export const useNotifications = (): NotificationsState => {
           token,
           { ignored: true },
         );
-        await markNotificationRead(accounts, id, hostname);
+
+        setIsFetching(false);
       } catch (err) {
         setIsFetching(false);
       }
@@ -299,7 +289,7 @@ export const useNotifications = (): NotificationsState => {
     [notifications],
   );
 
-  const markRepoNotifications = useCallback(
+  const markRepoNotificationsRead = useCallback(
     async (accounts: AuthState, repoSlug: string, hostname: string) => {
       setIsFetching(true);
 
@@ -316,14 +306,6 @@ export const useNotifications = (): NotificationsState => {
           {},
         );
 
-        const updatedNotifications = removeNotifications(
-          repoSlug,
-          notifications,
-          hostname,
-        );
-
-        setNotifications(updatedNotifications);
-        setTrayIconColor(updatedNotifications);
         setIsFetching(false);
       } catch (err) {
         setIsFetching(false);
@@ -359,14 +341,6 @@ export const useNotifications = (): NotificationsState => {
           );
         }
 
-        const updatedNotifications = removeNotifications(
-          repoSlug,
-          notifications,
-          hostname,
-        );
-
-        setNotifications(updatedNotifications);
-        setTrayIconColor(updatedNotifications);
         setIsFetching(false);
       } catch (err) {
         setIsFetching(false);
@@ -389,6 +363,24 @@ export const useNotifications = (): NotificationsState => {
     [notifications],
   );
 
+  const removeNotificationsFromState = useCallback(
+    (
+      repoSlug: string,
+      notifications: AccountNotifications[],
+      hostname: string,
+    ) => {
+      const updatedNotifications = removeNotifications(
+        repoSlug,
+        notifications,
+        hostname,
+      );
+
+      setNotifications(updatedNotifications);
+      setTrayIconColor(updatedNotifications);
+    },
+    [notifications],
+  );
+
   return {
     isFetching,
     requestFailed,
@@ -396,11 +388,13 @@ export const useNotifications = (): NotificationsState => {
     notifications,
 
     removeNotificationFromState,
+    removeNotificationsFromState,
+
     fetchNotifications,
     markNotificationRead,
     markNotificationDone,
     unsubscribeNotification,
-    markRepoNotifications,
+    markRepoNotificationsRead,
     markRepoNotificationsDone,
   };
 };
diff --git a/src/routes/Notifications.tsx b/src/routes/Notifications.tsx
index f006efe29..72d38df91 100644
--- a/src/routes/Notifications.tsx
+++ b/src/routes/Notifications.tsx
@@ -5,7 +5,7 @@ import { AllRead } from '../components/AllRead';
 import { Oops } from '../components/Oops';
 import { AppContext } from '../context/App';
 import { Errors } from '../utils/constants';
-import { getNotificationCount } from '../utils/notifications';
+import { getUnreadNotificationCount } from '../utils/notifications';
 
 export const NotificationsRoute: FC = () => {
   const { notifications, requestFailed, errorDetails, settings } =
@@ -16,7 +16,7 @@ export const NotificationsRoute: FC = () => {
     [notifications],
   );
   const notificationsCount = useMemo(() => {
-    return getNotificationCount(notifications);
+    return getUnreadNotificationCount(notifications);
   }, [notifications]);
 
   const hasNotifications = useMemo(
@@ -28,7 +28,7 @@ export const NotificationsRoute: FC = () => {
     return <Oops error={errorDetails ?? Errors.UNKNOWN} />;
   }
 
-  if (!hasNotifications) {
+  if (!hasNotifications && !settings.showAllNotifications) {
     return <AllRead />;
   }
 
diff --git a/src/routes/Settings.tsx b/src/routes/Settings.tsx
index 77c0e00e4..658a02a4a 100644
--- a/src/routes/Settings.tsx
+++ b/src/routes/Settings.tsx
@@ -182,6 +182,26 @@ export const SettingsRoute: FC = () => {
           <legend id="notifications" className="font-semibold mt-2 mb-1">
             Notifications
           </legend>
+          <Checkbox
+            name="showAllNotifications"
+            label="Show all notifications"
+            checked={settings.showAllNotifications}
+            onChange={(evt) =>
+              updateSetting('showAllNotifications', evt.target.checked)
+            }
+            tooltip={
+              <div>
+                <div className="pb-3">
+                  Will show up to 50 latest notifications regardless of status
+                  (read, unread, done).
+                </div>
+                <div className="text-orange-600">
+                  ⚠️ Users <i>may</i> experience rate limiting under certain
+                  circumstances. Disable this setting if you experience this.
+                </div>
+              </div>
+            }
+          />
           <Checkbox
             name="showOnlyParticipating"
             label="Show only participating"
diff --git a/src/types.ts b/src/types.ts
index fb4f00fb2..a19804c14 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -21,6 +21,7 @@ interface NotificationSettingsState {
   showNotifications: boolean;
   showBots: boolean;
   markAsDoneOnOpen: boolean;
+  showAllNotifications: boolean;
 }
 
 interface SystemSettingsState {
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index c4605397d..b1226c63a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -18,6 +18,8 @@ export const Constants = {
   ALLREAD_EMOJIS: ['😉', '🎉', '🐯', '🙈', '🎈', '🎊', '👏', '🎪', '🍝'],
 
   FETCH_INTERVAL: 60000,
+
+  READ_CLASS_NAME: 'opacity-50 dark:opacity-50',
 };
 
 export const Errors: Record<ErrorType, GitifyError> = {
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 0e1004dee..6ea786219 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -6,14 +6,18 @@ import { updateTrayIcon } from './comms';
 import type { AccountNotifications, AuthState, SettingsState } from '../types';
 
 export const setTrayIconColor = (notifications: AccountNotifications[]) => {
-  const allNotificationsCount = getNotificationCount(notifications);
+  const notificationCount = getUnreadNotificationCount(notifications);
 
-  updateTrayIcon(allNotificationsCount);
+  updateTrayIcon(notificationCount);
 };
 
-export function getNotificationCount(notifications: AccountNotifications[]) {
+export function getUnreadNotificationCount(
+  notifications: AccountNotifications[],
+) {
   return notifications.reduce(
-    (memo, acc) => memo + acc.notifications.length,
+    (memo, acc) =>
+      memo +
+      acc.notifications.filter((notification) => notification.unread).length,
     0,
   );
 }