diff --git a/src/renderer/components/AllRead.tsx b/src/renderer/components/AllRead.tsx
index 56958617f..71af304eb 100644
--- a/src/renderer/components/AllRead.tsx
+++ b/src/renderer/components/AllRead.tsx
@@ -2,7 +2,7 @@ import { type FC, useContext, useMemo } from 'react';
 
 import { AppContext } from '../context/App';
 import { Constants } from '../utils/constants';
-import { hasFiltersSet } from '../utils/filters';
+import { hasAnyFiltersSet } from '../utils/filters';
 import { EmojiSplash } from './layout/EmojiSplash';
 
 interface IAllRead {
@@ -12,7 +12,7 @@ interface IAllRead {
 export const AllRead: FC<IAllRead> = ({ fullHeight = true }: IAllRead) => {
   const { settings } = useContext(AppContext);
 
-  const hasFilters = hasFiltersSet(settings);
+  const hasFilters = hasAnyFiltersSet(settings);
 
   const emoji = useMemo(
     () =>
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index df5a63a66..0c5de1d2c 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -16,7 +16,7 @@ import { APPLICATION } from '../../shared/constants';
 import { AppContext } from '../context/App';
 import { quitApp } from '../utils/comms';
 import { Constants } from '../utils/constants';
-import { hasFiltersSet } from '../utils/filters';
+import { hasAnyFiltersSet } from '../utils/filters';
 import {
   openGitHubIssues,
   openGitHubNotifications,
@@ -114,7 +114,7 @@ export const Sidebar: FC = () => {
             description="Filter notifications"
             unsafeDisableTooltip={false}
             size="small"
-            variant={hasFiltersSet(settings) ? 'primary' : 'invisible'}
+            variant={hasAnyFiltersSet(settings) ? 'primary' : 'invisible'}
             tooltipDirection="e"
             onClick={() => toggleFilters()}
             data-testid="sidebar-filter-notifications"
diff --git a/src/renderer/components/fields/Checkbox.test.tsx b/src/renderer/components/fields/Checkbox.test.tsx
index 9f2d0c874..0620300e9 100644
--- a/src/renderer/components/fields/Checkbox.test.tsx
+++ b/src/renderer/components/fields/Checkbox.test.tsx
@@ -30,4 +30,19 @@ describe('renderer/components/fields/Checkbox.tsx', () => {
     );
     expect(tree).toMatchSnapshot();
   });
+
+  it('should render - positive counter unselected', () => {
+    const tree = render(<Checkbox {...props} counter={5} checked={false} />);
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render - positive counter selected', () => {
+    const tree = render(<Checkbox {...props} counter={5} checked={true} />);
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render - zero counter', () => {
+    const tree = render(<Checkbox {...props} counter={0} />);
+    expect(tree).toMatchSnapshot();
+  });
 });
diff --git a/src/renderer/components/fields/Checkbox.tsx b/src/renderer/components/fields/Checkbox.tsx
index 12934711a..c532e97ec 100644
--- a/src/renderer/components/fields/Checkbox.tsx
+++ b/src/renderer/components/fields/Checkbox.tsx
@@ -1,6 +1,6 @@
 import type { FC, ReactNode } from 'react';
 
-import { Stack } from '@primer/react';
+import { CounterLabel, Stack } from '@primer/react';
 
 import { cn } from '../../utils/cn';
 import { Tooltip } from './Tooltip';
@@ -8,6 +8,7 @@ import { Tooltip } from './Tooltip';
 export interface ICheckbox {
   name: string;
   label: string;
+  counter?: number;
   tooltip?: ReactNode | string;
   checked: boolean;
   disabled?: boolean;
@@ -19,6 +20,8 @@ export const Checkbox: FC<ICheckbox> = ({
   visible = true,
   ...props
 }: ICheckbox) => {
+  const counter = props.counter > 0 ? props.counter : undefined;
+
   return (
     visible && (
       <Stack
@@ -46,9 +49,16 @@ export const Checkbox: FC<ICheckbox> = ({
         >
           {props.label}
         </label>
+
         {props.tooltip && (
           <Tooltip name={`tooltip-${props.name}`} tooltip={props.tooltip} />
         )}
+
+        {counter && (
+          <CounterLabel scheme={props.checked ? 'primary' : 'secondary'}>
+            {counter}
+          </CounterLabel>
+        )}
       </Stack>
     )
   );
diff --git a/src/renderer/components/fields/Tooltip.tsx b/src/renderer/components/fields/Tooltip.tsx
index 377494bbb..e1d860b0a 100644
--- a/src/renderer/components/fields/Tooltip.tsx
+++ b/src/renderer/components/fields/Tooltip.tsx
@@ -19,7 +19,7 @@ export const Tooltip: FC<ITooltip> = (props: ITooltip) => {
       onMouseLeave={() => setShowTooltip(false)}
       data-testid={`tooltip-${props.name}`}
     >
-      <QuestionIcon className="ml-1 text-gitify-tooltip-icon" />
+      <QuestionIcon className="text-gitify-tooltip-icon" />
       {showTooltip && (
         <Box className="absolute left-[-80px] z-10 w-60 rounded-sm border border-gray-300 p-2 shadow-sm bg-gitify-tooltip-popout">
           <Box className="text-left text-xs text-gitify-font">
diff --git a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
index c0d842194..a16c4a80b 100644
--- a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
@@ -172,6 +172,278 @@ exports[`renderer/components/fields/Checkbox.tsx should render - not visible 1`]
 }
 `;
 
+exports[`renderer/components/fields/Checkbox.tsx should render - positive counter selected 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY text-sm"
+        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-appearance"
+          id="appearance"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="appearance"
+        >
+          Appearance
+        </label>
+        <span
+          aria-hidden="true"
+          class="Box-sc-g0xbh4-0 bzQJGs"
+          sx="[object Object]"
+        >
+          5
+        </span>
+        <span
+          class="_VisuallyHidden__VisuallyHidden-sc-11jhm7a-0 hxuUuW"
+        >
+           (
+          5
+          )
+        </span>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY text-sm"
+      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-appearance"
+        id="appearance"
+        type="checkbox"
+      />
+      <label
+        class="font-medium text-gitify-font cursor-pointer"
+        for="appearance"
+      >
+        Appearance
+      </label>
+      <span
+        aria-hidden="true"
+        class="Box-sc-g0xbh4-0 bzQJGs"
+        sx="[object Object]"
+      >
+        5
+      </span>
+      <span
+        class="_VisuallyHidden__VisuallyHidden-sc-11jhm7a-0 hxuUuW"
+      >
+         (
+        5
+        )
+      </span>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/fields/Checkbox.tsx should render - positive counter unselected 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY text-sm"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-appearance"
+          id="appearance"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="appearance"
+        >
+          Appearance
+        </label>
+        <span
+          aria-hidden="true"
+          class="Box-sc-g0xbh4-0 bfvZWv"
+          sx="[object Object]"
+        >
+          5
+        </span>
+        <span
+          class="_VisuallyHidden__VisuallyHidden-sc-11jhm7a-0 hxuUuW"
+        >
+           (
+          5
+          )
+        </span>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY text-sm"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <input
+        class="size-4 rounded-sm cursor-pointer"
+        data-testid="checkbox-appearance"
+        id="appearance"
+        type="checkbox"
+      />
+      <label
+        class="font-medium text-gitify-font cursor-pointer"
+        for="appearance"
+      >
+        Appearance
+      </label>
+      <span
+        aria-hidden="true"
+        class="Box-sc-g0xbh4-0 bfvZWv"
+        sx="[object Object]"
+      >
+        5
+      </span>
+      <span
+        class="_VisuallyHidden__VisuallyHidden-sc-11jhm7a-0 hxuUuW"
+      >
+         (
+        5
+        )
+      </span>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
 exports[`renderer/components/fields/Checkbox.tsx should render - tooltip 1`] = `
 {
   "asFragment": [Function],
@@ -207,7 +479,7 @@ exports[`renderer/components/fields/Checkbox.tsx should render - tooltip 1`] = `
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+            class="octicon octicon-question text-gitify-tooltip-icon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -256,7 +528,7 @@ exports[`renderer/components/fields/Checkbox.tsx should render - tooltip 1`] = `
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+          class="octicon octicon-question text-gitify-tooltip-icon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -435,3 +707,112 @@ exports[`renderer/components/fields/Checkbox.tsx should render - visible 1`] = `
   "unmount": [Function],
 }
 `;
+
+exports[`renderer/components/fields/Checkbox.tsx should render - zero counter 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY text-sm"
+        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-appearance"
+          id="appearance"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="appearance"
+        >
+          Appearance
+        </label>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY text-sm"
+      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-appearance"
+        id="appearance"
+        type="checkbox"
+      />
+      <label
+        class="font-medium text-gitify-font cursor-pointer"
+        for="appearance"
+      >
+        Appearance
+      </label>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
diff --git a/src/renderer/components/fields/__snapshots__/Tooltip.test.tsx.snap b/src/renderer/components/fields/__snapshots__/Tooltip.test.tsx.snap
index e5931df76..71c245140 100644
--- a/src/renderer/components/fields/__snapshots__/Tooltip.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/Tooltip.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`renderer/components/fields/Tooltip.tsx should display on mouse enter /
 >
   <svg
     aria-hidden="true"
-    class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+    class="octicon octicon-question text-gitify-tooltip-icon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -44,7 +44,7 @@ exports[`renderer/components/fields/Tooltip.tsx should display on mouse enter /
 >
   <svg
     aria-hidden="true"
-    class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+    class="octicon octicon-question text-gitify-tooltip-icon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -74,7 +74,7 @@ exports[`renderer/components/fields/Tooltip.tsx should render 1`] = `
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+          class="octicon octicon-question text-gitify-tooltip-icon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -100,7 +100,7 @@ exports[`renderer/components/fields/Tooltip.tsx should render 1`] = `
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx
index d023bb970..52502dae6 100644
--- a/src/renderer/routes/Filters.test.tsx
+++ b/src/renderer/routes/Filters.test.tsx
@@ -24,7 +24,11 @@ describe('renderer/routes/Filters.tsx', () => {
       await act(async () => {
         render(
           <AppContext.Provider
-            value={{ auth: mockAuth, settings: mockSettings }}
+            value={{
+              auth: mockAuth,
+              settings: mockSettings,
+              notifications: [],
+            }}
           >
             <MemoryRouter>
               <FiltersRoute />
@@ -43,6 +47,7 @@ describe('renderer/routes/Filters.tsx', () => {
             value={{
               auth: mockAuth,
               settings: mockSettings,
+              notifications: [],
               fetchNotifications,
             }}
           >
@@ -71,6 +76,7 @@ describe('renderer/routes/Filters.tsx', () => {
                 detailedNotifications: false,
                 hideBots: false,
               },
+              notifications: [],
               updateSetting,
             }}
           >
@@ -112,6 +118,7 @@ describe('renderer/routes/Filters.tsx', () => {
                 detailedNotifications: true,
                 hideBots: false,
               },
+              notifications: [],
               updateSetting,
             }}
           >
@@ -154,6 +161,7 @@ describe('renderer/routes/Filters.tsx', () => {
                 ...mockSettings,
                 filterReasons: [],
               },
+              notifications: [],
               updateSetting,
             }}
           >
@@ -185,6 +193,7 @@ describe('renderer/routes/Filters.tsx', () => {
                 ...mockSettings,
                 filterReasons: ['security_alert'],
               },
+              notifications: [],
               updateSetting,
             }}
           >
@@ -218,6 +227,7 @@ describe('renderer/routes/Filters.tsx', () => {
             value={{
               auth: mockAuth,
               settings: mockSettings,
+              notifications: [],
               clearFilters,
             }}
           >
diff --git a/src/renderer/routes/Filters.tsx b/src/renderer/routes/Filters.tsx
index 102a39e82..a06e96b94 100644
--- a/src/renderer/routes/Filters.tsx
+++ b/src/renderer/routes/Filters.tsx
@@ -16,10 +16,12 @@ import { Header } from '../components/primitives/Header';
 import { Title } from '../components/primitives/Title';
 import { AppContext } from '../context/App';
 import type { Reason } from '../typesGitHub';
+import { getNonBotFilterCount, getReasonFilterCount } from '../utils/filters';
 import { FORMATTED_REASONS, formatReason } from '../utils/reason';
 
 export const FiltersRoute: FC = () => {
-  const { settings, clearFilters, updateSetting } = useContext(AppContext);
+  const { settings, clearFilters, updateSetting, notifications } =
+    useContext(AppContext);
 
   const updateReasonFilter = (reason: Reason, checked: boolean) => {
     let reasons: Reason[] = [...settings.filterReasons];
@@ -69,6 +71,7 @@ export const FiltersRoute: FC = () => {
                 </Text>
               </Stack>
             }
+            counter={getNonBotFilterCount(notifications)}
           />
         </fieldset>
 
@@ -82,16 +85,22 @@ export const FiltersRoute: FC = () => {
 
           <Stack direction="vertical" gap="condensed">
             {Object.keys(FORMATTED_REASONS).map((reason: Reason) => {
+              const reasonTitle = formatReason(reason).title;
+              const reasonChecked = shouldShowReason(reason);
+              const reasonDescription = formatReason(reason).description;
+              const reasonCount = getReasonFilterCount(notifications, reason);
+
               return (
                 <Checkbox
                   key={reason}
                   name={reason}
-                  label={formatReason(reason).title}
-                  checked={shouldShowReason(reason)}
+                  label={reasonTitle}
+                  checked={reasonChecked}
                   onChange={(evt) =>
                     updateReasonFilter(reason, evt.target.checked)
                   }
-                  tooltip={<Text>{formatReason(reason).description}</Text>}
+                  tooltip={<Text>{reasonDescription}</Text>}
+                  counter={reasonCount}
                 />
               );
             })}
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index d5b788875..f4efbf210 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -159,7 +159,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+            class="octicon octicon-question text-gitify-tooltip-icon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -265,7 +265,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -310,7 +310,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -355,7 +355,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -400,7 +400,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -445,7 +445,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -490,7 +490,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -535,7 +535,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -580,7 +580,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -625,7 +625,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -670,7 +670,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -715,7 +715,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -760,7 +760,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -805,7 +805,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -850,7 +850,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -895,7 +895,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+              class="octicon octicon-question text-gitify-tooltip-icon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1018,7 +1018,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1063,7 +1063,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1108,7 +1108,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1153,7 +1153,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1198,7 +1198,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1243,7 +1243,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1288,7 +1288,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1333,7 +1333,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1378,7 +1378,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1423,7 +1423,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1468,7 +1468,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1513,7 +1513,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1558,7 +1558,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1603,7 +1603,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1648,7 +1648,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1706,7 +1706,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1751,7 +1751,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1796,7 +1796,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1841,7 +1841,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1886,7 +1886,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1931,7 +1931,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -1976,7 +1976,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2021,7 +2021,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2066,7 +2066,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2111,7 +2111,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2156,7 +2156,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2202,7 +2202,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2247,7 +2247,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2292,7 +2292,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2337,7 +2337,7 @@ exports[`renderer/routes/Filters.tsx Reasons section should be able to toggle re
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2428,7 +2428,7 @@ exports[`renderer/routes/Filters.tsx Users section should be able to toggle the
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -2520,7 +2520,7 @@ exports[`renderer/routes/Filters.tsx Users section should not be able to toggle
     >
       <svg
         aria-hidden="true"
-        class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+        class="octicon octicon-question text-gitify-tooltip-icon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 43397da94..b408e6775 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -409,7 +409,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -571,7 +571,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -617,7 +617,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -675,7 +675,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -721,7 +721,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -768,7 +768,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -813,7 +813,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -858,7 +858,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -903,7 +903,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1065,7 +1065,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1179,7 +1179,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question ml-1 text-gitify-tooltip-icon"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
diff --git a/src/renderer/utils/filters.test.ts b/src/renderer/utils/filters.test.ts
index 3293e62d7..7a1d6d652 100644
--- a/src/renderer/utils/filters.test.ts
+++ b/src/renderer/utils/filters.test.ts
@@ -1,28 +1,44 @@
+import { mockSingleAccountNotifications } from '../__mocks__/notifications-mocks';
 import { defaultSettings } from '../context/App';
 import type { SettingsState } from '../types';
-import { getFilterCount, hasFiltersSet } from './filters';
+import {
+  getNonBotFilterCount,
+  getReasonFilterCount,
+  hasAnyFiltersSet,
+} from './filters';
 
 describe('renderer/utils/filters.ts', () => {
-  it('default filter settings', () => {
-    expect(getFilterCount(defaultSettings)).toBe(0);
-    expect(hasFiltersSet(defaultSettings)).toBe(false);
-  });
+  describe('has filters', () => {
+    it('default filter settings', () => {
+      expect(hasAnyFiltersSet(defaultSettings)).toBe(false);
+    });
+
+    it('non-default reason filters', () => {
+      const settings = {
+        ...defaultSettings,
+        filterReasons: ['subscribed', 'manual'],
+      } as SettingsState;
+      expect(hasAnyFiltersSet(settings)).toBe(true);
+    });
 
-  it('non-default reason filters', () => {
-    const settings = {
-      ...defaultSettings,
-      filterReasons: ['subscribed', 'manual'],
-    } as SettingsState;
-    expect(getFilterCount(settings)).toBe(2);
-    expect(hasFiltersSet(settings)).toBe(true);
+    it('non-default bot filters', () => {
+      const settings = {
+        ...defaultSettings,
+        hideBots: true,
+      } as SettingsState;
+      expect(hasAnyFiltersSet(settings)).toBe(true);
+    });
   });
 
-  it('non-default bot filters', () => {
-    const settings = {
-      ...defaultSettings,
-      hideBots: true,
-    } as SettingsState;
-    expect(getFilterCount(settings)).toBe(1);
-    expect(hasFiltersSet(settings)).toBe(true);
+  describe('filter counts', () => {
+    it('hideBots', () => {
+      expect(getNonBotFilterCount(mockSingleAccountNotifications)).toBe(1);
+    });
+
+    it('reason', () => {
+      expect(
+        getReasonFilterCount(mockSingleAccountNotifications, 'subscribed'),
+      ).toBe(1);
+    });
   });
 });
diff --git a/src/renderer/utils/filters.ts b/src/renderer/utils/filters.ts
index 921b0e1b8..5c50731bf 100644
--- a/src/renderer/utils/filters.ts
+++ b/src/renderer/utils/filters.ts
@@ -1,23 +1,29 @@
-import { defaultSettings } from '../context/App';
-import type { SettingsState } from '../types';
+import type { AccountNotifications, SettingsState } from '../types';
+import type { Reason } from '../typesGitHub';
 
-export function getFilterCount(settings: SettingsState): number {
-  let count = 0;
-
-  if (settings.filterReasons.length !== defaultSettings.filterReasons.length) {
-    count += settings.filterReasons.length;
-  }
-
-  if (
-    settings.detailedNotifications &&
-    settings.hideBots !== defaultSettings.hideBots
-  ) {
-    count += 1;
-  }
+export function hasAnyFiltersSet(settings: SettingsState): boolean {
+  return (
+    settings.filterReasons.length > 0 ||
+    (settings.detailedNotifications && settings.hideBots)
+  );
+}
 
-  return count;
+export function getNonBotFilterCount(notifications: AccountNotifications[]) {
+  return notifications.reduce(
+    (memo, acc) =>
+      memo +
+      acc.notifications.filter((n) => n.subject?.user?.type !== 'Bot').length,
+    0,
+  );
 }
 
-export function hasFiltersSet(settings: SettingsState): boolean {
-  return getFilterCount(settings) > 0;
+export function getReasonFilterCount(
+  notifications: AccountNotifications[],
+  reason: Reason,
+) {
+  return notifications.reduce(
+    (memo, acc) =>
+      memo + acc.notifications.filter((n) => n.reason === reason).length,
+    0,
+  );
 }