From 6de32cbfe6912f5b1ab4d3a199c5761780468a55 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 1 Apr 2026 08:30:25 -0400
Subject: [PATCH 1/2] test(vitest): use deps.optimizer.client

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/__helpers__/test-utils.tsx       |   12 +-
 .../__snapshots__/AllRead.test.tsx.snap       |  138 +-
 .../__snapshots__/Oops.test.tsx.snap          |  158 +-
 .../__snapshots__/Sidebar.test.tsx.snap       | 1868 +++++----
 .../AvatarWithFallback.test.tsx.snap          |  250 +-
 .../__snapshots__/Checkbox.test.tsx.snap      |  387 +-
 .../__snapshots__/FieldLabel.test.tsx.snap    |   21 +-
 .../__snapshots__/RadioGroup.test.tsx.snap    |  254 +-
 .../__snapshots__/FilterSection.test.tsx.snap | 1006 +++--
 .../__snapshots__/ReasonFilter.test.tsx.snap  | 1677 ++++----
 ...DetailedNotificationsWarning.test.tsx.snap |   31 +-
 .../SearchFilterSuggestions.test.tsx.snap     |  381 +-
 .../__snapshots__/StateFilter.test.tsx.snap   |  559 ++-
 .../SubjectTypeFilter.test.tsx.snap           |  729 ++--
 .../UserTypeFilter.test.tsx.snap              |  349 +-
 .../__snapshots__/LogoIcon.test.tsx.snap      |  465 +--
 .../ScopeStatusIcon.test.tsx.snap             |  164 +-
 .../__snapshots__/AppLayout.test.tsx.snap     | 1147 +++---
 .../__snapshots__/Centered.test.tsx.snap      |   50 +-
 .../__snapshots__/Contents.test.tsx.snap      |   15 +-
 .../__snapshots__/EmojiSplash.test.tsx.snap   |  144 +-
 .../layout/__snapshots__/Page.test.tsx.snap   |   17 +-
 .../__snapshots__/CommentsPill.test.tsx.snap  |  225 +-
 .../__snapshots__/LabelsPill.test.tsx.snap    |  188 +-
 .../LinkedIssuesPill.test.tsx.snap            |  237 +-
 .../__snapshots__/MetricGroup.test.tsx.snap   |  220 +-
 .../__snapshots__/MetricPill.test.tsx.snap    |  204 +-
 .../__snapshots__/MilestonePill.test.tsx.snap |  213 +-
 .../__snapshots__/ReactionsPill.test.tsx.snap |  523 ++-
 .../__snapshots__/ReviewsPill.test.tsx.snap   |  218 +-
 .../AccountNotifications.test.tsx.snap        | 3608 ++++++++---------
 .../NotificationFooter.test.tsx.snap          | 1182 +++---
 .../NotificationHeader.test.tsx.snap          |  246 +-
 .../NotificationRow.test.tsx.snap             | 2414 ++++++-----
 .../NotificationTitle.test.tsx.snap           |  279 +-
 .../RepositoryNotifications.test.tsx.snap     | 1278 +++---
 .../__snapshots__/CustomCounter.test.tsx.snap |   19 +-
 .../__snapshots__/EmojiText.test.tsx.snap     |   25 +-
 .../__snapshots__/Footer.test.tsx.snap        |   54 +-
 .../__snapshots__/Header.test.tsx.snap        |  117 +-
 .../__snapshots__/HoverButton.test.tsx.snap   |   80 +-
 .../__snapshots__/HoverGroup.test.tsx.snap    |   27 +-
 .../__snapshots__/Title.test.tsx.snap         |  158 +-
 .../SettingsFooter.test.tsx.snap              |    2 +-
 .../__snapshots__/Filters.test.tsx.snap       |    4 +-
 .../routes/__snapshots__/Login.test.tsx.snap  |  401 +-
 .../LoginWithOAuthApp.test.tsx.snap           |  765 ++--
 ...LoginWithPersonalAccessToken.test.tsx.snap |  687 ++--
 .../__snapshots__/Notifications.test.tsx.snap |  136 +-
 .../__snapshots__/Settings.test.tsx.snap      |   12 +-
 vitest.config.ts                              |   11 +-
 51 files changed, 11016 insertions(+), 12339 deletions(-)

diff --git a/src/renderer/__helpers__/test-utils.tsx b/src/renderer/__helpers__/test-utils.tsx
index 8bb7da1b8..f61023090 100644
--- a/src/renderer/__helpers__/test-utils.tsx
+++ b/src/renderer/__helpers__/test-utils.tsx
@@ -2,8 +2,6 @@ import { render } from '@testing-library/react';
 import { type ReactElement, type ReactNode, useMemo } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 
-import { BaseStyles, ThemeProvider } from '@primer/react';
-
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 
 import { AppContext, type AppContextState } from '../context/App';
@@ -86,13 +84,9 @@ function AppContextProvider({
 
   return (
     <MemoryRouter initialEntries={initialEntries}>
-      <ThemeProvider>
-        <BaseStyles>
-          <AppContext.Provider value={defaultValue as AppContextState}>
-            {children}
-          </AppContext.Provider>
-        </BaseStyles>
-      </ThemeProvider>
+      <AppContext.Provider value={defaultValue as AppContextState}>
+        {children}
+      </AppContext.Provider>
     </MemoryRouter>
   );
 }
diff --git a/src/renderer/components/__snapshots__/AllRead.test.tsx.snap b/src/renderer/components/__snapshots__/AllRead.test.tsx.snap
index dcc9d188e..9d45d6bce 100644
--- a/src/renderer/components/__snapshots__/AllRead.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/AllRead.test.tsx.snap
@@ -3,56 +3,45 @@
 exports[`renderer/components/AllRead.tsx > should render itself & its children - no filters 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="h-screen prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
     >
       <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="text-7xl"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🎉"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f389.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              No new  notifications
-            </div>
-          </div>
+          <img
+            alt="🎉"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f389.svg"
+          />
+        </div>
+        <div
+          class="text-xl font-semibold"
+        >
+          No new  notifications
         </div>
       </div>
     </div>
@@ -63,56 +52,45 @@ exports[`renderer/components/AllRead.tsx > should render itself & its children -
 exports[`renderer/components/AllRead.tsx > should render itself & its children - with filters 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="h-screen prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
     >
       <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="text-7xl"
+        >
+          <img
+            alt="🎉"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f389.svg"
+          />
+        </div>
+        <div
+          class="text-xl font-semibold"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🎉"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f389.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              No new filtered  notifications
-            </div>
-          </div>
+          No new filtered  notifications
         </div>
       </div>
     </div>
diff --git a/src/renderer/components/__snapshots__/Oops.test.tsx.snap b/src/renderer/components/__snapshots__/Oops.test.tsx.snap
index cf76d60c6..3fd05a49b 100644
--- a/src/renderer/components/__snapshots__/Oops.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Oops.test.tsx.snap
@@ -3,62 +3,51 @@
 exports[`renderer/components/Oops.tsx > should render itself & its children - fallback to unknown error 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="h-screen prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
     >
       <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="text-7xl"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🤔"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f914.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Oops! Something went wrong
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Please try again later.
-          </div>
+          <img
+            alt="🤔"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f914.svg"
+          />
         </div>
+        <div
+          class="text-xl font-semibold"
+        >
+          Oops! Something went wrong
+        </div>
+      </div>
+      <div
+        class="text-center"
+      >
+        Please try again later.
       </div>
     </div>
   </div>
@@ -68,62 +57,51 @@ exports[`renderer/components/Oops.tsx > should render itself & its children - fa
 exports[`renderer/components/Oops.tsx > should render itself & its children - specified error 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="h-screen prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
     >
       <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="text-7xl"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🔥"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f525.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Error title
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Error description
-          </div>
+          <img
+            alt="🔥"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f525.svg"
+          />
         </div>
+        <div
+          class="text-xl font-semibold"
+        >
+          Error title
+        </div>
+      </div>
+      <div
+        class="text-center"
+      >
+        Error description
       </div>
     </div>
   </div>
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 639d9fe49..184073b15 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`renderer/components/Sidebar.tsx > Filter notifications > highlight filters sidebar if any are saved 1`] = `
 <button
-  aria-describedby="_r_5s_"
+  aria-describedby="_r_5g_"
   aria-label="Filters"
   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
   data-component="IconButton"
@@ -34,7 +34,7 @@ exports[`renderer/components/Sidebar.tsx > Filter notifications > highlight filt
 
 exports[`renderer/components/Sidebar.tsx > notifications icon > renders correct icon when there are no notifications 1`] = `
 <button
-  aria-describedby="_r_21_"
+  aria-describedby="_r_1s_"
   aria-label="Notifications"
   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
   data-component="IconButton"
@@ -66,7 +66,7 @@ exports[`renderer/components/Sidebar.tsx > notifications icon > renders correct
 
 exports[`renderer/components/Sidebar.tsx > notifications icon > renders correct icon when there are notifications 1`] = `
 <button
-  aria-describedby="_r_2i_"
+  aria-describedby="_r_2c_"
   aria-label="Notifications"
   class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
   data-component="IconButton"
@@ -99,670 +99,659 @@ exports[`renderer/components/Sidebar.tsx > notifications icon > renders correct
 exports[`renderer/components/Sidebar.tsx > should render itself & its children (logged in) 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="vertical"
+    data-justify="space-between"
+    data-padding="none"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="normal"
+      data-wrap="nowrap"
     >
-      <div
-        class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="space-between"
-        data-padding="none"
-        data-wrap="nowrap"
+      <button
+        aria-describedby="_r_0_"
+        aria-label="Gitify"
+        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="sidebar-home"
+        data-variant="invisible"
+        type="button"
       >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
+        <svg
+          aria-hidden="true"
+          aria-label="Gitify Logo"
+          class="size-5"
+          viewBox="0 0 500 500"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
         >
-          <button
-            aria-describedby="_r_1_"
-            aria-label="Gitify"
-            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="sidebar-home"
-            data-variant="invisible"
-            type="button"
+          <defs>
+            <lineargradient
+              id="linearGradient-light"
+              x1="90.8779989%"
+              x2="-1.30249747%"
+              y1="80.0676288%"
+              y2="32.7108237%"
+            >
+              <stop
+                offset="0%"
+                stop-color="#CCCCCC"
+              />
+              <stop
+                offset="100%"
+                stop-color="#FFFFFF"
+              />
+            </lineargradient>
+          </defs>
+          <g
+            fill="none"
+            fill-rule="evenodd"
+            stroke="none"
+            stroke-width="1"
           >
-            <svg
-              aria-hidden="true"
-              aria-label="Gitify Logo"
-              class="size-5"
-              viewBox="0 0 500 500"
-              xmlns="https://www.w3.org/2000/svg"
-              xmlns:xlink="https://www.w3.org/1999/xlink"
+            <g
+              fill="url(#linearGradient-light)"
+              fill-rule="nonzero"
+              id="Logo"
+              transform="translate(6.000000, 6.000000)"
             >
-              <defs>
-                <lineargradient
-                  id="linearGradient-light"
-                  x1="90.8779989%"
-                  x2="-1.30249747%"
-                  y1="80.0676288%"
-                  y2="32.7108237%"
-                >
-                  <stop
-                    offset="0%"
-                    stop-color="#CCCCCC"
-                  />
-                  <stop
-                    offset="100%"
-                    stop-color="#FFFFFF"
-                  />
-                </lineargradient>
-              </defs>
-              <g
-                fill="none"
-                fill-rule="evenodd"
-                stroke="none"
-                stroke-width="1"
-              >
-                <g
-                  fill="url(#linearGradient-light)"
-                  fill-rule="nonzero"
-                  id="Logo"
-                  transform="translate(6.000000, 6.000000)"
-                >
-                  <path
-                    d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-                  />
-                </g>
-              </g>
-            </svg>
-          </button>
+              <path
+                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+              />
+            </g>
+          </g>
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_0_"
+        >
+          Home
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            h
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_1_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              Home
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 h
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    h
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    H
-                  </span>
-                </span>
-              </kbd>
+                H
+              </span>
             </span>
-          </span>
-          <button
-            aria-describedby="_r_3_"
-            aria-label="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="sidebar-notifications"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell"
-              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="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-describedby="_r_2_"
+        aria-label="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="sidebar-notifications"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell"
+          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="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_2_"
+        >
+          0 unread notifications ↗
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            n
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_3_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              0 unread notifications ↗
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 n
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    n
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    N
-                  </span>
-                </span>
-              </kbd>
+                N
+              </span>
             </span>
-          </span>
-          <button
-            aria-describedby="_r_5_"
-            aria-label="Toggle focused mode"
-            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="sidebar-focused-mode"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-eye"
-              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="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-describedby="_r_4_"
+        aria-label="Toggle focused mode"
+        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="sidebar-focused-mode"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-eye"
+          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="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_4_"
+        >
+          Participating and watching
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            w
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_5_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              Participating and watching
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 w
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    w
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    W
-                  </span>
-                </span>
-              </kbd>
+                W
+              </span>
             </span>
-          </span>
-          <button
-            aria-describedby="_r_7_"
-            aria-label="Filters"
-            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="sidebar-filter-notifications"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-filter"
-              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="M.75 3h14.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1 0-1.5ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-describedby="_r_6_"
+        aria-label="Filters"
+        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="sidebar-filter-notifications"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-filter"
+          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="M.75 3h14.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1 0-1.5ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_6_"
+        >
+          Filter notifications
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            f
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_7_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              Filter notifications
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 f
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    f
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    F
-                  </span>
-                </span>
-              </kbd>
+                F
+              </span>
             </span>
-          </span>
-          <button
-            aria-labelledby="_r_9_"
-            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="sidebar-my-issues"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-labelledby="_r_8_"
+        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="sidebar-my-issues"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+      >
+        <span
+          id="_r_8_"
+        >
+          My issues ↗
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            i
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_9_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              My issues ↗
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 i
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    i
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    I
-                  </span>
-                </span>
-              </kbd>
+                I
+              </span>
             </span>
-          </span>
-          <button
-            aria-labelledby="_r_b_"
-            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="sidebar-my-pull-requests"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-labelledby="_r_a_"
+        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="sidebar-my-pull-requests"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+      >
+        <span
+          id="_r_a_"
+        >
+          My pull requests ↗
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            p
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_b_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              My pull requests ↗
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 p
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    p
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    P
-                  </span>
-                </span>
-              </kbd>
+                P
+              </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
+          </kbd>
+        </span>
+      </span>
+    </div>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="normal"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-describedby="_r_c_"
+        aria-label="Refresh"
+        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="sidebar-refresh"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-sync"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
         >
-          <button
-            aria-describedby="_r_d_"
-            aria-label="Refresh"
-            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="sidebar-refresh"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-sync"
-              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="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-              />
-            </svg>
-          </button>
+          <path
+            d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_c_"
+        >
+          Refresh notifications
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            r
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_d_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              Refresh notifications
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 r
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    r
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    R
-                  </span>
-                </span>
-              </kbd>
+                R
+              </span>
             </span>
-          </span>
-          <button
-            aria-describedby="_r_f_"
-            aria-label="Settings"
-            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="sidebar-settings"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-gear"
-              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="M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-describedby="_r_e_"
+        aria-label="Settings"
+        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="sidebar-settings"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-gear"
+          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="M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_e_"
+        >
+          Settings
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            s
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_f_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              Settings
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 s
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    s
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    S
-                  </span>
-                </span>
-              </kbd>
+                S
+              </span>
             </span>
-          </span>
-        </div>
-      </div>
+          </kbd>
+        </span>
+      </span>
     </div>
   </div>
 </div>
@@ -771,443 +760,432 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
 exports[`renderer/components/Sidebar.tsx > should render itself & its children (logged out) 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="vertical"
+    data-justify="space-between"
+    data-padding="none"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="normal"
+      data-wrap="nowrap"
     >
-      <div
-        class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="space-between"
-        data-padding="none"
-        data-wrap="nowrap"
+      <button
+        aria-describedby="_r_g_"
+        aria-label="Gitify"
+        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="sidebar-home"
+        data-variant="invisible"
+        type="button"
       >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
+        <svg
+          aria-hidden="true"
+          aria-label="Gitify Logo"
+          class="size-5"
+          viewBox="0 0 500 500"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
         >
-          <button
-            aria-describedby="_r_i_"
-            aria-label="Gitify"
-            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="sidebar-home"
-            data-variant="invisible"
-            type="button"
+          <defs>
+            <lineargradient
+              id="linearGradient-light"
+              x1="90.8779989%"
+              x2="-1.30249747%"
+              y1="80.0676288%"
+              y2="32.7108237%"
+            >
+              <stop
+                offset="0%"
+                stop-color="#CCCCCC"
+              />
+              <stop
+                offset="100%"
+                stop-color="#FFFFFF"
+              />
+            </lineargradient>
+          </defs>
+          <g
+            fill="none"
+            fill-rule="evenodd"
+            stroke="none"
+            stroke-width="1"
           >
-            <svg
-              aria-hidden="true"
-              aria-label="Gitify Logo"
-              class="size-5"
-              viewBox="0 0 500 500"
-              xmlns="https://www.w3.org/2000/svg"
-              xmlns:xlink="https://www.w3.org/1999/xlink"
+            <g
+              fill="url(#linearGradient-light)"
+              fill-rule="nonzero"
+              id="Logo"
+              transform="translate(6.000000, 6.000000)"
             >
-              <defs>
-                <lineargradient
-                  id="linearGradient-light"
-                  x1="90.8779989%"
-                  x2="-1.30249747%"
-                  y1="80.0676288%"
-                  y2="32.7108237%"
-                >
-                  <stop
-                    offset="0%"
-                    stop-color="#CCCCCC"
-                  />
-                  <stop
-                    offset="100%"
-                    stop-color="#FFFFFF"
-                  />
-                </lineargradient>
-              </defs>
-              <g
-                fill="none"
-                fill-rule="evenodd"
-                stroke="none"
-                stroke-width="1"
-              >
-                <g
-                  fill="url(#linearGradient-light)"
-                  fill-rule="nonzero"
-                  id="Logo"
-                  transform="translate(6.000000, 6.000000)"
-                >
-                  <path
-                    d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-                  />
-                </g>
-              </g>
-            </svg>
-          </button>
+              <path
+                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+              />
+            </g>
+          </g>
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_g_"
+        >
+          Home
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            h
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_i_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              Home
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 h
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    h
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    H
-                  </span>
-                </span>
-              </kbd>
+                H
+              </span>
             </span>
-          </span>
-          <button
-            aria-describedby="_r_k_"
-            aria-label="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="sidebar-notifications"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell"
-              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="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-describedby="_r_i_"
+        aria-label="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="sidebar-notifications"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell"
+          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="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+        role="tooltip"
+      >
+        <span
+          id="_r_i_"
+        >
+          0 unread notifications ↗
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
-            role="tooltip"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            n
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_k_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              0 unread notifications ↗
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 n
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    n
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    N
-                  </span>
-                </span>
-              </kbd>
+                N
+              </span>
             </span>
-          </span>
-          <button
-            aria-labelledby="_r_m_"
-            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="sidebar-my-issues"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-labelledby="_r_k_"
+        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="sidebar-my-issues"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+      >
+        <span
+          id="_r_k_"
+        >
+          My issues ↗
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            i
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_m_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              My issues ↗
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 i
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    i
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    I
-                  </span>
-                </span>
-              </kbd>
+                I
+              </span>
             </span>
-          </span>
-          <button
-            aria-labelledby="_r_o_"
-            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="sidebar-my-pull-requests"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
+          </kbd>
+        </span>
+      </span>
+      <button
+        aria-labelledby="_r_m_"
+        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="sidebar-my-pull-requests"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+      >
+        <span
+          id="_r_m_"
+        >
+          My pull requests ↗
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            p
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_o_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              My pull requests ↗
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 p
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    p
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    P
-                  </span>
-                </span>
-              </kbd>
+                P
+              </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
+          </kbd>
+        </span>
+      </span>
+    </div>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="normal"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-labelledby="_r_o_"
+        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="sidebar-quit"
+        data-variant="invisible"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-x-circle"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
         >
-          <button
-            aria-labelledby="_r_q_"
-            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="sidebar-quit"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-x-circle"
-              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="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
-              />
-            </svg>
-          </button>
+          <path
+            d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        popover="auto"
+      >
+        <span
+          id="_r_o_"
+        >
+          Quit Gitify
           <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            popover="auto"
+            class="prc-src-InternalVisuallyHidden-2YaI6"
+          >
+            (
+            q
+            )
+          </span>
+        </span>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+        >
+          <kbd
+            class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+            data-testid="keybinding-hint"
           >
             <span
-              id="_r_q_"
+              class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+              data-kbd-chord="true"
             >
-              Quit Gitify
+               
               <span
                 class="prc-src-InternalVisuallyHidden-2YaI6"
               >
-                (
                 q
-                )
               </span>
-            </span>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-            >
-              <kbd
-                class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                data-testid="keybinding-hint"
+              <span
+                aria-hidden="true"
               >
-                <span
-                  class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                  data-kbd-chord="true"
-                >
-                   
-                  <span
-                    class="prc-src-InternalVisuallyHidden-2YaI6"
-                  >
-                    q
-                  </span>
-                  <span
-                    aria-hidden="true"
-                  >
-                    Q
-                  </span>
-                </span>
-              </kbd>
+                Q
+              </span>
             </span>
-          </span>
-        </div>
-      </div>
+          </kbd>
+        </span>
+      </span>
     </div>
   </div>
 </div>
diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
index 3e42a0f8b..cb5c38f18 100644
--- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
+++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
@@ -3,49 +3,38 @@
 exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallback icon when no src url - human user 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-testid="avatar"
+    data-wrap="nowrap"
   >
+    <svg
+      aria-hidden="true"
+      class="octicon octicon-feed-person"
+      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="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+      />
+    </svg>
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Truncate-Truncate-2G1eo"
+      data-inline="true"
+      style="--truncate-max-width: 280px;"
+      title="@gitify-app"
     >
-      <div
-        class="prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-feed-person"
-          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="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-          />
-        </svg>
-        <div
-          class="prc-Truncate-Truncate-2G1eo"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
-        >
-          @gitify-app
-        </div>
-      </div>
+      @gitify-app
     </div>
   </div>
 </div>
@@ -54,49 +43,38 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallba
 exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallback icon when no src url - non human user 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-testid="avatar"
+    data-wrap="nowrap"
   >
+    <svg
+      aria-hidden="true"
+      class="octicon octicon-mark-github"
+      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="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
+      />
+    </svg>
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Truncate-Truncate-2G1eo"
+      data-inline="true"
+      style="--truncate-max-width: 280px;"
+      title="@gitify-app"
     >
-      <div
-        class="prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github"
-          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="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-          />
-        </svg>
-        <div
-          class="prc-Truncate-Truncate-2G1eo"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
-        >
-          @gitify-app
-        </div>
-      </div>
+      @gitify-app
     </div>
   </div>
 </div>
@@ -181,42 +159,31 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallba
 exports[`renderer/components/avatars/AvatarWithFallback.tsx > should render avatar - human user 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-testid="avatar"
+    data-wrap="nowrap"
   >
+    <img
+      alt="gitify-app"
+      class="prc-Avatar-Avatar-0xaUi"
+      data-component="Avatar"
+      height="16"
+      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+      style="--avatarSize-regular: 16px;"
+      width="16"
+    />
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Truncate-Truncate-2G1eo"
+      data-inline="true"
+      style="--truncate-max-width: 280px;"
+      title="@gitify-app"
     >
-      <div
-        class="prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
-      >
-        <img
-          alt="gitify-app"
-          class="prc-Avatar-Avatar-0xaUi"
-          data-component="Avatar"
-          height="16"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          style="--avatarSize-regular: 16px;"
-          width="16"
-        />
-        <div
-          class="prc-Truncate-Truncate-2G1eo"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
-        >
-          @gitify-app
-        </div>
-      </div>
+      @gitify-app
     </div>
   </div>
 </div>
@@ -225,43 +192,32 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx > should render avat
 exports[`renderer/components/avatars/AvatarWithFallback.tsx > should render avatar - non-human user 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-testid="avatar"
+    data-wrap="nowrap"
   >
+    <img
+      alt="gitify-app"
+      class="prc-Avatar-Avatar-0xaUi"
+      data-component="Avatar"
+      data-square=""
+      height="16"
+      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+      style="--avatarSize-regular: 16px;"
+      width="16"
+    />
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Truncate-Truncate-2G1eo"
+      data-inline="true"
+      style="--truncate-max-width: 280px;"
+      title="@gitify-app"
     >
-      <div
-        class="prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
-      >
-        <img
-          alt="gitify-app"
-          class="prc-Avatar-Avatar-0xaUi"
-          data-component="Avatar"
-          data-square=""
-          height="16"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          style="--avatarSize-regular: 16px;"
-          width="16"
-        />
-        <div
-          class="prc-Truncate-Truncate-2G1eo"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
-        >
-          @gitify-app
-        </div>
-      </div>
+      @gitify-app
     </div>
   </div>
 </div>
diff --git a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
index 2340d72d8..53df831a9 100644
--- a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
@@ -3,98 +3,63 @@
 exports[`renderer/components/fields/Checkbox.tsx > should render - disabled 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <input
+      checked=""
+      class="size-4 rounded-sm cursor-pointer"
+      data-testid="checkbox-appearance"
+      disabled=""
+      id="appearance"
+      type="checkbox"
+    />
+    <label
+      class="font-medium text-gitify-font cursor-pointer line-through"
+      for="appearance"
     >
-      <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-appearance"
-          disabled=""
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer line-through"
-          for="appearance"
-        >
-          Appearance
-        </label>
-      </div>
-    </div>
+      Appearance
+    </label>
   </div>
 </div>
 `;
 
-exports[`renderer/components/fields/Checkbox.tsx > should render - not visible 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/fields/Checkbox.tsx > should render - not visible 1`] = `<div />`;
 
 exports[`renderer/components/fields/Checkbox.tsx > should render - positive counter selected 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <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"
     >
-      <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-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <span
-          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-9mHv3"
-        >
-          5
-        </span>
-      </div>
-    </div>
+      Appearance
+    </label>
+    <span
+      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-9mHv3"
+    >
+      5
+    </span>
   </div>
 </div>
 `;
@@ -102,42 +67,31 @@ exports[`renderer/components/fields/Checkbox.tsx > should render - positive coun
 exports[`renderer/components/fields/Checkbox.tsx > should render - positive counter unselected 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <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"
     >
-      <div
-        class="text-sm prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <input
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <span
-          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-        >
-          5
-        </span>
-      </div>
-    </div>
+      Appearance
+    </label>
+    <span
+      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+    >
+      5
+    </span>
   </div>
 </div>
 `;
@@ -145,64 +99,53 @@ exports[`renderer/components/fields/Checkbox.tsx > should render - positive coun
 exports[`renderer/components/fields/Checkbox.tsx > should render - tooltip 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <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>
+    <button
+      aria-expanded="false"
+      aria-haspopup="true"
+      aria-label="tooltip-appearance"
+      data-testid="tooltip-icon-tooltip-appearance"
+      id="tooltip-appearance"
+      tabindex="0"
+      type="button"
     >
-      <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"
+      <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"
       >
-        <input
-          checked=""
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          id="appearance"
-          type="checkbox"
+        <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"
         />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <button
-          aria-expanded="false"
-          aria-haspopup="true"
-          aria-label="tooltip-appearance"
-          data-testid="tooltip-icon-tooltip-appearance"
-          id="tooltip-appearance"
-          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>
+      </svg>
+    </button>
   </div>
 </div>
 `;
@@ -210,38 +153,27 @@ exports[`renderer/components/fields/Checkbox.tsx > should render - tooltip 1`] =
 exports[`renderer/components/fields/Checkbox.tsx > should render - visible 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <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"
     >
-      <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-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-      </div>
-    </div>
+      Appearance
+    </label>
   </div>
 </div>
 `;
@@ -249,43 +181,32 @@ exports[`renderer/components/fields/Checkbox.tsx > should render - visible 1`] =
 exports[`renderer/components/fields/Checkbox.tsx > should render - zero counter 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <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"
     >
-      <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-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <span
-          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-9mHv3"
-        >
-          0
-        </span>
-      </div>
-    </div>
+      Appearance
+    </label>
+    <span
+      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-9mHv3"
+    >
+      0
+    </span>
   </div>
 </div>
 `;
diff --git a/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap b/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap
index 62c2069ba..6d2b45e22 100644
--- a/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap
@@ -2,22 +2,11 @@
 
 exports[`renderer/components/fields/FieldLabel.tsx > should render 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <label
+    class="mr-1 font-medium cursor-pointer"
+    for="appearance"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <label
-        class="mr-1 font-medium cursor-pointer"
-        for="appearance"
-      >
-        Appearance
-      </label>
-    </div>
-  </div>
+    Appearance
+  </label>
 </div>
 `;
diff --git a/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap b/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap
index ed084efa7..2b57d5503 100644
--- a/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap
@@ -3,79 +3,68 @@
 exports[`renderer/components/fields/RadioGroup.tsx > should render 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
+    <label
+      class="mr-1 font-medium cursor-pointer"
+      for="appearance"
+    >
+      Appearance
+    </label>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <input
+        class="size-4 cursor-pointer"
+        data-testid="radio-appearance-one"
+        id="radio-appearance-one"
+        name="appearance"
+        type="radio"
+        value="one"
+      />
+      <label
+        class="mr-1 font-medium cursor-pointer"
+        for="radio-appearance-one"
+      >
+        Value 1
+      </label>
+    </div>
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
-      <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 cursor-pointer"
+        data-testid="radio-appearance-two"
+        id="radio-appearance-two"
+        name="appearance"
+        type="radio"
+        value="two"
+      />
+      <label
+        class="mr-1 font-medium cursor-pointer"
+        for="radio-appearance-two"
       >
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 cursor-pointer"
-            data-testid="radio-appearance-one"
-            id="radio-appearance-one"
-            name="appearance"
-            type="radio"
-            value="one"
-          />
-          <label
-            class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-one"
-          >
-            Value 1
-          </label>
-        </div>
-        <div
-          class="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 cursor-pointer"
-            data-testid="radio-appearance-two"
-            id="radio-appearance-two"
-            name="appearance"
-            type="radio"
-            value="two"
-          />
-          <label
-            class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-two"
-          >
-            Value 2
-          </label>
-        </div>
-      </div>
+        Value 2
+      </label>
     </div>
   </div>
 </div>
@@ -84,79 +73,68 @@ exports[`renderer/components/fields/RadioGroup.tsx > should render 1`] = `
 exports[`renderer/components/fields/RadioGroup.tsx > should render as disabled 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    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"
   >
+    <label
+      class="mr-1 font-medium cursor-pointer"
+      for="appearance"
+    >
+      Appearance
+    </label>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <input
+        class="size-4 cursor-pointer"
+        data-testid="radio-appearance-one"
+        id="radio-appearance-one"
+        name="appearance"
+        type="radio"
+        value="one"
+      />
+      <label
+        class="mr-1 font-medium cursor-pointer"
+        for="radio-appearance-one"
+      >
+        Value 1
+      </label>
+    </div>
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
-      <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 cursor-pointer"
+        data-testid="radio-appearance-two"
+        id="radio-appearance-two"
+        name="appearance"
+        type="radio"
+        value="two"
+      />
+      <label
+        class="mr-1 font-medium cursor-pointer"
+        for="radio-appearance-two"
       >
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 cursor-pointer"
-            data-testid="radio-appearance-one"
-            id="radio-appearance-one"
-            name="appearance"
-            type="radio"
-            value="one"
-          />
-          <label
-            class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-one"
-          >
-            Value 1
-          </label>
-        </div>
-        <div
-          class="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 cursor-pointer"
-            data-testid="radio-appearance-two"
-            id="radio-appearance-two"
-            name="appearance"
-            type="radio"
-            value="two"
-          />
-          <label
-            class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-two"
-          >
-            Value 2
-          </label>
-        </div>
-      </div>
+        Value 2
+      </label>
     </div>
   </div>
 </div>
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index 952e51c57..377746471 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -2,562 +2,540 @@
 
 exports[`renderer/components/filters/FilterSection.tsx > should render itself & its children > with detailed notifications disabled 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <fieldset
+    id="FilterSectionTest"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <fieldset
-        id="FilterSectionTest"
+    <legend>
+      <div
+        class="mb-2"
       >
-        <legend>
-          <div
-            class="mb-2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="title-filtersectiontitle"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                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="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-                />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-MtWFE"
-              >
-                FilterSectionTitle
-              </h4>
-            </div>
-          </div>
-        </legend>
         <div
           class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="vertical"
+          data-align="center"
+          data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
+          id="title-filtersectiontitle"
         >
-          <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"
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-mark-github"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
-              type="checkbox"
+            <path
+              d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
-            >
-              Closed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-icon-tooltip-Closed"
-              id="tooltip-Closed"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+          <h4
+            class="prc-Heading-Heading-MtWFE"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+            FilterSectionTitle
+          </h4>
+        </div>
+      </div>
+    </legend>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Closed"
+          id="Closed"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Closed"
+        >
+          Closed
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Closed"
+          data-testid="tooltip-icon-tooltip-Closed"
+          id="tooltip-Closed"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Merged"
-              id="Merged"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Merged"
-            >
-              Merged
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Draft"
+          id="Draft"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Draft"
+        >
+          Draft
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Merged"
+          id="Merged"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Merged"
+        >
+          Merged
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Open"
+          id="Open"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Open"
+        >
+          Open
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Open"
+          data-testid="tooltip-icon-tooltip-Open"
+          id="tooltip-Open"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
-            >
-              Open
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-icon-tooltip-Open"
-              id="tooltip-Open"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Other"
+          id="Other"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Other"
+        >
+          Other
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Other"
+          data-testid="tooltip-icon-tooltip-Other"
+          id="tooltip-Other"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Other"
-              id="Other"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Other"
-            >
-              Other
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Other"
-              data-testid="tooltip-icon-tooltip-Other"
-              id="tooltip-Other"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              3
-            </span>
-          </div>
-        </div>
-      </fieldset>
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          3
+        </span>
+      </div>
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
 
 exports[`renderer/components/filters/FilterSection.tsx > should render itself & its children > with detailed notifications enabled 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <fieldset
+    id="FilterSectionTest"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <fieldset
-        id="FilterSectionTest"
+    <legend>
+      <div
+        class="mb-2"
       >
-        <legend>
-          <div
-            class="mb-2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="title-filtersectiontitle"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                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="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-                />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-MtWFE"
-              >
-                FilterSectionTitle
-              </h4>
-            </div>
-          </div>
-        </legend>
         <div
           class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="vertical"
+          data-align="center"
+          data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
+          id="title-filtersectiontitle"
         >
-          <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"
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-mark-github"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
-              type="checkbox"
+            <path
+              d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
-            >
-              Closed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-icon-tooltip-Closed"
-              id="tooltip-Closed"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+          <h4
+            class="prc-Heading-Heading-MtWFE"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+            FilterSectionTitle
+          </h4>
+        </div>
+      </div>
+    </legend>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Closed"
+          id="Closed"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Closed"
+        >
+          Closed
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Closed"
+          data-testid="tooltip-icon-tooltip-Closed"
+          id="tooltip-Closed"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Merged"
-              id="Merged"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Merged"
-            >
-              Merged
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Draft"
+          id="Draft"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Draft"
+        >
+          Draft
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Merged"
+          id="Merged"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Merged"
+        >
+          Merged
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Open"
+          id="Open"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Open"
+        >
+          Open
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Open"
+          data-testid="tooltip-icon-tooltip-Open"
+          id="tooltip-Open"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
-            >
-              Open
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-icon-tooltip-Open"
-              id="tooltip-Open"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Other"
+          id="Other"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Other"
+        >
+          Other
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Other"
+          data-testid="tooltip-icon-tooltip-Other"
+          id="tooltip-Other"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Other"
-              id="Other"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Other"
-            >
-              Other
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Other"
-              data-testid="tooltip-icon-tooltip-Other"
-              id="tooltip-Other"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              3
-            </span>
-          </div>
-        </div>
-      </fieldset>
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          3
+        </span>
+      </div>
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index 1babd119d..24cb7ed65 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -2,889 +2,878 @@
 
 exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & its children 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <fieldset
+    id="filter-reasons"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <fieldset
-        id="filter-reasons"
+    <legend>
+      <div
+        class="mb-2"
       >
-        <legend>
-          <div
-            class="mb-2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="title-reason"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-note"
-                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 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-MtWFE"
-              >
-                Reason
-              </h4>
-              <button
-                aria-expanded="false"
-                aria-haspopup="true"
-                aria-label="tooltip-reason"
-                data-testid="tooltip-icon-tooltip-reason"
-                id="tooltip-reason"
-                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>
-        </legend>
         <div
           class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="vertical"
+          data-align="center"
+          data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
+          id="title-reason"
         >
-          <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"
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-note"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Approval Requested"
-              id="Approval Requested"
-              type="checkbox"
+            <path
+              d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Approval Requested"
-            >
-              Approval Requested
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Approval Requested"
-              data-testid="tooltip-icon-tooltip-Approval Requested"
-              id="tooltip-Approval Requested"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+          <h4
+            class="prc-Heading-Heading-MtWFE"
+          >
+            Reason
+          </h4>
+          <button
+            aria-expanded="false"
+            aria-haspopup="true"
+            aria-label="tooltip-reason"
+            data-testid="tooltip-icon-tooltip-reason"
+            id="tooltip-reason"
+            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>
+    </legend>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Approval Requested"
+          id="Approval Requested"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Approval Requested"
+        >
+          Approval Requested
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Approval Requested"
+          data-testid="tooltip-icon-tooltip-Approval Requested"
+          id="tooltip-Approval Requested"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Assigned"
-              id="Assigned"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Assigned"
-            >
-              Assigned
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Assigned"
-              data-testid="tooltip-icon-tooltip-Assigned"
-              id="tooltip-Assigned"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Assigned"
+          id="Assigned"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Assigned"
+        >
+          Assigned
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Assigned"
+          data-testid="tooltip-icon-tooltip-Assigned"
+          id="tooltip-Assigned"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Authored"
-              id="Authored"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Authored"
-            >
-              Authored
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Authored"
-              data-testid="tooltip-icon-tooltip-Authored"
-              id="tooltip-Authored"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Authored"
+          id="Authored"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Authored"
+        >
+          Authored
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Authored"
+          data-testid="tooltip-icon-tooltip-Authored"
+          id="tooltip-Authored"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Commented"
-              id="Commented"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Commented"
-            >
-              Commented
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Commented"
-              data-testid="tooltip-icon-tooltip-Commented"
-              id="tooltip-Commented"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Commented"
+          id="Commented"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Commented"
+        >
+          Commented
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Commented"
+          data-testid="tooltip-icon-tooltip-Commented"
+          id="tooltip-Commented"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation Received"
-              id="Invitation Received"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation Received"
-            >
-              Invitation Received
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Invitation Received"
-              data-testid="tooltip-icon-tooltip-Invitation Received"
-              id="tooltip-Invitation Received"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Invitation Received"
+          id="Invitation Received"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Invitation Received"
+        >
+          Invitation Received
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Invitation Received"
+          data-testid="tooltip-icon-tooltip-Invitation Received"
+          id="tooltip-Invitation Received"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Member Feature Requested"
-              id="Member Feature Requested"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Member Feature Requested"
-            >
-              Member Feature Requested
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Member Feature Requested"
-              data-testid="tooltip-icon-tooltip-Member Feature Requested"
-              id="tooltip-Member Feature Requested"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Member Feature Requested"
+          id="Member Feature Requested"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Member Feature Requested"
+        >
+          Member Feature Requested
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Member Feature Requested"
+          data-testid="tooltip-icon-tooltip-Member Feature Requested"
+          id="tooltip-Member Feature Requested"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Mentioned"
-              id="Mentioned"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Mentioned"
-            >
-              Mentioned
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Mentioned"
-              data-testid="tooltip-icon-tooltip-Mentioned"
-              id="tooltip-Mentioned"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Mentioned"
+          id="Mentioned"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Mentioned"
+        >
+          Mentioned
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Mentioned"
+          data-testid="tooltip-icon-tooltip-Mentioned"
+          id="tooltip-Mentioned"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Review Requested"
-              id="Review Requested"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Review Requested"
-            >
-              Review Requested
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Review Requested"
-              data-testid="tooltip-icon-tooltip-Review Requested"
-              id="tooltip-Review Requested"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Review Requested"
+          id="Review Requested"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Review Requested"
+        >
+          Review Requested
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Review Requested"
+          data-testid="tooltip-icon-tooltip-Review Requested"
+          id="tooltip-Review Requested"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Advisory Credit Received"
-              id="Security Advisory Credit Received"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Security Advisory Credit Received"
-            >
-              Security Advisory Credit Received
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Security Advisory Credit Received"
-              data-testid="tooltip-icon-tooltip-Security Advisory Credit Received"
-              id="tooltip-Security Advisory Credit Received"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Security Advisory Credit Received"
+          id="Security Advisory Credit Received"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Security Advisory Credit Received"
+        >
+          Security Advisory Credit Received
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Security Advisory Credit Received"
+          data-testid="tooltip-icon-tooltip-Security Advisory Credit Received"
+          id="tooltip-Security Advisory Credit Received"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Alert Received"
-              id="Security Alert Received"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Security Alert Received"
-            >
-              Security Alert Received
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Security Alert Received"
-              data-testid="tooltip-icon-tooltip-Security Alert Received"
-              id="tooltip-Security Alert Received"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Security Alert Received"
+          id="Security Alert Received"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Security Alert Received"
+        >
+          Security Alert Received
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Security Alert Received"
+          data-testid="tooltip-icon-tooltip-Security Alert Received"
+          id="tooltip-Security Alert Received"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-State Changed"
-              id="State Changed"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="State Changed"
-            >
-              State Changed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-State Changed"
-              data-testid="tooltip-icon-tooltip-State Changed"
-              id="tooltip-State Changed"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-State Changed"
+          id="State Changed"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="State Changed"
+        >
+          State Changed
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-State Changed"
+          data-testid="tooltip-icon-tooltip-State Changed"
+          id="tooltip-State Changed"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Team Mentioned"
-              id="Team Mentioned"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Team Mentioned"
-            >
-              Team Mentioned
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Team Mentioned"
-              data-testid="tooltip-icon-tooltip-Team Mentioned"
-              id="tooltip-Team Mentioned"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Team Mentioned"
+          id="Team Mentioned"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Team Mentioned"
+        >
+          Team Mentioned
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Team Mentioned"
+          data-testid="tooltip-icon-tooltip-Team Mentioned"
+          id="tooltip-Team Mentioned"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Updated"
-              id="Updated"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Updated"
-            >
-              Updated
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Updated"
-              data-testid="tooltip-icon-tooltip-Updated"
-              id="tooltip-Updated"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Updated"
+          id="Updated"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Updated"
+        >
+          Updated
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Updated"
+          data-testid="tooltip-icon-tooltip-Updated"
+          id="tooltip-Updated"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Updated"
-              id="Updated"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Updated"
-            >
-              Updated
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Updated"
-              data-testid="tooltip-icon-tooltip-Updated"
-              id="tooltip-Updated"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              3
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Updated"
+          id="Updated"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Updated"
+        >
+          Updated
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Updated"
+          data-testid="tooltip-icon-tooltip-Updated"
+          id="tooltip-Updated"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Workflow Run Completed"
-              id="Workflow Run Completed"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Workflow Run Completed"
-            >
-              Workflow Run Completed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Workflow Run Completed"
-              data-testid="tooltip-icon-tooltip-Workflow Run Completed"
-              id="tooltip-Workflow Run Completed"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </div>
-        </div>
-      </fieldset>
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          3
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Workflow Run Completed"
+          id="Workflow Run Completed"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Workflow Run Completed"
+        >
+          Workflow Run Completed
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Workflow Run Completed"
+          data-testid="tooltip-icon-tooltip-Workflow Run Completed"
+          id="tooltip-Workflow Run Completed"
+          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>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
diff --git a/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap b/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap
index 5580be8ad..e58b23f21 100644
--- a/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap
@@ -2,28 +2,17 @@
 
 exports[`renderer/components/filters/RequiresDetailedNotificationsWarning.tsx > should render itself & its children 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="text-gitify-caution prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    ⚠️ This filter requires the 
+    <strong
+      class="prc-Text-Text-9mHv3"
     >
-      <span
-        class="text-gitify-caution prc-Text-Text-9mHv3"
-      >
-        ⚠️ This filter requires the 
-        <strong
-          class="prc-Text-Text-9mHv3"
-        >
-          Detailed Notifications
-        </strong>
-         
-        setting to be enabled.
-      </span>
-    </div>
-  </div>
+      Detailed Notifications
+    </strong>
+     
+    setting to be enabled.
+  </span>
 </div>
 `;
diff --git a/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
index c52cdd4d3..bda3a4ad3 100644
--- a/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
@@ -1,60 +1,36 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render itself & its children - closed 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render itself & its children - closed 1`] = `<div />`;
 
 exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render itself & its children - input token invalid 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Popover-Popover-7QIH8"
+    data-caret="top-left"
+    data-open=""
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
+      data-height="auto"
+      data-width="auto"
     >
       <div
-        class="prc-Popover-Popover-7QIH8"
-        data-caret="top-left"
-        data-open=""
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
-          data-height="auto"
-          data-width="auto"
-        >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+        <div>
+          <span
+            class="text-xs opacity-90 prc-Text-Text-9mHv3"
           >
-            <div>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-9mHv3"
-              >
-                Please use one of the supported filters [
-                org, repo
-                ]
-              </span>
-            </div>
-          </div>
+            Please use one of the supported filters [
+            org, repo
+            ]
+          </span>
         </div>
       </div>
     </div>
@@ -65,55 +41,44 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render
 exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render itself & its children - input token valid 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Popover-Popover-7QIH8"
+    data-caret="top-left"
+    data-open=""
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
+      data-height="auto"
+      data-width="auto"
     >
       <div
-        class="prc-Popover-Popover-7QIH8"
-        data-caret="top-left"
-        data-open=""
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
-          data-height="auto"
-          data-width="auto"
-        >
+        <div>
           <div
             class="prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="vertical"
-            data-gap="condensed"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-9mHv3"
-                >
-                  repo:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-9mHv3"
-                >
-                  filter by repository full name
-                </span>
-              </div>
-            </div>
+            <span
+              class="text-xs font-semibold prc-Text-Text-9mHv3"
+            >
+              repo:
+            </span>
+            <span
+              class="text-xs opacity-90 prc-Text-Text-9mHv3"
+            >
+              filter by repository full name
+            </span>
           </div>
         </div>
       </div>
@@ -125,99 +90,88 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render
 exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render itself & its children - open with detailed notifications enabled 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Popover-Popover-7QIH8"
+    data-caret="top-left"
+    data-open=""
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
+      data-height="auto"
+      data-width="auto"
     >
       <div
-        class="prc-Popover-Popover-7QIH8"
-        data-caret="top-left"
-        data-open=""
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
-          data-height="auto"
-          data-width="auto"
-        >
+        <div>
           <div
             class="prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="vertical"
-            data-gap="condensed"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-9mHv3"
-                >
-                  author:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-9mHv3"
-                >
-                  filter by notification author
-                </span>
-              </div>
-            </div>
-            <div>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-9mHv3"
-                >
-                  org:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-9mHv3"
-                >
-                  filter by organization owner
-                </span>
-              </div>
-            </div>
-            <div>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-9mHv3"
-                >
-                  repo:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-9mHv3"
-                >
-                  filter by repository full name
-                </span>
-              </div>
-            </div>
+            <span
+              class="text-xs font-semibold prc-Text-Text-9mHv3"
+            >
+              author:
+            </span>
+            <span
+              class="text-xs opacity-90 prc-Text-Text-9mHv3"
+            >
+              filter by notification author
+            </span>
+          </div>
+        </div>
+        <div>
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="stretch"
+            data-direction="vertical"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <span
+              class="text-xs font-semibold prc-Text-Text-9mHv3"
+            >
+              org:
+            </span>
+            <span
+              class="text-xs opacity-90 prc-Text-Text-9mHv3"
+            >
+              filter by organization owner
+            </span>
+          </div>
+        </div>
+        <div>
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="stretch"
+            data-direction="vertical"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <span
+              class="text-xs font-semibold prc-Text-Text-9mHv3"
+            >
+              repo:
+            </span>
+            <span
+              class="text-xs opacity-90 prc-Text-Text-9mHv3"
+            >
+              filter by repository full name
+            </span>
           </div>
         </div>
       </div>
@@ -229,77 +183,66 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render
 exports[`renderer/components/filters/SearchFilterSuggestions.tsx > should render itself & its children - open without detailed notifications enabled 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Popover-Popover-7QIH8"
+    data-caret="top-left"
+    data-open=""
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
+      data-height="auto"
+      data-width="auto"
     >
       <div
-        class="prc-Popover-Popover-7QIH8"
-        data-caret="top-left"
-        data-open=""
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-2x-Aj"
-          data-height="auto"
-          data-width="auto"
-        >
+        <div>
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="stretch"
+            data-direction="vertical"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <span
+              class="text-xs font-semibold prc-Text-Text-9mHv3"
+            >
+              org:
+            </span>
+            <span
+              class="text-xs opacity-90 prc-Text-Text-9mHv3"
+            >
+              filter by organization owner
+            </span>
+          </div>
+        </div>
+        <div>
           <div
             class="prc-Stack-Stack-UQ9k6"
             data-align="stretch"
             data-direction="vertical"
-            data-gap="condensed"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-9mHv3"
-                >
-                  org:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-9mHv3"
-                >
-                  filter by organization owner
-                </span>
-              </div>
-            </div>
-            <div>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-9mHv3"
-                >
-                  repo:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-9mHv3"
-                >
-                  filter by repository full name
-                </span>
-              </div>
-            </div>
+            <span
+              class="text-xs font-semibold prc-Text-Text-9mHv3"
+            >
+              repo:
+            </span>
+            <span
+              class="text-xs opacity-90 prc-Text-Text-9mHv3"
+            >
+              filter by repository full name
+            </span>
           </div>
         </div>
       </div>
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index 5bdf036e0..040a89a04 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -2,310 +2,299 @@
 
 exports[`renderer/components/filters/StateFilter.tsx > should render itself & its children 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <fieldset
+    id="filter-state"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <fieldset
-        id="filter-state"
+    <legend>
+      <div
+        class="mb-2"
       >
-        <legend>
-          <div
-            class="mb-2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="title-state"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened"
-                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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-MtWFE"
-              >
-                State
-              </h4>
-              <button
-                aria-expanded="false"
-                aria-haspopup="true"
-                aria-label="tooltip-state"
-                data-testid="tooltip-icon-tooltip-state"
-                id="tooltip-state"
-                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>
-        </legend>
         <div
           class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="vertical"
+          data-align="center"
+          data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
+          id="title-state"
         >
-          <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"
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-issue-opened"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
-              type="checkbox"
+            <path
+              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
-            >
-              Closed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-icon-tooltip-Closed"
-              id="tooltip-Closed"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
+            <path
+              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+          </svg>
+          <h4
+            class="prc-Heading-Heading-MtWFE"
+          >
+            State
+          </h4>
+          <button
+            aria-expanded="false"
+            aria-haspopup="true"
+            aria-label="tooltip-state"
+            data-testid="tooltip-icon-tooltip-state"
+            id="tooltip-state"
+            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"
             >
-              0
-            </span>
-          </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"
+              <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>
+    </legend>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Closed"
+          id="Closed"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Closed"
+        >
+          Closed
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Closed"
+          data-testid="tooltip-icon-tooltip-Closed"
+          id="tooltip-Closed"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Merged"
-              id="Merged"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Merged"
-            >
-              Merged
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Draft"
+          id="Draft"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Draft"
+        >
+          Draft
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Merged"
+          id="Merged"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Merged"
+        >
+          Merged
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Open"
+          id="Open"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Open"
+        >
+          Open
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Open"
+          data-testid="tooltip-icon-tooltip-Open"
+          id="tooltip-Open"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
-            >
-              Open
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-icon-tooltip-Open"
-              id="tooltip-Open"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </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"
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Other"
+          id="Other"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Other"
+        >
+          Other
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Other"
+          data-testid="tooltip-icon-tooltip-Other"
+          id="tooltip-Other"
+          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"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Other"
-              id="Other"
-              type="checkbox"
+            <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"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Other"
-            >
-              Other
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Other"
-              data-testid="tooltip-icon-tooltip-Other"
-              id="tooltip-Other"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              3
-            </span>
-          </div>
-        </div>
-      </fieldset>
+          </svg>
+        </button>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          3
+        </span>
+      </div>
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index 1a5ce7615..6dcf3346f 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -2,391 +2,380 @@
 
 exports[`renderer/components/filters/SubjectTypeFilter.tsx > should render itself & its children 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <fieldset
+    id="filter-subject-type"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <fieldset
-        id="filter-subject-type"
+    <legend>
+      <div
+        class="mb-2"
       >
-        <legend>
-          <div
-            class="mb-2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="title-type"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-bell"
-                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="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-                />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-MtWFE"
-              >
-                Type
-              </h4>
-              <button
-                aria-expanded="false"
-                aria-haspopup="true"
-                aria-label="tooltip-type"
-                data-testid="tooltip-icon-tooltip-type"
-                id="tooltip-type"
-                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>
-        </legend>
         <div
           class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="vertical"
+          data-align="center"
+          data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
+          id="title-type"
         >
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Advisory"
-              id="Advisory"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Advisory"
-            >
-              Advisory
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Check Suite"
-              id="Check Suite"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Check Suite"
-            >
-              Check Suite
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Commit"
-              id="Commit"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Commit"
-            >
-              Commit
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-bell"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Dependabot Alert"
-              id="Dependabot Alert"
-              type="checkbox"
+            <path
+              d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Dependabot Alert"
-            >
-              Dependabot Alert
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+          <h4
+            class="prc-Heading-Heading-MtWFE"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Discussion"
-              id="Discussion"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Discussion"
-            >
-              Discussion
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation"
-              id="Invitation"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation"
-            >
-              Invitation
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Issue"
-              id="Issue"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Issue"
-            >
-              Issue
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              2
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Pull Request"
-              id="Pull Request"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Pull Request"
-            >
-              Pull Request
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Release"
-              id="Release"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Release"
-            >
-              Release
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Vulnerability Alert"
-              id="Vulnerability Alert"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Vulnerability Alert"
-            >
-              Vulnerability Alert
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+            Type
+          </h4>
+          <button
+            aria-expanded="false"
+            aria-haspopup="true"
+            aria-label="tooltip-type"
+            data-testid="tooltip-icon-tooltip-type"
+            id="tooltip-type"
+            tabindex="0"
+            type="button"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Workflow Run"
-              id="Workflow Run"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Workflow Run"
+            <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"
             >
-              Workflow Run
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </div>
+              <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>
-      </fieldset>
+      </div>
+    </legend>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Advisory"
+          id="Advisory"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Advisory"
+        >
+          Advisory
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Check Suite"
+          id="Check Suite"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Check Suite"
+        >
+          Check Suite
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Commit"
+          id="Commit"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Commit"
+        >
+          Commit
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Dependabot Alert"
+          id="Dependabot Alert"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Dependabot Alert"
+        >
+          Dependabot Alert
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Discussion"
+          id="Discussion"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Discussion"
+        >
+          Discussion
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Invitation"
+          id="Invitation"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Invitation"
+        >
+          Invitation
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Issue"
+          id="Issue"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Issue"
+        >
+          Issue
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          2
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Pull Request"
+          id="Pull Request"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Pull Request"
+        >
+          Pull Request
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Release"
+          id="Release"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Release"
+        >
+          Release
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Vulnerability Alert"
+          id="Vulnerability Alert"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Vulnerability Alert"
+        >
+          Vulnerability Alert
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Workflow Run"
+          id="Workflow Run"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Workflow Run"
+        >
+          Workflow Run
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index 5e998160c..5a3986d57 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -2,201 +2,190 @@
 
 exports[`renderer/components/filters/UserTypeFilter.tsx > should render itself & its children 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <fieldset
+    id="filter-user-types"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <fieldset
-        id="filter-user-types"
+    <legend>
+      <div
+        class="mb-2"
       >
-        <legend>
-          <div
-            class="mb-2"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="title-user-type"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-feed-person"
-                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="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-                />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-MtWFE"
-              >
-                User Type
-              </h4>
-              <button
-                aria-expanded="false"
-                aria-haspopup="true"
-                aria-label="tooltip-user-type"
-                data-testid="tooltip-icon-tooltip-user-type"
-                id="tooltip-user-type"
-                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>
-        </legend>
         <div
           class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
+          data-align="center"
           data-direction="horizontal"
-          data-gap="normal"
+          data-gap="condensed"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
+          id="title-user-type"
         >
-          <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"
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-feed-person"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Bot"
-              id="Bot"
-              type="checkbox"
+            <path
+              d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
             />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Bot"
-            >
-              Bot
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Bot"
-              data-testid="tooltip-icon-tooltip-Bot"
-              id="tooltip-Bot"
-              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>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+          </svg>
+          <h4
+            class="prc-Heading-Heading-MtWFE"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Organization"
-              id="Organization"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Organization"
-            >
-              Organization
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-            >
-              0
-            </span>
-          </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"
+            User Type
+          </h4>
+          <button
+            aria-expanded="false"
+            aria-haspopup="true"
+            aria-label="tooltip-user-type"
+            data-testid="tooltip-icon-tooltip-user-type"
+            id="tooltip-user-type"
+            tabindex="0"
+            type="button"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-User"
-              id="User"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="User"
-            >
-              User
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+            <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"
             >
-              1
-            </span>
-          </div>
+              <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>
-      </fieldset>
+      </div>
+    </legend>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-gap="normal"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Bot"
+          id="Bot"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Bot"
+        >
+          Bot
+        </label>
+        <button
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="tooltip-Bot"
+          data-testid="tooltip-icon-tooltip-Bot"
+          id="tooltip-Bot"
+          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>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-Organization"
+          id="Organization"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="Organization"
+        >
+          Organization
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          0
+        </span>
+      </div>
+      <div
+        class="text-sm prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <input
+          class="size-4 rounded-sm cursor-pointer"
+          data-testid="checkbox-User"
+          id="User"
+          type="checkbox"
+        />
+        <label
+          class="font-medium text-gitify-font cursor-pointer"
+          for="User"
+        >
+          User
+        </label>
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
     </div>
-  </div>
+  </fieldset>
 </div>
 `;
diff --git a/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap b/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
index 265cd649e..09fe79ad6 100644
--- a/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
+++ b/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
@@ -2,300 +2,245 @@
 
 exports[`renderer/components/icons/LogoIcon.tsx > renders correctly (dark) 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    aria-label="Gitify Logo"
+    class="size-5"
+    viewBox="0 0 500 500"
+    xmlns="https://www.w3.org/2000/svg"
+    xmlns:xlink="https://www.w3.org/1999/xlink"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <defs>
+      <lineargradient
+        id="linearGradient-dark"
+        x1="90.8779989%"
+        x2="-1.30249747%"
+        y1="80.0676288%"
+        y2="32.7108237%"
+      >
+        <stop
+          offset="0%"
+          stop-color="#22283B"
+        />
+        <stop
+          offset="100%"
+          stop-color="#555B6E"
+        />
+      </lineargradient>
+    </defs>
+    <g
+      fill="none"
+      fill-rule="evenodd"
+      stroke="none"
+      stroke-width="1"
     >
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-5"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <g
+        fill="url(#linearGradient-dark)"
+        fill-rule="nonzero"
+        id="Logo"
+        transform="translate(6.000000, 6.000000)"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-dark"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#22283B"
-            />
-            <stop
-              offset="100%"
-              stop-color="#555B6E"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
-        >
-          <g
-            fill="url(#linearGradient-dark)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
-          >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
-    </div>
-  </div>
+        <path
+          d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+        />
+      </g>
+    </g>
+  </svg>
 </div>
 `;
 
 exports[`renderer/components/icons/LogoIcon.tsx > renders correctly (light) 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    aria-label="Gitify Logo"
+    class="size-5"
+    viewBox="0 0 500 500"
+    xmlns="https://www.w3.org/2000/svg"
+    xmlns:xlink="https://www.w3.org/1999/xlink"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <defs>
+      <lineargradient
+        id="linearGradient-light"
+        x1="90.8779989%"
+        x2="-1.30249747%"
+        y1="80.0676288%"
+        y2="32.7108237%"
+      >
+        <stop
+          offset="0%"
+          stop-color="#CCCCCC"
+        />
+        <stop
+          offset="100%"
+          stop-color="#FFFFFF"
+        />
+      </lineargradient>
+    </defs>
+    <g
+      fill="none"
+      fill-rule="evenodd"
+      stroke="none"
+      stroke-width="1"
     >
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-5"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <g
+        fill="url(#linearGradient-light)"
+        fill-rule="nonzero"
+        id="Logo"
+        transform="translate(6.000000, 6.000000)"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
-        >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
-          >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
-    </div>
-  </div>
+        <path
+          d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+        />
+      </g>
+    </g>
+  </svg>
 </div>
 `;
 
 exports[`renderer/components/icons/LogoIcon.tsx > should render large size 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    aria-label="Gitify Logo"
+    class="size-16"
+    viewBox="0 0 500 500"
+    xmlns="https://www.w3.org/2000/svg"
+    xmlns:xlink="https://www.w3.org/1999/xlink"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <defs>
+      <lineargradient
+        id="linearGradient-light"
+        x1="90.8779989%"
+        x2="-1.30249747%"
+        y1="80.0676288%"
+        y2="32.7108237%"
+      >
+        <stop
+          offset="0%"
+          stop-color="#CCCCCC"
+        />
+        <stop
+          offset="100%"
+          stop-color="#FFFFFF"
+        />
+      </lineargradient>
+    </defs>
+    <g
+      fill="none"
+      fill-rule="evenodd"
+      stroke="none"
+      stroke-width="1"
     >
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-16"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <g
+        fill="url(#linearGradient-light)"
+        fill-rule="nonzero"
+        id="Logo"
+        transform="translate(6.000000, 6.000000)"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
-        >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
-          >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
-    </div>
-  </div>
+        <path
+          d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+        />
+      </g>
+    </g>
+  </svg>
 </div>
 `;
 
 exports[`renderer/components/icons/LogoIcon.tsx > should render medium size 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    aria-label="Gitify Logo"
+    class="size-10"
+    viewBox="0 0 500 500"
+    xmlns="https://www.w3.org/2000/svg"
+    xmlns:xlink="https://www.w3.org/1999/xlink"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <defs>
+      <lineargradient
+        id="linearGradient-light"
+        x1="90.8779989%"
+        x2="-1.30249747%"
+        y1="80.0676288%"
+        y2="32.7108237%"
+      >
+        <stop
+          offset="0%"
+          stop-color="#CCCCCC"
+        />
+        <stop
+          offset="100%"
+          stop-color="#FFFFFF"
+        />
+      </lineargradient>
+    </defs>
+    <g
+      fill="none"
+      fill-rule="evenodd"
+      stroke="none"
+      stroke-width="1"
     >
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-10"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <g
+        fill="url(#linearGradient-light)"
+        fill-rule="nonzero"
+        id="Logo"
+        transform="translate(6.000000, 6.000000)"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
-        >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
-          >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
-    </div>
-  </div>
+        <path
+          d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+        />
+      </g>
+    </g>
+  </svg>
 </div>
 `;
 
 exports[`renderer/components/icons/LogoIcon.tsx > should render small size 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    aria-label="Gitify Logo"
+    class="size-5"
+    viewBox="0 0 500 500"
+    xmlns="https://www.w3.org/2000/svg"
+    xmlns:xlink="https://www.w3.org/1999/xlink"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <defs>
+      <lineargradient
+        id="linearGradient-light"
+        x1="90.8779989%"
+        x2="-1.30249747%"
+        y1="80.0676288%"
+        y2="32.7108237%"
+      >
+        <stop
+          offset="0%"
+          stop-color="#CCCCCC"
+        />
+        <stop
+          offset="100%"
+          stop-color="#FFFFFF"
+        />
+      </lineargradient>
+    </defs>
+    <g
+      fill="none"
+      fill-rule="evenodd"
+      stroke="none"
+      stroke-width="1"
     >
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-5"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <g
+        fill="url(#linearGradient-light)"
+        fill-rule="nonzero"
+        id="Logo"
+        transform="translate(6.000000, 6.000000)"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
-        >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
-          >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
-    </div>
-  </div>
+        <path
+          d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+        />
+      </g>
+    </g>
+  </svg>
 </div>
 `;
diff --git a/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap b/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap
index 76a474331..3d6be51be 100644
--- a/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap
+++ b/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap
@@ -2,128 +2,84 @@
 
 exports[`renderer/components/icons/ScopeStatusIcon.tsx > granted state > renders a success icon when granted 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-check-circle-fill text-gitify-success"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
+    height="14"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 12 12"
+    width="14"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-check-circle-fill text-gitify-success"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="14"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 12 12"
-        width="14"
-      >
-        <path
-          d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm-.705 8.737L9.63 4.403 8.392 3.166 5.295 6.263l-1.7-1.702L2.356 5.8l2.938 2.938Z"
-        />
-      </svg>
-    </div>
-  </div>
+    <path
+      d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm-.705 8.737L9.63 4.403 8.392 3.166 5.295 6.263l-1.7-1.702L2.356 5.8l2.938 2.938Z"
+    />
+  </svg>
 </div>
 `;
 
 exports[`renderer/components/icons/ScopeStatusIcon.tsx > missing state > renders a danger icon when not granted 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-x-circle-fill text-gitify-danger"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
+    height="14"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 12 12"
+    width="14"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-x-circle-fill text-gitify-danger"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="14"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 12 12"
-        width="14"
-      >
-        <path
-          d="M1.757 10.243a6.001 6.001 0 1 1 8.488-8.486 6.001 6.001 0 0 1-8.488 8.486ZM6 4.763l-2-2L2.763 4l2 2-2 2L4 9.237l2-2 2 2L9.237 8l-2-2 2-2L8 2.763Z"
-        />
-      </svg>
-    </div>
-  </div>
+    <path
+      d="M1.757 10.243a6.001 6.001 0 1 1 8.488-8.486 6.001 6.001 0 0 1-8.488 8.486ZM6 4.763l-2-2L2.763 4l2 2-2 2L4 9.237l2-2 2 2L9.237 8l-2-2 2-2L8 2.763Z"
+    />
+  </svg>
 </div>
 `;
 
 exports[`renderer/components/icons/ScopeStatusIcon.tsx > notApplicable state > renders a dash icon when notApplicable 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-dash opacity-30"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
+    height="14"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 16 16"
+    width="14"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-dash opacity-30"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="14"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 16 16"
-        width="14"
-      >
-        <path
-          d="M2 7.75A.75.75 0 0 1 2.75 7h10a.75.75 0 0 1 0 1.5h-10A.75.75 0 0 1 2 7.75Z"
-        />
-      </svg>
-    </div>
-  </div>
+    <path
+      d="M2 7.75A.75.75 0 0 1 2.75 7h10a.75.75 0 0 1 0 1.5h-10A.75.75 0 0 1 2 7.75Z"
+    />
+  </svg>
 </div>
 `;
 
 exports[`renderer/components/icons/ScopeStatusIcon.tsx > size prop > renders correctly with a custom size 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-check-circle-fill text-gitify-success"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
+    height="20"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 16 16"
+    width="20"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-check-circle-fill text-gitify-success"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="20"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 16 16"
-        width="20"
-      >
-        <path
-          d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z"
-        />
-      </svg>
-    </div>
-  </div>
+    <path
+      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z"
+    />
+  </svg>
 </div>
 `;
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 6e49a54fc..c5280203d 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -3,687 +3,676 @@
 exports[`renderer/components/layout/AppLayout.tsx > should render itself & its children 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="flex flex-col min-h-screen bg-gitify-background"
   >
+    <button
+      aria-label="initial focus"
+      class="sr-only focus-visible"
+      data-focus-visible-added=""
+      data-testid="initial-focus-sentinel"
+      type="button"
+    />
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="vertical"
+      data-justify="space-between"
+      data-padding="none"
+      data-wrap="nowrap"
     >
       <div
-        class="flex flex-col min-h-screen bg-gitify-background"
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="vertical"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="normal"
+        data-wrap="nowrap"
       >
         <button
-          aria-label="initial focus"
-          class="sr-only focus-visible"
-          data-focus-visible-added=""
-          data-testid="initial-focus-sentinel"
+          aria-describedby="_r_0_"
+          aria-label="Gitify"
+          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="sidebar-home"
+          data-variant="invisible"
           type="button"
-        />
-        <div
-          class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="vertical"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="normal"
-            data-wrap="nowrap"
+          <svg
+            aria-hidden="true"
+            aria-label="Gitify Logo"
+            class="size-5"
+            viewBox="0 0 500 500"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
           >
-            <button
-              aria-describedby="_r_1_"
-              aria-label="Gitify"
-              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="sidebar-home"
-              data-variant="invisible"
-              type="button"
+            <defs>
+              <lineargradient
+                id="linearGradient-light"
+                x1="90.8779989%"
+                x2="-1.30249747%"
+                y1="80.0676288%"
+                y2="32.7108237%"
+              >
+                <stop
+                  offset="0%"
+                  stop-color="#CCCCCC"
+                />
+                <stop
+                  offset="100%"
+                  stop-color="#FFFFFF"
+                />
+              </lineargradient>
+            </defs>
+            <g
+              fill="none"
+              fill-rule="evenodd"
+              stroke="none"
+              stroke-width="1"
             >
-              <svg
-                aria-hidden="true"
-                aria-label="Gitify Logo"
-                class="size-5"
-                viewBox="0 0 500 500"
-                xmlns="https://www.w3.org/2000/svg"
-                xmlns:xlink="https://www.w3.org/1999/xlink"
+              <g
+                fill="url(#linearGradient-light)"
+                fill-rule="nonzero"
+                id="Logo"
+                transform="translate(6.000000, 6.000000)"
               >
-                <defs>
-                  <lineargradient
-                    id="linearGradient-light"
-                    x1="90.8779989%"
-                    x2="-1.30249747%"
-                    y1="80.0676288%"
-                    y2="32.7108237%"
-                  >
-                    <stop
-                      offset="0%"
-                      stop-color="#CCCCCC"
-                    />
-                    <stop
-                      offset="100%"
-                      stop-color="#FFFFFF"
-                    />
-                  </lineargradient>
-                </defs>
-                <g
-                  fill="none"
-                  fill-rule="evenodd"
-                  stroke="none"
-                  stroke-width="1"
-                >
-                  <g
-                    fill="url(#linearGradient-light)"
-                    fill-rule="nonzero"
-                    id="Logo"
-                    transform="translate(6.000000, 6.000000)"
-                  >
-                    <path
-                      d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-                    />
-                  </g>
-                </g>
-              </svg>
-            </button>
+                <path
+                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                />
+              </g>
+            </g>
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+          role="tooltip"
+        >
+          <span
+            id="_r_0_"
+          >
+            Home
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
-              role="tooltip"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              h
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_1_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                Home
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   h
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      h
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      H
-                    </span>
-                  </span>
-                </kbd>
+                  H
+                </span>
               </span>
-            </span>
-            <button
-              aria-describedby="_r_3_"
-              aria-label="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="sidebar-notifications"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-bell"
-                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="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-                />
-              </svg>
-            </button>
+            </kbd>
+          </span>
+        </span>
+        <button
+          aria-describedby="_r_2_"
+          aria-label="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="sidebar-notifications"
+          data-variant="invisible"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-bell"
+            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="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+            />
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+          role="tooltip"
+        >
+          <span
+            id="_r_2_"
+          >
+            0 unread notifications ↗
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
-              role="tooltip"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              n
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_3_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                0 unread notifications ↗
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   n
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      n
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      N
-                    </span>
-                  </span>
-                </kbd>
+                  N
+                </span>
               </span>
-            </span>
-            <button
-              aria-describedby="_r_5_"
-              aria-label="Toggle focused mode"
-              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="sidebar-focused-mode"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-eye"
-                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="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-                />
-              </svg>
-            </button>
+            </kbd>
+          </span>
+        </span>
+        <button
+          aria-describedby="_r_4_"
+          aria-label="Toggle focused mode"
+          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="sidebar-focused-mode"
+          data-variant="invisible"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-eye"
+            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="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+            />
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+          role="tooltip"
+        >
+          <span
+            id="_r_4_"
+          >
+            Participating and watching
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
-              role="tooltip"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              w
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_5_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                Participating and watching
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   w
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      w
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      W
-                    </span>
-                  </span>
-                </kbd>
+                  W
+                </span>
               </span>
-            </span>
-            <button
-              aria-describedby="_r_7_"
-              aria-label="Filters"
-              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="sidebar-filter-notifications"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-filter"
-                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="M.75 3h14.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1 0-1.5ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-            </button>
+            </kbd>
+          </span>
+        </span>
+        <button
+          aria-describedby="_r_6_"
+          aria-label="Filters"
+          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="sidebar-filter-notifications"
+          data-variant="invisible"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-filter"
+            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="M.75 3h14.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1 0-1.5ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z"
+            />
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+          role="tooltip"
+        >
+          <span
+            id="_r_6_"
+          >
+            Filter notifications
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
-              role="tooltip"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              f
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_7_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                Filter notifications
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   f
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      f
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      F
-                    </span>
-                  </span>
-                </kbd>
+                  F
+                </span>
               </span>
-            </span>
-            <button
-              aria-labelledby="_r_9_"
-              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="sidebar-my-issues"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened"
-                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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-            </button>
+            </kbd>
+          </span>
+        </span>
+        <button
+          aria-labelledby="_r_8_"
+          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="sidebar-my-issues"
+          data-variant="invisible"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-issue-opened"
+            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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+            />
+            <path
+              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+            />
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+        >
+          <span
+            id="_r_8_"
+          >
+            My issues ↗
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              i
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_9_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                My issues ↗
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   i
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      i
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      I
-                    </span>
-                  </span>
-                </kbd>
+                  I
+                </span>
               </span>
-            </span>
-            <button
-              aria-labelledby="_r_b_"
-              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="sidebar-my-pull-requests"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-git-pull-request"
-                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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-                />
-              </svg>
-            </button>
+            </kbd>
+          </span>
+        </span>
+        <button
+          aria-labelledby="_r_a_"
+          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="sidebar-my-pull-requests"
+          data-variant="invisible"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-git-pull-request"
+            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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+            />
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+        >
+          <span
+            id="_r_a_"
+          >
+            My pull requests ↗
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              p
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_b_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                My pull requests ↗
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   p
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      p
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      P
-                    </span>
-                  </span>
-                </kbd>
+                  P
+                </span>
               </span>
-            </span>
-          </div>
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="normal"
-            data-wrap="nowrap"
+            </kbd>
+          </span>
+        </span>
+      </div>
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="vertical"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="normal"
+        data-wrap="nowrap"
+      >
+        <button
+          aria-describedby="_r_c_"
+          aria-label="Refresh"
+          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="sidebar-refresh"
+          data-variant="invisible"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-sync"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <button
-              aria-describedby="_r_d_"
-              aria-label="Refresh"
-              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="sidebar-refresh"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sync"
-                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="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                />
-              </svg>
-            </button>
+            <path
+              d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
+            />
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+          role="tooltip"
+        >
+          <span
+            id="_r_c_"
+          >
+            Refresh notifications
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
-              role="tooltip"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              r
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_d_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                Refresh notifications
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   r
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      r
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      R
-                    </span>
-                  </span>
-                </kbd>
+                  R
+                </span>
               </span>
-            </span>
-            <button
-              aria-describedby="_r_f_"
-              aria-label="Settings"
-              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="sidebar-settings"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-gear"
-                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="M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"
-                />
-              </svg>
-            </button>
+            </kbd>
+          </span>
+        </span>
+        <button
+          aria-describedby="_r_e_"
+          aria-label="Settings"
+          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="sidebar-settings"
+          data-variant="invisible"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-gear"
+            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="M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"
+            />
+          </svg>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="e"
+          popover="auto"
+          role="tooltip"
+        >
+          <span
+            id="_r_e_"
+          >
+            Settings
             <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="e"
-              popover="auto"
-              role="tooltip"
+              class="prc-src-InternalVisuallyHidden-2YaI6"
+            >
+              (
+              s
+              )
+            </span>
+          </span>
+          <span
+            aria-hidden="true"
+            class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
+          >
+            <kbd
+              class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
+              data-testid="keybinding-hint"
             >
               <span
-                id="_r_f_"
+                class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
+                data-kbd-chord="true"
               >
-                Settings
+                 
                 <span
                   class="prc-src-InternalVisuallyHidden-2YaI6"
                 >
-                  (
                   s
-                  )
                 </span>
-              </span>
-              <span
-                aria-hidden="true"
-                class="prc-TooltipV2-KeybindingHintContainer-Ymj-3 prc-TooltipV2-HasTextBefore-fdOXj"
-              >
-                <kbd
-                  class="prc-KeybindingHint-KeybindingHint-qpYIs prc-Text-Text-9mHv3"
-                  data-testid="keybinding-hint"
+                <span
+                  aria-hidden="true"
                 >
-                  <span
-                    class="prc-components-Chord-DdhWN prc-components-ChordOnEmphasis-O-4BS prc-components-ChordSmall-c-P-x prc-Text-Text-9mHv3"
-                    data-kbd-chord="true"
-                  >
-                     
-                    <span
-                      class="prc-src-InternalVisuallyHidden-2YaI6"
-                    >
-                      s
-                    </span>
-                    <span
-                      aria-hidden="true"
-                    >
-                      S
-                    </span>
-                  </span>
-                </kbd>
+                  S
+                </span>
               </span>
-            </span>
-          </div>
-        </div>
-        <div
-          class="flex-1 pl-sidebar"
-        >
-          Test
-        </div>
+            </kbd>
+          </span>
+        </span>
       </div>
     </div>
+    <div
+      class="flex-1 pl-sidebar"
+    >
+      Test
+    </div>
   </div>
 </div>
 `;
diff --git a/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap b/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap
index 3f34450b0..ba1303be1 100644
--- a/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap
@@ -3,25 +3,14 @@
 exports[`renderer/components/layout/Centered.tsx > should render itself & its children - full height false 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
-      >
-        Test
-      </div>
-    </div>
+    Test
   </div>
 </div>
 `;
@@ -29,25 +18,14 @@ exports[`renderer/components/layout/Centered.tsx > should render itself & its ch
 exports[`renderer/components/layout/Centered.tsx > should render itself & its children - full height true 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="h-screen prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
-      >
-        Test
-      </div>
-    </div>
+    Test
   </div>
 </div>
 `;
diff --git a/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap b/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap
index ab71112b9..2b0270a32 100644
--- a/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap
@@ -3,20 +3,9 @@
 exports[`renderer/components/layout/Contents.tsx > should render itself & its children 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="grow overflow-x-hidden overflow-y-auto px-5"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="grow overflow-x-hidden overflow-y-auto px-5"
-      >
-        Test
-      </div>
-    </div>
+    Test
   </div>
 </div>
 `;
diff --git a/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap b/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
index dbae2b13d..8a97f76fd 100644
--- a/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
@@ -3,63 +3,52 @@
 exports[`renderer/components/layout/EmojiSplash.tsx > should render itself & its children - heading and sub-heading 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="text-7xl"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🍺"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f37a.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Test Heading
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Test Sub-Heading
-          </div>
+          <img
+            alt="🍺"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f37a.svg"
+          />
+        </div>
+        <div
+          class="text-xl font-semibold"
+        >
+          Test Heading
         </div>
       </div>
+      <div
+        class="text-center"
+      >
+        Test Sub-Heading
+      </div>
     </div>
   </div>
 </div>
@@ -68,56 +57,45 @@ exports[`renderer/components/layout/EmojiSplash.tsx > should render itself & its
 exports[`renderer/components/layout/EmojiSplash.tsx > should render itself & its children - heading only 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="text-7xl"
+        >
+          <img
+            alt="🍺"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f37a.svg"
+          />
+        </div>
+        <div
+          class="text-xl font-semibold"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🍺"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f37a.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Test Heading
-            </div>
-          </div>
+          Test Heading
         </div>
       </div>
     </div>
diff --git a/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap b/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap
index b483328b0..178855c77 100644
--- a/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap
@@ -3,21 +3,10 @@
 exports[`renderer/components/layout/Page.tsx > should render itself & its children 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="flex flex-col h-screen"
+    data-testid="test"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="flex flex-col h-screen"
-        data-testid="test"
-      >
-        Test
-      </div>
-    </div>
+    Test
   </div>
 </div>
 `;
diff --git a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
index 2fb21afe6..d5e2d778f 100644
--- a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
@@ -2,153 +2,118 @@
 
 exports[`renderer/components/metrics/CommentsPill.tsx > renders with 1 comment 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_0_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_2_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-comment text-gitify-icon-muted"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+          />
+        </svg>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-comment text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
+          1
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_2_"
-        popover="auto"
-        role="tooltip"
-      >
-        1 comment
-      </span>
-    </div>
-  </div>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_0_"
+    popover="auto"
+    role="tooltip"
+  >
+    1 comment
+  </span>
 </div>
 `;
 
 exports[`renderer/components/metrics/CommentsPill.tsx > renders with multiple comments 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_1_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_4_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-comment text-gitify-icon-muted"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+          />
+        </svg>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-comment text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              2
-            </span>
-          </div>
+          2
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_4_"
-        popover="auto"
-        role="tooltip"
-      >
-        2 comments
-      </span>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renderer/components/metrics/CommentsPill.tsx > renders with no comments (null) 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_1_"
+    popover="auto"
+    role="tooltip"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
+    2 comments
+  </span>
 </div>
 `;
+
+exports[`renderer/components/metrics/CommentsPill.tsx > renders with no comments (null) 1`] = `<div />`;
diff --git a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
index 994ed52ba..3d57d29ca 100644
--- a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
@@ -2,121 +2,97 @@
 
 exports[`renderer/components/metrics/LabelsPill.tsx > renders with labels 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_0_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_2_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-tag text-gitify-icon-muted"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+          />
+        </svg>
+        <span
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
+        >
+          2
+        </span>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_0_"
+    popover="auto"
+    role="tooltip"
+  >
+    <ul
+      class="prc-LabelGroup-Container-E-ePP"
+      data-list="true"
+      data-overflow="inline"
+    >
+      <li>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
           data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          style="--label-r: 162; --label-g: 238; --label-b: 239; --label-h: 181; --label-s: 71; --label-l: 79;"
+          text="enhancement"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-tag text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              2
-            </span>
-          </div>
+            enhancement
+          </span>
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_2_"
-        popover="auto"
-        role="tooltip"
-      >
-        <ul
-          class="prc-LabelGroup-Container-E-ePP"
-          data-list="true"
-          data-overflow="inline"
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 112; --label-g: 87; --label-b: 255; --label-h: 249; --label-s: 100; --label-l: 67;"
+          text="good-first-issue"
         >
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 162; --label-g: 238; --label-b: 239; --label-h: 181; --label-s: 71; --label-l: 79;"
-              text="enhancement"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                enhancement
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 112; --label-g: 87; --label-b: 255; --label-h: 249; --label-s: 100; --label-l: 67;"
-              text="good-first-issue"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                good-first-issue
-              </span>
-            </span>
-          </li>
-        </ul>
-      </span>
-    </div>
-  </div>
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            good-first-issue
+          </span>
+        </span>
+      </li>
+    </ul>
+  </span>
 </div>
 `;
 
-exports[`renderer/components/metrics/LabelsPill.tsx > renders without labels 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/metrics/LabelsPill.tsx > renders without labels 1`] = `<div />`;
diff --git a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
index a96241d07..2ac1a61b6 100644
--- a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
@@ -2,159 +2,124 @@
 
 exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked to multiple issues/prs 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_1_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_4_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened text-gitify-icon-muted"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              2
-            </span>
-          </div>
+          2
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_4_"
-        popover="auto"
-        role="tooltip"
-      >
-        Linked to issues: #1, #2
-      </span>
-    </div>
-  </div>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_1_"
+    popover="auto"
+    role="tooltip"
+  >
+    Linked to issues: #1, #2
+  </span>
 </div>
 `;
 
 exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked to one issue/pr 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_0_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_2_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened text-gitify-icon-muted"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
+          1
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_2_"
-        popover="auto"
-        role="tooltip"
-      >
-        Linked to issue: #1
-      </span>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when no linked issues/prs 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_0_"
+    popover="auto"
+    role="tooltip"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
+    Linked to issue: #1
+  </span>
 </div>
 `;
+
+exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when no linked issues/prs 1`] = `<div />`;
diff --git a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
index 7649bd9d0..19dd79b28 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
@@ -1,142 +1,118 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`renderer/components/metrics/MetricGroup.tsx > should not render any pills when showPills is disabled 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/metrics/MetricGroup.tsx > should not render any pills when showPills is disabled 1`] = `<div />`;
 
 exports[`renderer/components/metrics/MetricGroup.tsx > should render pills when showPills is enabled 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="flex gap-1"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      aria-describedby="_r_0_"
+      type="button"
     >
-      <div
-        class="flex gap-1"
+      <span
+        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+        data-size="small"
+        data-variant="secondary"
+        tabindex="0"
       >
-        <button
-          aria-describedby="_r_2_"
-          type="button"
+        <div
+          class="prc-Stack-Stack-UQ9k6"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="none"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-check text-gitify-icon-open"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="12"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="12"
+          >
+            <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>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            tabindex="0"
+            class="text-xxs px-1 prc-Text-Text-9mHv3"
           >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <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>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
+            1
           </span>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-tLeuB"
-          data-direction="s"
-          id="_r_2_"
-          popover="auto"
-          role="tooltip"
-        >
-          octocat approved these changes
-        </span>
-        <button
-          aria-describedby="_r_3_"
-          type="button"
+        </div>
+      </span>
+    </button>
+    <span
+      aria-hidden="true"
+      class="prc-TooltipV2-Tooltip-tLeuB"
+      data-direction="s"
+      id="_r_0_"
+      popover="auto"
+      role="tooltip"
+    >
+      octocat approved these changes
+    </span>
+    <button
+      aria-describedby="_r_1_"
+      type="button"
+    >
+      <span
+        class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+        data-size="small"
+        data-variant="secondary"
+        tabindex="0"
+      >
+        <div
+          class="prc-Stack-Stack-UQ9k6"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="none"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-file-diff text-gitify-icon-closed"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="12"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="12"
+          >
+            <path
+              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+            />
+          </svg>
           <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-            data-size="small"
-            data-variant="secondary"
-            tabindex="0"
+            class="text-xxs px-1 prc-Text-Text-9mHv3"
           >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-9mHv3"
-              >
-                1
-              </span>
-            </div>
+            1
           </span>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-tLeuB"
-          data-direction="s"
-          id="_r_3_"
-          popover="auto"
-          role="tooltip"
-        >
-          gitify-app requested changes
-        </span>
-      </div>
-    </div>
+        </div>
+      </span>
+    </button>
+    <span
+      aria-hidden="true"
+      class="prc-TooltipV2-Tooltip-tLeuB"
+      data-direction="s"
+      id="_r_1_"
+      popover="auto"
+      role="tooltip"
+    >
+      gitify-app requested changes
+    </span>
   </div>
 </div>
 `;
diff --git a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
index 4c7e07b55..0266c6600 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
@@ -2,133 +2,111 @@
 
 exports[`renderer/components/metrics/MetricPill.tsx > should render with metric 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_0_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_1_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-mark-github text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
+          />
+        </svg>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-mark-github text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
+          1
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_1_"
-        popover="auto"
-        role="tooltip"
-      >
-        Mock Pill
-      </span>
-    </div>
-  </div>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_0_"
+    popover="auto"
+    role="tooltip"
+  >
+    Mock Pill
+  </span>
 </div>
 `;
 
 exports[`renderer/components/metrics/MetricPill.tsx > should render without metric 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_1_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_3_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-mark-github text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-mark-github text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-              />
-            </svg>
-          </div>
-        </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_3_"
-        popover="auto"
-        role="tooltip"
-      >
-        Mock Pill
-      </span>
-    </div>
-  </div>
+          <path
+            d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
+          />
+        </svg>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_1_"
+    popover="auto"
+    role="tooltip"
+  >
+    Mock Pill
+  </span>
 </div>
 `;
diff --git a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
index e72695ded..add54dd78 100644
--- a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
@@ -2,143 +2,108 @@
 
 exports[`renderer/components/metrics/MilestonePill.tsx > renders closed milestone pill 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_1_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_4_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-milestone text-gitify-icon-done"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-milestone text-gitify-icon-done"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-              />
-            </svg>
-          </div>
-        </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_4_"
-        popover="auto"
-        role="tooltip"
-      >
-        Milestone 1
-      </span>
-    </div>
-  </div>
+          <path
+            d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+          />
+        </svg>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_1_"
+    popover="auto"
+    role="tooltip"
+  >
+    Milestone 1
+  </span>
 </div>
 `;
 
 exports[`renderer/components/metrics/MilestonePill.tsx > renders open milestone pill 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_0_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_2_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-milestone text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-milestone text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-              />
-            </svg>
-          </div>
-        </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_2_"
-        popover="auto"
-        role="tooltip"
-      >
-        Milestone 1
-      </span>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renderer/components/metrics/MilestonePill.tsx > renders with no milestone 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+          <path
+            d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+          />
+        </svg>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_0_"
+    popover="auto"
+    role="tooltip"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
+    Milestone 1
+  </span>
 </div>
 `;
+
+exports[`renderer/components/metrics/MilestonePill.tsx > renders with no milestone 1`] = `<div />`;
diff --git a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
index d7a0e55bd..17c41dec9 100644
--- a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
@@ -2,307 +2,272 @@
 
 exports[`renderer/components/metrics/ReactionsPill.tsx > renders when multiple reactions 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_1_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_4_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-smiley text-gitify-icon-muted"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm3.82 1.636a.75.75 0 0 1 1.038.175l.007.009c.103.118.22.222.35.31.264.178.683.37 1.285.37.602 0 1.02-.192 1.285-.371.13-.088.247-.192.35-.31l.007-.008a.75.75 0 0 1 1.222.87l-.022-.015c.02.013.021.015.021.015v.001l-.001.002-.002.003-.005.007-.014.019a2.066 2.066 0 0 1-.184.213c-.16.166-.338.316-.53.445-.63.418-1.37.638-2.127.629-.946 0-1.652-.308-2.126-.63a3.331 3.331 0 0 1-.715-.657l-.014-.02-.005-.006-.002-.003v-.002h-.001l.613-.432-.614.43a.75.75 0 0 1 .183-1.044ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM5 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm5.25 2.25.592.416a97.71 97.71 0 0 0-.592-.416Z"
+          />
+        </svg>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
+        >
+          54
+        </span>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_1_"
+    popover="auto"
+    role="tooltip"
+  >
+    <ul
+      class="prc-LabelGroup-Container-E-ePP"
+      data-list="true"
+      data-overflow="inline"
+    >
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
           data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="👍 1"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-smiley text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm3.82 1.636a.75.75 0 0 1 1.038.175l.007.009c.103.118.22.222.35.31.264.178.683.37 1.285.37.602 0 1.02-.192 1.285-.371.13-.088.247-.192.35-.31l.007-.008a.75.75 0 0 1 1.222.87l-.022-.015c.02.013.021.015.021.015v.001l-.001.002-.002.003-.005.007-.014.019a2.066 2.066 0 0 1-.184.213c-.16.166-.338.316-.53.445-.63.418-1.37.638-2.127.629-.946 0-1.652-.308-2.126-.63a3.331 3.331 0 0 1-.715-.657l-.014-.02-.005-.006-.002-.003v-.002h-.001l.613-.432-.614.43a.75.75 0 0 1 .183-1.044ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM5 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm5.25 2.25.592.416a97.71 97.71 0 0 0-.592-.416Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              54
-            </span>
-          </div>
+            👍 1
+          </span>
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_4_"
-        popover="auto"
-        role="tooltip"
-      >
-        <ul
-          class="prc-LabelGroup-Container-E-ePP"
-          data-list="true"
-          data-overflow="inline"
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="👎 1"
+        >
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            👎 1
+          </span>
+        </span>
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="😆 2"
         >
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="👍 1"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                👍 1
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="👎 1"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                👎 1
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="😆 2"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                😆 2
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="🎉 3"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                🎉 3
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="😕 5"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                😕 5
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="🚀 8"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                🚀 8
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="👀 13"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                👀 13
-              </span>
-            </span>
-          </li>
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="❤️ 21"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                ❤️ 21
-              </span>
-            </span>
-          </li>
-        </ul>
-      </span>
-    </div>
-  </div>
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            😆 2
+          </span>
+        </span>
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="🎉 3"
+        >
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            🎉 3
+          </span>
+        </span>
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="😕 5"
+        >
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            😕 5
+          </span>
+        </span>
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="🚀 8"
+        >
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            🚀 8
+          </span>
+        </span>
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="👀 13"
+        >
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            👀 13
+          </span>
+        </span>
+      </li>
+      <li>
+        <span
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
+          data-size="small"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="❤️ 21"
+        >
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
+          >
+            ❤️ 21
+          </span>
+        </span>
+      </li>
+    </ul>
+  </span>
 </div>
 `;
 
 exports[`renderer/components/metrics/ReactionsPill.tsx > renders when one reaction 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_0_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_2_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-smiley text-gitify-icon-muted"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm3.82 1.636a.75.75 0 0 1 1.038.175l.007.009c.103.118.22.222.35.31.264.178.683.37 1.285.37.602 0 1.02-.192 1.285-.371.13-.088.247-.192.35-.31l.007-.008a.75.75 0 0 1 1.222.87l-.022-.015c.02.013.021.015.021.015v.001l-.001.002-.002.003-.005.007-.014.019a2.066 2.066 0 0 1-.184.213c-.16.166-.338.316-.53.445-.63.418-1.37.638-2.127.629-.946 0-1.652-.308-2.126-.63a3.331 3.331 0 0 1-.715-.657l-.014-.02-.005-.006-.002-.003v-.002h-.001l.613-.432-.614.43a.75.75 0 0 1 .183-1.044ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM5 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm5.25 2.25.592.416a97.71 97.71 0 0 0-.592-.416Z"
+          />
+        </svg>
+        <span
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
+        >
+          1
+        </span>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_0_"
+    popover="auto"
+    role="tooltip"
+  >
+    <ul
+      class="prc-LabelGroup-Container-E-ePP"
+      data-list="true"
+      data-overflow="inline"
+    >
+      <li>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
+          data-cursor-is-interactive="false"
+          data-has-remove-button="false"
           data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
+          text="🚀 1"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+          <span
+            class="prc-Token-TokenTextContainer-cOUaD"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-smiley text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm3.82 1.636a.75.75 0 0 1 1.038.175l.007.009c.103.118.22.222.35.31.264.178.683.37 1.285.37.602 0 1.02-.192 1.285-.371.13-.088.247-.192.35-.31l.007-.008a.75.75 0 0 1 1.222.87l-.022-.015c.02.013.021.015.021.015v.001l-.001.002-.002.003-.005.007-.014.019a2.066 2.066 0 0 1-.184.213c-.16.166-.338.316-.53.445-.63.418-1.37.638-2.127.629-.946 0-1.652-.308-2.126-.63a3.331 3.331 0 0 1-.715-.657l-.014-.02-.005-.006-.002-.003v-.002h-.001l.613-.432-.614.43a.75.75 0 0 1 .183-1.044ZM12 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM5 8a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm5.25 2.25.592.416a97.71 97.71 0 0 0-.592-.416Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
+            🚀 1
+          </span>
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_2_"
-        popover="auto"
-        role="tooltip"
-      >
-        <ul
-          class="prc-LabelGroup-Container-E-ePP"
-          data-list="true"
-          data-overflow="inline"
-        >
-          <li>
-            <span
-              class="prc-Token-TokenBase-te5-F prc-Token-IssueLabel-2IazM"
-              data-cursor-is-interactive="false"
-              data-has-remove-button="false"
-              data-size="small"
-              style="--label-r: 36; --label-g: 41; --label-b: 46; --label-h: 210; --label-s: 12; --label-l: 16;"
-              text="🚀 1"
-            >
-              <span
-                class="prc-Token-TokenTextContainer-cOUaD"
-              >
-                🚀 1
-              </span>
-            </span>
-          </li>
-        </ul>
-      </span>
-    </div>
-  </div>
+      </li>
+    </ul>
+  </span>
 </div>
 `;
 
-exports[`renderer/components/metrics/ReactionsPill.tsx > renders with no reactions 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/metrics/ReactionsPill.tsx > renders with no reactions 1`] = `<div />`;
diff --git a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
index 524f76e9b..14e29f23f 100644
--- a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
@@ -1,138 +1,114 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`renderer/components/metrics/ReviewsPill.tsx > renders nothing when no reviews 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/metrics/ReviewsPill.tsx > renders nothing when no reviews 1`] = `<div />`;
 
 exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when reviews exist 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-describedby="_r_0_"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
     >
-      <button
-        aria-describedby="_r_1_"
-        type="button"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-check text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <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>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <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>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
+          1
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_1_"
-        popover="auto"
-        role="tooltip"
-      >
-        octocat approved these changes
-      </span>
-      <button
-        aria-describedby="_r_2_"
-        type="button"
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_0_"
+    popover="auto"
+    role="tooltip"
+  >
+    octocat approved these changes
+  </span>
+  <button
+    aria-describedby="_r_1_"
+    type="button"
+  >
+    <span
+      class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+      data-size="small"
+      data-variant="secondary"
+      tabindex="0"
+    >
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-file-diff text-gitify-icon-closed"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="12"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="12"
+        >
+          <path
+            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+          />
+        </svg>
         <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-          data-size="small"
-          data-variant="secondary"
-          tabindex="0"
+          class="text-xxs px-1 prc-Text-Text-9mHv3"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-9mHv3"
-            >
-              1
-            </span>
-          </div>
+          1
         </span>
-      </button>
-      <span
-        aria-hidden="true"
-        class="prc-TooltipV2-Tooltip-tLeuB"
-        data-direction="s"
-        id="_r_2_"
-        popover="auto"
-        role="tooltip"
-      >
-        gitify-app requested changes
-      </span>
-    </div>
-  </div>
+      </div>
+    </span>
+  </button>
+  <span
+    aria-hidden="true"
+    class="prc-TooltipV2-Tooltip-tLeuB"
+    data-direction="s"
+    id="_r_1_"
+    popover="auto"
+    role="tooltip"
+  >
+    gitify-app requested changes
+  </span>
 </div>
 `;
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 11c50885c..5c6dae8ad 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -3,242 +3,231 @@
 exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - account error for multiple accounts 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="account-profile"
+      data-variant="invisible"
+      title="Open account profile"
+      type="button"
     >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
-          >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-0xaUi"
-                  data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
-                >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                0
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                0
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-error prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-label="My issues ↗"
-            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="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
+            <img
+              alt="octocat"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
               height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
+              src="https://avatars.githubusercontent.com/u/583231?v=4"
+              style="--avatarSize-regular: 16px;"
               width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@octocat"
             >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="My pull requests ↗"
-            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="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
+              @octocat
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="No notifications for account"
-            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="account-toggle"
-            data-variant="invisible"
-            title="No notifications for account"
-            type="button"
+            0
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-left"
-              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="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
+             (
+            0
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-error prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="My issues ↗"
+        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="account-issues"
+        data-variant="invisible"
+        title="My issues ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="My pull requests ↗"
+        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="account-pull-requests"
+        data-variant="invisible"
+        title="My pull requests ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="No notifications for account"
+        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="account-toggle"
+        data-variant="invisible"
+        title="No notifications for account"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-left"
+          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="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+          />
+        </svg>
+      </button>
+    </div>
+  </div>
+  <div
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
+  >
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
       <div
         class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="text-7xl"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🔥"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f525.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Error title
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Error description
-          </div>
+          <img
+            alt="🔥"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f525.svg"
+          />
         </div>
+        <div
+          class="text-xl font-semibold"
+        >
+          Error title
+        </div>
+      </div>
+      <div
+        class="text-center"
+      >
+        Error description
       </div>
     </div>
   </div>
@@ -248,1383 +237,493 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
 exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - account error for single account 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="account-profile"
+      data-variant="invisible"
+      title="Open account profile"
+      type="button"
     >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
-          >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-0xaUi"
-                  data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
-                >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                0
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                0
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-error prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-label="My issues ↗"
-            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="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="My pull requests ↗"
-            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="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
+            <img
+              alt="octocat"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
               height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
+              src="https://avatars.githubusercontent.com/u/583231?v=4"
+              style="--avatarSize-regular: 16px;"
               width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@octocat"
             >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="No notifications for account"
-            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="account-toggle"
-            data-variant="invisible"
-            title="No notifications for account"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-left"
-              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="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-      <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🔥"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f525.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Error title
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Error description
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - group notifications by date 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
-        >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
-            data-align="center"
-            data-component="buttonContent"
-          >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-0xaUi"
-                  data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
-                >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-label="My issues ↗"
-            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="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="My pull requests ↗"
-            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="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="Hide account 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="account-toggle"
-            data-variant="invisible"
-            title="Hide account notifications"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              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="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>
-        </div>
-      </div>
-      <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
-      >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_a_"
-            type="button"
-          >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            id="_r_a_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
-          <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="py-0.5"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <button
-                  class="text-xs font-medium"
-                  data-testid="view-repository"
-                  title="Open repository ↗"
-                  type="button"
-                >
-                  <div
-                    class="prc-Stack-Stack-UQ9k6"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="condensed"
-                    data-justify="start"
-                    data-padding="none"
-                    data-testid="avatar"
-                    data-wrap="nowrap"
-                  >
-                    <img
-                      alt="gitify-app/notifications-test"
-                      class="prc-Avatar-Avatar-0xaUi"
-                      data-component="Avatar"
-                      height="14"
-                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                      style="--avatarSize-regular: 14px;"
-                      width="14"
-                    />
-                    <div
-                      class="prc-Truncate-Truncate-2G1eo"
-                      data-inline="true"
-                      style="--truncate-max-width: 280px;"
-                      title="gitify-app/notifications-test"
-                    >
-                      gitify-app/notifications-test
-                    </div>
-                  </div>
-                </button>
-                <div
-                  class="text-xxs opacity-50"
-                >
-                  123
-                </div>
-              </div>
-            </div>
-            <div
-              class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test! [#123]"
-            >
-              <span
-                class="truncate prc-Text-Text-9mHv3"
-              >
-                <span
-                  class="prc-Text-Text-9mHv3"
-                >
-                  I am a robot and this is a test!
-                </span>
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
-              >
-                123
-              </span>
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="wrap"
-            >
-              <button
-                data-testid="view-profile"
-                title="gitify-app"
-                type="button"
-              >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-0xaUi"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
-                  />
-                </div>
-              </button>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-9mHv3"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <button
-                  aria-describedby="_r_b_"
-                  type="button"
-                >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
-                  >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <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>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
-                  </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_b_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  octocat approved these changes
-                </span>
-                <button
-                  aria-describedby="_r_c_"
-                  type="button"
-                >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
-                  >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
-                  </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_c_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  gitify-app requested changes
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <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="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-done"
-            data-variant="invisible"
-            title="Mark 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="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-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              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="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>
-        </div>
-      </div>
-      <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="148827438"
-      >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_g_"
-            type="button"
-          >
-            <svg
-              aria-label="Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            id="_r_g_"
-            popover="auto"
-            role="tooltip"
-          >
-            Issue
-          </span>
-          <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="py-0.5"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <button
-                  class="text-xs font-medium"
-                  data-testid="view-repository"
-                  title="Open repository ↗"
-                  type="button"
-                >
-                  <div
-                    class="prc-Stack-Stack-UQ9k6"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="condensed"
-                    data-justify="start"
-                    data-padding="none"
-                    data-testid="avatar"
-                    data-wrap="nowrap"
-                  >
-                    <img
-                      alt="gitify-app/notifications-test"
-                      class="prc-Avatar-Avatar-0xaUi"
-                      data-component="Avatar"
-                      height="14"
-                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                      style="--avatarSize-regular: 14px;"
-                      width="14"
-                    />
-                    <div
-                      class="prc-Truncate-Truncate-2G1eo"
-                      data-inline="true"
-                      style="--truncate-max-width: 280px;"
-                      title="gitify-app/notifications-test"
-                    >
-                      gitify-app/notifications-test
-                    </div>
-                  </div>
-                </button>
-                <div
-                  class="text-xxs opacity-50"
-                >
-                  456
-                </div>
-              </div>
-            </div>
-            <div
-              class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="Improve the UI [#456]"
-            >
-              <span
-                class="truncate prc-Text-Text-9mHv3"
-              >
-                <span
-                  class="prc-Text-Text-9mHv3"
-                >
-                  Improve the UI
-                </span>
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
-              >
-                456
-              </span>
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="wrap"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-feed-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="14"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="14"
-                >
-                  <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-                  />
-                </svg>
-              </div>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-9mHv3"
-                  title="You created the thread."
-                >
-                  Authored
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:06:34.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              />
+              @octocat
             </div>
           </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
+          >
+            0
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            0
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-error prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="My issues ↗"
+        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="account-issues"
+        data-variant="invisible"
+        title="My issues ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="My pull requests ↗"
+        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="account-pull-requests"
+        data-variant="invisible"
+        title="My pull requests ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="No notifications for account"
+        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="account-toggle"
+        data-variant="invisible"
+        title="No notifications for account"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-left"
+          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="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+          />
+        </svg>
+      </button>
+    </div>
+  </div>
+  <div
+    class="h-screen prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
+  >
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="vertical"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <div
+          class="text-7xl"
+        >
+          <img
+            alt="🔥"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f525.svg"
+          />
+        </div>
+        <div
+          class="text-xl font-semibold"
+        >
+          Error title
         </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <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="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-done"
-            data-variant="invisible"
-            title="Mark 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="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-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              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="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>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - group notifications by repositories 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
-        >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
-            data-align="center"
-            data-component="buttonContent"
-          >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-0xaUi"
-                  data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
-                >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-label="My issues ↗"
-            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="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="My pull requests ↗"
-            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="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="Hide account 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="account-toggle"
-            data-variant="invisible"
-            title="Hide account notifications"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              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="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>
-        </div>
       </div>
-      <div>
-        RepositoryNotifications
+      <div
+        class="text-center"
+      >
+        Error description
       </div>
     </div>
   </div>
 </div>
 `;
 
-exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - no notifications 1`] = `
+exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - group notifications by date 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
+  >
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="account-profile"
+      data-variant="invisible"
+      title="Open account profile"
+      type="button"
+    >
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
+      >
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="octocat"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
+              height="16"
+              src="https://avatars.githubusercontent.com/u/583231?v=4"
+              style="--avatarSize-regular: 16px;"
+              width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@octocat"
+            >
+              @octocat
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
+          >
+            2
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            2
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="My issues ↗"
+        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="account-issues"
+        data-variant="invisible"
+        title="My issues ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="My pull requests ↗"
+        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="account-pull-requests"
+        data-variant="invisible"
+        title="My pull requests ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="Hide account 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="account-toggle"
+        data-variant="invisible"
+        title="Hide account notifications"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-down"
+          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="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>
+    </div>
+  </div>
+  <div
+    class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+    id="138661096"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
+      <button
+        aria-describedby="_r_8_"
+        type="button"
+      >
+        <svg
+          aria-label="Open Issue"
+          class="octicon octicon-issue-opened text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="18"
+          overflow="visible"
+          role="img"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="18"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        id="_r_8_"
+        popover="auto"
+        role="tooltip"
+      >
+        Open Issue
+      </span>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+        class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
         data-align="stretch"
-        data-direction="horizontal"
+        data-direction="vertical"
+        data-gap="none"
         data-justify="start"
         data-padding="none"
         data-wrap="nowrap"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="py-0.5"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
+            <button
+              class="text-xs font-medium"
+              data-testid="view-repository"
+              title="Open repository ↗"
+              type="button"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1637,234 +736,398 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
                 data-wrap="nowrap"
               >
                 <img
-                  alt="octocat"
+                  alt="gitify-app/notifications-test"
                   class="prc-Avatar-Avatar-0xaUi"
                   data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
                 />
                 <div
                   class="prc-Truncate-Truncate-2G1eo"
                   data-inline="true"
                   style="--truncate-max-width: 280px;"
-                  title="@octocat"
+                  title="gitify-app/notifications-test"
                 >
-                  @octocat
+                  gitify-app/notifications-test
                 </div>
               </div>
-            </span>
+            </button>
+            <div
+              class="text-xxs opacity-50"
+            >
+              123
+            </div>
+          </div>
+        </div>
+        <div
+          class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
+          data-align="start"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="space-between"
+          data-padding="none"
+          data-testid="notification-row"
+          data-wrap="nowrap"
+          title="I am a robot and this is a test! [#123]"
+        >
+          <span
+            class="truncate prc-Text-Text-9mHv3"
+          >
             <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
+              class="prc-Text-Text-9mHv3"
             >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                0
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                0
-                )
-              </span>
+              I am a robot and this is a test!
             </span>
           </span>
-        </button>
+          <span
+            class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
+          >
+            123
+          </span>
+        </div>
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+          class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
           data-align="center"
           data-direction="horizontal"
-          data-gap="none"
+          data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-wrap="nowrap"
+          data-wrap="wrap"
         >
           <button
-            aria-label="My issues ↗"
-            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="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="My pull requests ↗"
-            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="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="No notifications for account"
-            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="account-toggle"
-            data-variant="invisible"
-            title="No notifications for account"
+            data-testid="view-profile"
+            title="gitify-app"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-left"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <div
+              class="prc-Stack-Stack-UQ9k6"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
             >
-              <path
-                d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-0xaUi"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
               />
-            </svg>
+            </div>
           </button>
-        </div>
-      </div>
-      <div
-        class="prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
           <div
             class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="text-7xl"
+            <span
+              class="pr-1 prc-Text-Text-9mHv3"
+              title="You're watching the repository."
             >
-              <img
-                alt="🎉"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f389.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
+              Updated
+            </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
             >
-              No new  notifications
-            </div>
+              May 20, 2017
+            </relative-time>
+          </div>
+          <div
+            class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_9_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <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>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_9_"
+              popover="auto"
+              role="tooltip"
+            >
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_a_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_a_"
+              popover="auto"
+              role="tooltip"
+            >
+              gitify-app requested changes
+            </span>
           </div>
         </div>
       </div>
     </div>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <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="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-done"
+        data-variant="invisible"
+        title="Mark 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="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-unsubscribe-from-thread"
+        data-variant="invisible"
+        title="Unsubscribe from thread"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell-slash"
+          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="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>
+    </div>
   </div>
-</div>
-`;
-
-exports[`renderer/components/notifications/AccountNotifications.tsx > should toggle account notifications visibility 1`] = `
-<div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+    id="148827438"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
+      <button
+        aria-describedby="_r_e_"
+        type="button"
+      >
+        <svg
+          aria-label="Issue"
+          class="octicon octicon-issue-opened text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="18"
+          overflow="visible"
+          role="img"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="18"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        id="_r_e_"
+        popover="auto"
+        role="tooltip"
+      >
+        Issue
+      </span>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+        class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
         data-align="stretch"
-        data-direction="horizontal"
+        data-direction="vertical"
+        data-gap="none"
         data-justify="start"
         data-padding="none"
         data-wrap="nowrap"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="py-0.5"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
+            <button
+              class="text-xs font-medium"
+              data-testid="view-repository"
+              title="Open repository ↗"
+              type="button"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -1877,151 +1140,822 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should tog
                 data-wrap="nowrap"
               >
                 <img
-                  alt="octocat"
+                  alt="gitify-app/notifications-test"
                   class="prc-Avatar-Avatar-0xaUi"
                   data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
                 />
                 <div
                   class="prc-Truncate-Truncate-2G1eo"
                   data-inline="true"
                   style="--truncate-max-width: 280px;"
-                  title="@octocat"
+                  title="gitify-app/notifications-test"
                 >
-                  @octocat
+                  gitify-app/notifications-test
                 </div>
               </div>
-            </span>
+            </button>
+            <div
+              class="text-xxs opacity-50"
+            >
+              456
+            </div>
+          </div>
+        </div>
+        <div
+          class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
+          data-align="start"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="space-between"
+          data-padding="none"
+          data-testid="notification-row"
+          data-wrap="nowrap"
+          title="Improve the UI [#456]"
+        >
+          <span
+            class="truncate prc-Text-Text-9mHv3"
+          >
             <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
+              class="prc-Text-Text-9mHv3"
             >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                2
-                )
-              </span>
+              Improve the UI
             </span>
           </span>
-        </button>
+          <span
+            class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
+          >
+            456
+          </span>
+        </div>
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+          class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
           data-align="center"
           data-direction="horizontal"
-          data-gap="none"
+          data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-wrap="nowrap"
+          data-wrap="wrap"
         >
-          <button
-            aria-label="My issues ↗"
-            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="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-opened"
+              class="octicon octicon-feed-person"
               display="inline-block"
               fill="currentColor"
               focusable="false"
-              height="16"
+              height="14"
               overflow="visible"
               style="vertical-align: text-bottom;"
               viewBox="0 0 16 16"
-              width="16"
+              width="14"
             >
               <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
               />
             </svg>
-          </button>
-          <button
-            aria-label="My pull requests ↗"
-            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="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
+          </div>
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
+            <span
+              class="pr-1 prc-Text-Text-9mHv3"
+              title="You created the thread."
+            >
+              Authored
+            </span>
+            <relative-time
+              datetime="2017-05-20T17:06:34.000Z"
+            >
+              May 20, 2017
+            </relative-time>
+          </div>
+          <div
+            class="flex gap-1"
+          />
+        </div>
+      </div>
+    </div>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <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="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-done"
+        data-variant="invisible"
+        title="Mark 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="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-unsubscribe-from-thread"
+        data-variant="invisible"
+        title="Unsubscribe from thread"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell-slash"
+          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="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>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - group notifications by repositories 1`] = `
+<div>
+  <div
+    class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
+  >
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="account-profile"
+      data-variant="invisible"
+      title="Open account profile"
+      type="button"
+    >
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
+      >
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="octocat"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
               height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
+              src="https://avatars.githubusercontent.com/u/583231?v=4"
+              style="--avatarSize-regular: 16px;"
               width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@octocat"
             >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="Hide account 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="account-toggle"
-            data-variant="invisible"
-            title="Hide account notifications"
-            type="button"
+              @octocat
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
+            2
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            2
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="My issues ↗"
+        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="account-issues"
+        data-variant="invisible"
+        title="My issues ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="My pull requests ↗"
+        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="account-pull-requests"
+        data-variant="invisible"
+        title="My pull requests ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="Hide account 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="account-toggle"
+        data-variant="invisible"
+        title="Hide account notifications"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-down"
+          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="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>
+    </div>
+  </div>
+  <div>
+    RepositoryNotifications
+  </div>
+</div>
+`;
+
+exports[`renderer/components/notifications/AccountNotifications.tsx > should render itself - no notifications 1`] = `
+<div>
+  <div
+    class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
+  >
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="account-profile"
+      data-variant="invisible"
+      title="Open account profile"
+      type="button"
+    >
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
+      >
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="octocat"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
               height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
+              src="https://avatars.githubusercontent.com/u/583231?v=4"
+              style="--avatarSize-regular: 16px;"
               width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@octocat"
             >
-              <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"
-              />
-            </svg>
-          </button>
+              @octocat
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
+          >
+            0
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            0
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="My issues ↗"
+        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="account-issues"
+        data-variant="invisible"
+        title="My issues ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="My pull requests ↗"
+        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="account-pull-requests"
+        data-variant="invisible"
+        title="My pull requests ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="No notifications for account"
+        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="account-toggle"
+        data-variant="invisible"
+        title="No notifications for account"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-left"
+          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="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+          />
+        </svg>
+      </button>
+    </div>
+  </div>
+  <div
+    class="prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
+  >
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-gap="condensed"
+      data-justify="center"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="vertical"
+        data-gap="spacious"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <div
+          class="text-7xl"
+        >
+          <img
+            alt="🎉"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f389.svg"
+          />
+        </div>
+        <div
+          class="text-xl font-semibold"
+        >
+          No new  notifications
         </div>
       </div>
-      <div>
-        RepositoryNotifications
-      </div>
     </div>
   </div>
 </div>
 `;
+
+exports[`renderer/components/notifications/AccountNotifications.tsx > should toggle account notifications visibility 1`] = `
+<div>
+  <div
+    class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
+  >
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="account-profile"
+      data-variant="invisible"
+      title="Open account profile"
+      type="button"
+    >
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
+      >
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="octocat"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
+              height="16"
+              src="https://avatars.githubusercontent.com/u/583231?v=4"
+              style="--avatarSize-regular: 16px;"
+              width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@octocat"
+            >
+              @octocat
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
+          >
+            2
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            2
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="My issues ↗"
+        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="account-issues"
+        data-variant="invisible"
+        title="My issues ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-issue-opened"
+          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="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="My pull requests ↗"
+        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="account-pull-requests"
+        data-variant="invisible"
+        title="My pull requests ↗"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-git-pull-request"
+          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="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="Hide account 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="account-toggle"
+        data-variant="invisible"
+        title="Hide account notifications"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-down"
+          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="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>
+    </div>
+  </div>
+  <div>
+    RepositoryNotifications
+  </div>
+</div>
+`;
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
index 2a6d2b3d9..936946389 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -3,181 +3,170 @@
 exports[`renderer/components/notifications/NotificationFooter.tsx > security alerts should use github icon for avatar > Repository Dependabot Alerts Thread 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="wrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      data-testid="view-profile"
+      title="gitify-app"
+      type="button"
     >
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="horizontal"
         data-gap="condensed"
         data-justify="start"
         data-padding="none"
-        data-wrap="wrap"
+        data-testid="avatar"
+        data-wrap="nowrap"
+      >
+        <img
+          alt="gitify-app"
+          class="prc-Avatar-Avatar-0xaUi"
+          data-component="Avatar"
+          height="14"
+          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+          style="--avatarSize-regular: 14px;"
+          width="14"
+        />
+      </div>
+    </button>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <span
+        class="pr-1 prc-Text-Text-9mHv3"
+        title="You're watching the repository."
+      >
+        Updated
+      </span>
+      <relative-time
+        datetime="2017-05-20T17:51:57.000Z"
+      >
+        May 20, 2017
+      </relative-time>
+    </div>
+    <div
+      class="flex gap-1"
+    >
+      <button
+        aria-describedby="_r_2_"
+        type="button"
       >
-        <button
-          data-testid="view-profile"
-          title="gitify-app"
-          type="button"
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
         >
           <div
             class="prc-Stack-Stack-UQ9k6"
             data-align="center"
             data-direction="horizontal"
-            data-gap="condensed"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
             data-wrap="nowrap"
           >
-            <img
-              alt="gitify-app"
-              class="prc-Avatar-Avatar-0xaUi"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-          </div>
-        </button>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-9mHv3"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
-        >
-          <button
-            aria-describedby="_r_4_"
-            type="button"
-          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-check text-gitify-icon-open"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <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>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <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>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_4_"
-            popover="auto"
-            role="tooltip"
-          >
-            octocat approved these changes
-          </span>
-          <button
-            aria-describedby="_r_5_"
-            type="button"
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_2_"
+        popover="auto"
+        role="tooltip"
+      >
+        octocat approved these changes
+      </span>
+      <button
+        aria-describedby="_r_3_"
+        type="button"
+      >
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-file-diff text-gitify-icon-closed"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <path
+                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+              />
+            </svg>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_5_"
-            popover="auto"
-            role="tooltip"
-          >
-            gitify-app requested changes
-          </span>
-        </div>
-      </div>
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_3_"
+        popover="auto"
+        role="tooltip"
+      >
+        gitify-app requested changes
+      </span>
     </div>
   </div>
 </div>
@@ -186,181 +175,170 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
 exports[`renderer/components/notifications/NotificationFooter.tsx > security alerts should use github icon for avatar > Repository Vulnerability Alert 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="wrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      data-testid="view-profile"
+      title="gitify-app"
+      type="button"
     >
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="horizontal"
         data-gap="condensed"
         data-justify="start"
         data-padding="none"
-        data-wrap="wrap"
+        data-testid="avatar"
+        data-wrap="nowrap"
+      >
+        <img
+          alt="gitify-app"
+          class="prc-Avatar-Avatar-0xaUi"
+          data-component="Avatar"
+          height="14"
+          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+          style="--avatarSize-regular: 14px;"
+          width="14"
+        />
+      </div>
+    </button>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <span
+        class="pr-1 prc-Text-Text-9mHv3"
+        title="You're watching the repository."
+      >
+        Updated
+      </span>
+      <relative-time
+        datetime="2017-05-20T17:51:57.000Z"
+      >
+        May 20, 2017
+      </relative-time>
+    </div>
+    <div
+      class="flex gap-1"
+    >
+      <button
+        aria-describedby="_r_4_"
+        type="button"
       >
-        <button
-          data-testid="view-profile"
-          title="gitify-app"
-          type="button"
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
         >
           <div
             class="prc-Stack-Stack-UQ9k6"
             data-align="center"
             data-direction="horizontal"
-            data-gap="condensed"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
             data-wrap="nowrap"
           >
-            <img
-              alt="gitify-app"
-              class="prc-Avatar-Avatar-0xaUi"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-          </div>
-        </button>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-9mHv3"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
-        >
-          <button
-            aria-describedby="_r_7_"
-            type="button"
-          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-check text-gitify-icon-open"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <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>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <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>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_7_"
-            popover="auto"
-            role="tooltip"
-          >
-            octocat approved these changes
-          </span>
-          <button
-            aria-describedby="_r_8_"
-            type="button"
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_4_"
+        popover="auto"
+        role="tooltip"
+      >
+        octocat approved these changes
+      </span>
+      <button
+        aria-describedby="_r_5_"
+        type="button"
+      >
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-file-diff text-gitify-icon-closed"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <path
+                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+              />
+            </svg>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_8_"
-            popover="auto"
-            role="tooltip"
-          >
-            gitify-app requested changes
-          </span>
-        </div>
-      </div>
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_5_"
+        popover="auto"
+        role="tooltip"
+      >
+        gitify-app requested changes
+      </span>
     </div>
   </div>
 </div>
@@ -369,182 +347,171 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
 exports[`renderer/components/notifications/NotificationFooter.tsx > should default to known avatar if no user found 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="wrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-testid="avatar"
+      data-wrap="nowrap"
     >
-      <div
-        class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="wrap"
+      <svg
+        aria-hidden="true"
+        class="octicon octicon-feed-person"
+        display="inline-block"
+        fill="currentColor"
+        focusable="false"
+        height="14"
+        overflow="visible"
+        style="vertical-align: text-bottom;"
+        viewBox="0 0 16 16"
+        width="14"
       >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-testid="avatar"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-feed-person"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="14"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="14"
-          >
-            <path
-              d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-            />
-          </svg>
-        </div>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-9mHv3"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
+        <path
+          d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+        />
+      </svg>
+    </div>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <span
+        class="pr-1 prc-Text-Text-9mHv3"
+        title="You're watching the repository."
+      >
+        Updated
+      </span>
+      <relative-time
+        datetime="2017-05-20T17:51:57.000Z"
+      >
+        May 20, 2017
+      </relative-time>
+    </div>
+    <div
+      class="flex gap-1"
+    >
+      <button
+        aria-describedby="_r_6_"
+        type="button"
+      >
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
         >
-          <button
-            aria-describedby="_r_a_"
-            type="button"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-check text-gitify-icon-open"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <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>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <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>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_a_"
-            popover="auto"
-            role="tooltip"
-          >
-            octocat approved these changes
-          </span>
-          <button
-            aria-describedby="_r_b_"
-            type="button"
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_6_"
+        popover="auto"
+        role="tooltip"
+      >
+        octocat approved these changes
+      </span>
+      <button
+        aria-describedby="_r_7_"
+        type="button"
+      >
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-file-diff text-gitify-icon-closed"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <path
+                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+              />
+            </svg>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_b_"
-            popover="auto"
-            role="tooltip"
-          >
-            gitify-app requested changes
-          </span>
-        </div>
-      </div>
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_7_"
+        popover="auto"
+        role="tooltip"
+      >
+        gitify-app requested changes
+      </span>
     </div>
   </div>
 </div>
@@ -553,181 +520,170 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
 exports[`renderer/components/notifications/NotificationFooter.tsx > should render itself & its children 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="wrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      data-testid="view-profile"
+      title="gitify-app"
+      type="button"
     >
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="horizontal"
         data-gap="condensed"
         data-justify="start"
         data-padding="none"
-        data-wrap="wrap"
+        data-testid="avatar"
+        data-wrap="nowrap"
+      >
+        <img
+          alt="gitify-app"
+          class="prc-Avatar-Avatar-0xaUi"
+          data-component="Avatar"
+          height="14"
+          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+          style="--avatarSize-regular: 14px;"
+          width="14"
+        />
+      </div>
+    </button>
+    <div
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <span
+        class="pr-1 prc-Text-Text-9mHv3"
+        title="You're watching the repository."
+      >
+        Updated
+      </span>
+      <relative-time
+        datetime="2017-05-20T17:51:57.000Z"
+      >
+        May 20, 2017
+      </relative-time>
+    </div>
+    <div
+      class="flex gap-1"
+    >
+      <button
+        aria-describedby="_r_0_"
+        type="button"
       >
-        <button
-          data-testid="view-profile"
-          title="gitify-app"
-          type="button"
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
         >
           <div
             class="prc-Stack-Stack-UQ9k6"
             data-align="center"
             data-direction="horizontal"
-            data-gap="condensed"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
             data-wrap="nowrap"
           >
-            <img
-              alt="gitify-app"
-              class="prc-Avatar-Avatar-0xaUi"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-          </div>
-        </button>
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-9mHv3"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
-        >
-          <button
-            aria-describedby="_r_1_"
-            type="button"
-          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-check text-gitify-icon-open"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <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>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <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>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_1_"
-            popover="auto"
-            role="tooltip"
-          >
-            octocat approved these changes
-          </span>
-          <button
-            aria-describedby="_r_2_"
-            type="button"
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_0_"
+        popover="auto"
+        role="tooltip"
+      >
+        octocat approved these changes
+      </span>
+      <button
+        aria-describedby="_r_1_"
+        type="button"
+      >
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+          data-size="small"
+          data-variant="secondary"
+          tabindex="0"
+        >
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-file-diff text-gitify-icon-closed"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <path
+                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+              />
+            </svg>
             <span
-              class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-              data-size="small"
-              data-variant="secondary"
-              tabindex="0"
+              class="text-xxs px-1 prc-Text-Text-9mHv3"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-file-diff text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="12"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="12"
-                >
-                  <path
-                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                  />
-                </svg>
-                <span
-                  class="text-xxs px-1 prc-Text-Text-9mHv3"
-                >
-                  1
-                </span>
-              </div>
+              1
             </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="s"
-            id="_r_2_"
-            popover="auto"
-            role="tooltip"
-          >
-            gitify-app requested changes
-          </span>
-        </div>
-      </div>
+          </div>
+        </span>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="s"
+        id="_r_1_"
+        popover="auto"
+        role="tooltip"
+      >
+        gitify-app requested changes
+      </span>
     </div>
   </div>
 </div>
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
index 56705894c..913677afd 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
@@ -3,16 +3,22 @@
 exports[`renderer/components/notifications/NotificationHeader.tsx > should render itself & its children - group by date > with notification number 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="py-0.5"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
-      <div
-        class="py-0.5"
+      <button
+        class="text-xs font-medium"
+        data-testid="view-repository"
+        title="Open repository ↗"
+        type="button"
       >
         <div
           class="prc-Stack-Stack-UQ9k6"
@@ -21,49 +27,32 @@ exports[`renderer/components/notifications/NotificationHeader.tsx > should rende
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
+          data-testid="avatar"
           data-wrap="nowrap"
         >
-          <button
-            class="text-xs font-medium"
-            data-testid="view-repository"
-            title="Open repository ↗"
-            type="button"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
-            >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-0xaUi"
-                data-component="Avatar"
-                height="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 14px;"
-                width="14"
-              />
-              <div
-                class="prc-Truncate-Truncate-2G1eo"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
-              >
-                gitify-app/notifications-test
-              </div>
-            </div>
-          </button>
+          <img
+            alt="gitify-app/notifications-test"
+            class="prc-Avatar-Avatar-0xaUi"
+            data-component="Avatar"
+            height="14"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            style="--avatarSize-regular: 14px;"
+            width="14"
+          />
           <div
-            class="text-xxs opacity-50"
+            class="prc-Truncate-Truncate-2G1eo"
+            data-inline="true"
+            style="--truncate-max-width: 280px;"
+            title="gitify-app/notifications-test"
           >
-            123
+            gitify-app/notifications-test
           </div>
         </div>
+      </button>
+      <div
+        class="text-xxs opacity-50"
+      >
+        123
       </div>
     </div>
   </div>
@@ -73,16 +62,22 @@ exports[`renderer/components/notifications/NotificationHeader.tsx > should rende
 exports[`renderer/components/notifications/NotificationHeader.tsx > should render itself & its children - group by date > with showNumber setting disabled 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="py-0.5"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
-      <div
-        class="py-0.5"
+      <button
+        class="text-xs font-medium"
+        data-testid="view-repository"
+        title="Open repository ↗"
+        type="button"
       >
         <div
           class="prc-Stack-Stack-UQ9k6"
@@ -91,49 +86,32 @@ exports[`renderer/components/notifications/NotificationHeader.tsx > should rende
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
+          data-testid="avatar"
           data-wrap="nowrap"
         >
-          <button
-            class="text-xs font-medium"
-            data-testid="view-repository"
-            title="Open repository ↗"
-            type="button"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
-            >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-0xaUi"
-                data-component="Avatar"
-                height="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 14px;"
-                width="14"
-              />
-              <div
-                class="prc-Truncate-Truncate-2G1eo"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
-              >
-                gitify-app/notifications-test
-              </div>
-            </div>
-          </button>
+          <img
+            alt="gitify-app/notifications-test"
+            class="prc-Avatar-Avatar-0xaUi"
+            data-component="Avatar"
+            height="14"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            style="--avatarSize-regular: 14px;"
+            width="14"
+          />
           <div
-            class="text-xxs opacity-50 hidden"
+            class="prc-Truncate-Truncate-2G1eo"
+            data-inline="true"
+            style="--truncate-max-width: 280px;"
+            title="gitify-app/notifications-test"
           >
-            123
+            gitify-app/notifications-test
           </div>
         </div>
+      </button>
+      <div
+        class="text-xxs opacity-50 hidden"
+      >
+        123
       </div>
     </div>
   </div>
@@ -143,16 +121,22 @@ exports[`renderer/components/notifications/NotificationHeader.tsx > should rende
 exports[`renderer/components/notifications/NotificationHeader.tsx > should render itself & its children - group by date > without notification number 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="py-0.5"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
-      <div
-        class="py-0.5"
+      <button
+        class="text-xs font-medium"
+        data-testid="view-repository"
+        title="Open repository ↗"
+        type="button"
       >
         <div
           class="prc-Stack-Stack-UQ9k6"
@@ -161,66 +145,36 @@ exports[`renderer/components/notifications/NotificationHeader.tsx > should rende
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
+          data-testid="avatar"
           data-wrap="nowrap"
         >
-          <button
-            class="text-xs font-medium"
-            data-testid="view-repository"
-            title="Open repository ↗"
-            type="button"
-          >
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
-            >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-0xaUi"
-                data-component="Avatar"
-                height="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 14px;"
-                width="14"
-              />
-              <div
-                class="prc-Truncate-Truncate-2G1eo"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
-              >
-                gitify-app/notifications-test
-              </div>
-            </div>
-          </button>
+          <img
+            alt="gitify-app/notifications-test"
+            class="prc-Avatar-Avatar-0xaUi"
+            data-component="Avatar"
+            height="14"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            style="--avatarSize-regular: 14px;"
+            width="14"
+          />
           <div
-            class="text-xxs opacity-50"
+            class="prc-Truncate-Truncate-2G1eo"
+            data-inline="true"
+            style="--truncate-max-width: 280px;"
+            title="gitify-app/notifications-test"
           >
-            123
+            gitify-app/notifications-test
           </div>
         </div>
+      </button>
+      <div
+        class="text-xxs opacity-50"
+      >
+        123
       </div>
     </div>
   </div>
 </div>
 `;
 
-exports[`renderer/components/notifications/NotificationHeader.tsx > should render itself & its children - group by repositories 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/notifications/NotificationHeader.tsx > should render itself & its children - group by repositories 1`] = `<div />`;
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 540c9d94f..4ccec3a9d 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -3,73 +3,79 @@
 exports[`renderer/components/notifications/NotificationRow.tsx > should render itself & its children - group by date 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+    id="138661096"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
+      <button
+        aria-describedby="_r_0_"
+        type="button"
+      >
+        <svg
+          aria-label="Open Issue"
+          class="octicon octicon-issue-opened text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="18"
+          overflow="visible"
+          role="img"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="18"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        id="_r_0_"
+        popover="auto"
+        role="tooltip"
+      >
+        Open Issue
+      </span>
       <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
+        class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="py-0.5"
         >
-          <button
-            aria-describedby="_r_1_"
-            type="button"
-          >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            id="_r_1_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="py-0.5"
+            <button
+              class="text-xs font-medium"
+              data-testid="view-repository"
+              title="Open repository ↗"
+              type="button"
             >
               <div
                 class="prc-Stack-Stack-UQ9k6"
@@ -78,344 +84,327 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
-                <button
-                  class="text-xs font-medium"
-                  data-testid="view-repository"
-                  title="Open repository ↗"
-                  type="button"
-                >
-                  <div
-                    class="prc-Stack-Stack-UQ9k6"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="condensed"
-                    data-justify="start"
-                    data-padding="none"
-                    data-testid="avatar"
-                    data-wrap="nowrap"
-                  >
-                    <img
-                      alt="gitify-app/notifications-test"
-                      class="prc-Avatar-Avatar-0xaUi"
-                      data-component="Avatar"
-                      height="14"
-                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                      style="--avatarSize-regular: 14px;"
-                      width="14"
-                    />
-                    <div
-                      class="prc-Truncate-Truncate-2G1eo"
-                      data-inline="true"
-                      style="--truncate-max-width: 280px;"
-                      title="gitify-app/notifications-test"
-                    >
-                      gitify-app/notifications-test
-                    </div>
-                  </div>
-                </button>
+                <img
+                  alt="gitify-app/notifications-test"
+                  class="prc-Avatar-Avatar-0xaUi"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
                 <div
-                  class="text-xxs opacity-50"
+                  class="prc-Truncate-Truncate-2G1eo"
+                  data-inline="true"
+                  style="--truncate-max-width: 280px;"
+                  title="gitify-app/notifications-test"
                 >
-                  123
+                  gitify-app/notifications-test
                 </div>
               </div>
-            </div>
+            </button>
             <div
-              class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test! [#123]"
+              class="text-xxs opacity-50"
             >
-              <span
-                class="truncate prc-Text-Text-9mHv3"
-              >
-                <span
-                  class="prc-Text-Text-9mHv3"
-                >
-                  I am a robot and this is a test!
-                </span>
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
-              >
-                123
-              </span>
+              123
             </div>
+          </div>
+        </div>
+        <div
+          class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
+          data-align="start"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="space-between"
+          data-padding="none"
+          data-testid="notification-row"
+          data-wrap="nowrap"
+          title="I am a robot and this is a test! [#123]"
+        >
+          <span
+            class="truncate prc-Text-Text-9mHv3"
+          >
+            <span
+              class="prc-Text-Text-9mHv3"
+            >
+              I am a robot and this is a test!
+            </span>
+          </span>
+          <span
+            class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
+          >
+            123
+          </span>
+        </div>
+        <div
+          class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="wrap"
+        >
+          <button
+            data-testid="view-profile"
+            title="gitify-app"
+            type="button"
+          >
             <div
-              class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
+              class="prc-Stack-Stack-UQ9k6"
               data-align="center"
               data-direction="horizontal"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-wrap="wrap"
+              data-testid="avatar"
+              data-wrap="nowrap"
             >
-              <button
-                data-testid="view-profile"
-                title="gitify-app"
-                type="button"
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-0xaUi"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
+              />
+            </div>
+          </button>
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <span
+              class="pr-1 prc-Text-Text-9mHv3"
+              title="You're watching the repository."
+            >
+              Updated
+            </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
+          </div>
+          <div
+            class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_1_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
                 <div
                   class="prc-Stack-Stack-UQ9k6"
                   data-align="center"
                   data-direction="horizontal"
-                  data-gap="condensed"
+                  data-gap="none"
                   data-justify="start"
                   data-padding="none"
-                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-0xaUi"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
-                  />
-                </div>
-              </button>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-9mHv3"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <button
-                  aria-describedby="_r_2_"
-                  type="button"
-                >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <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>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
-                  </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_2_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  octocat approved these changes
-                </span>
-                <button
-                  aria-describedby="_r_3_"
-                  type="button"
-                >
+                    <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>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
+                    1
                   </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_3_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  gitify-app requested changes
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <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
+                </div>
+              </span>
+            </button>
+            <span
               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"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_1_"
+              popover="auto"
+              role="tooltip"
             >
-              <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="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-done"
-            data-variant="invisible"
-            title="Mark 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"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_2_"
+              type="button"
             >
-              <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="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-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
               aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_2_"
+              popover="auto"
+              role="tooltip"
             >
-              <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"
-              />
-            </svg>
-          </button>
+              gitify-app requested changes
+            </span>
+          </div>
         </div>
       </div>
     </div>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <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="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-done"
+        data-variant="invisible"
+        title="Mark 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="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-unsubscribe-from-thread"
+        data-variant="invisible"
+        title="Unsubscribe from thread"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell-slash"
+          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="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>
+    </div>
   </div>
 </div>
 `;
@@ -423,365 +412,354 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
 exports[`renderer/components/notifications/NotificationRow.tsx > should render itself & its children - group by repositories 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+    id="138661096"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
+      <button
+        aria-describedby="_r_6_"
+        type="button"
+      >
+        <svg
+          aria-label="Open Issue"
+          class="octicon octicon-issue-opened text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="18"
+          overflow="visible"
+          role="img"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="18"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        id="_r_6_"
+        popover="auto"
+        role="tooltip"
+      >
+        Open Issue
+      </span>
       <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
+        class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
+          class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
+          data-align="start"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="space-between"
+          data-padding="none"
+          data-testid="notification-row"
+          data-wrap="nowrap"
+          title="I am a robot and this is a test! [#123]"
+        >
+          <span
+            class="truncate prc-Text-Text-9mHv3"
+          >
+            <span
+              class="prc-Text-Text-9mHv3"
+            >
+              I am a robot and this is a test!
+            </span>
+          </span>
+          <span
+            class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-9mHv3"
+          >
+            123
+          </span>
+        </div>
+        <div
+          class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-wrap="nowrap"
+          data-wrap="wrap"
         >
           <button
-            aria-describedby="_r_8_"
+            data-testid="view-profile"
+            title="gitify-app"
             type="button"
           >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
+            <div
+              class="prc-Stack-Stack-UQ9k6"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-0xaUi"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
               />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
+            </div>
           </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            id="_r_8_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
+            class="prc-Stack-Stack-UQ9k6"
             data-align="stretch"
-            data-direction="vertical"
+            data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test! [#123]"
+            <span
+              class="pr-1 prc-Text-Text-9mHv3"
+              title="You're watching the repository."
             >
-              <span
-                class="truncate prc-Text-Text-9mHv3"
-              >
-                <span
-                  class="prc-Text-Text-9mHv3"
-                >
-                  I am a robot and this is a test!
-                </span>
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-9mHv3"
-              >
-                123
-              </span>
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="wrap"
+              Updated
+            </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
             >
-              <button
-                data-testid="view-profile"
-                title="gitify-app"
-                type="button"
+              May 20, 2017
+            </relative-time>
+          </div>
+          <div
+            class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_7_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
                 <div
                   class="prc-Stack-Stack-UQ9k6"
                   data-align="center"
                   data-direction="horizontal"
-                  data-gap="condensed"
+                  data-gap="none"
                   data-justify="start"
                   data-padding="none"
-                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-0xaUi"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
-                  />
-                </div>
-              </button>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-9mHv3"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <button
-                  aria-describedby="_r_9_"
-                  type="button"
-                >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <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>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
-                  </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_9_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  octocat approved these changes
-                </span>
-                <button
-                  aria-describedby="_r_a_"
-                  type="button"
-                >
+                    <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>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
+                    1
                   </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_a_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  gitify-app requested changes
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <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
+                </div>
+              </span>
+            </button>
+            <span
               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"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_7_"
+              popover="auto"
+              role="tooltip"
             >
-              <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="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-done"
-            data-variant="invisible"
-            title="Mark 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"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_8_"
+              type="button"
             >
-              <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="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-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
+              >
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
+            </button>
+            <span
               aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_8_"
+              popover="auto"
+              role="tooltip"
             >
-              <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"
-              />
-            </svg>
-          </button>
+              gitify-app requested changes
+            </span>
+          </div>
         </div>
       </div>
     </div>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <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="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-done"
+        data-variant="invisible"
+        title="Mark 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="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-unsubscribe-from-thread"
+        data-variant="invisible"
+        title="Unsubscribe from thread"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell-slash"
+          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="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>
+    </div>
   </div>
 </div>
 `;
@@ -789,365 +767,354 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
 exports[`renderer/components/notifications/NotificationRow.tsx > should render itself & its children - hide numbers 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+    id="138661096"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
+      <button
+        aria-describedby="_r_c_"
+        type="button"
+      >
+        <svg
+          aria-label="Open Issue"
+          class="octicon octicon-issue-opened text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="18"
+          overflow="visible"
+          role="img"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="18"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        id="_r_c_"
+        popover="auto"
+        role="tooltip"
+      >
+        Open Issue
+      </span>
       <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
+        class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
+          class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
+          data-align="start"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="space-between"
+          data-padding="none"
+          data-testid="notification-row"
+          data-wrap="nowrap"
+          title="I am a robot and this is a test! [#123]"
+        >
+          <span
+            class="truncate prc-Text-Text-9mHv3"
+          >
+            <span
+              class="prc-Text-Text-9mHv3"
+            >
+              I am a robot and this is a test!
+            </span>
+          </span>
+          <span
+            class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
+          >
+            123
+          </span>
+        </div>
+        <div
+          class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-wrap="nowrap"
+          data-wrap="wrap"
         >
           <button
-            aria-describedby="_r_f_"
+            data-testid="view-profile"
+            title="gitify-app"
             type="button"
           >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
+            <div
+              class="prc-Stack-Stack-UQ9k6"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-0xaUi"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
               />
-            </svg>
+            </div>
           </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            id="_r_f_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
+            class="prc-Stack-Stack-UQ9k6"
             data-align="stretch"
-            data-direction="vertical"
+            data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test! [#123]"
+            <span
+              class="pr-1 prc-Text-Text-9mHv3"
+              title="You're watching the repository."
+            >
+              Updated
+            </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
+          </div>
+          <div
+            class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_d_"
+              type="button"
             >
               <span
-                class="truncate prc-Text-Text-9mHv3"
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <span
-                  class="prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  I am a robot and this is a test!
-                </span>
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-9mHv3"
-              >
-                123
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <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>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
               </span>
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="wrap"
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_d_"
+              popover="auto"
+              role="tooltip"
             >
-              <button
-                data-testid="view-profile"
-                title="gitify-app"
-                type="button"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_e_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
                 <div
                   class="prc-Stack-Stack-UQ9k6"
                   data-align="center"
                   data-direction="horizontal"
-                  data-gap="condensed"
+                  data-gap="none"
                   data-justify="start"
                   data-padding="none"
-                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-0xaUi"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
-                  />
-                </div>
-              </button>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-9mHv3"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <button
-                  aria-describedby="_r_g_"
-                  type="button"
-                >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <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>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
-                  </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_g_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  octocat approved these changes
-                </span>
-                <button
-                  aria-describedby="_r_h_"
-                  type="button"
-                >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
+                    1
                   </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_h_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  gitify-app requested changes
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <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="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-done"
-            data-variant="invisible"
-            title="Mark 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="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-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
+                </div>
+              </span>
+            </button>
+            <span
               aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_e_"
+              popover="auto"
+              role="tooltip"
             >
-              <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"
-              />
-            </svg>
-          </button>
+              gitify-app requested changes
+            </span>
+          </div>
         </div>
       </div>
     </div>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <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="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-done"
+        data-variant="invisible"
+        title="Mark 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="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-unsubscribe-from-thread"
+        data-variant="invisible"
+        title="Unsubscribe from thread"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell-slash"
+          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="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>
+    </div>
   </div>
 </div>
 `;
@@ -1155,307 +1122,296 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
 exports[`renderer/components/notifications/NotificationRow.tsx > should render itself & its children - notification is read 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover opacity-50"
+    id="138661096"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
+      <button
+        aria-describedby="_r_i_"
+        type="button"
+      >
+        <svg
+          aria-label="Open Issue"
+          class="octicon octicon-issue-opened text-gitify-icon-open"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="18"
+          overflow="visible"
+          role="img"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="18"
+        >
+          <path
+            d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+          />
+          <path
+            d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+          />
+        </svg>
+      </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-direction="e"
+        id="_r_i_"
+        popover="auto"
+        role="tooltip"
+      >
+        Open Issue
+      </span>
       <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover opacity-50"
-        id="138661096"
+        class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
       >
         <div
-          class="prc-Stack-Stack-UQ9k6"
+          class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
+          data-align="start"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="space-between"
+          data-padding="none"
+          data-testid="notification-row"
+          data-wrap="nowrap"
+          title="I am a robot and this is a test! [#123]"
+        >
+          <span
+            class="truncate prc-Text-Text-9mHv3"
+          >
+            <span
+              class="prc-Text-Text-9mHv3"
+            >
+              I am a robot and this is a test!
+            </span>
+          </span>
+          <span
+            class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-9mHv3"
+          >
+            123
+          </span>
+        </div>
+        <div
+          class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-wrap="nowrap"
+          data-wrap="wrap"
         >
           <button
-            aria-describedby="_r_m_"
+            data-testid="view-profile"
+            title="gitify-app"
             type="button"
           >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
+            <div
+              class="prc-Stack-Stack-UQ9k6"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-0xaUi"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
               />
-            </svg>
+            </div>
           </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-tLeuB"
-            data-direction="e"
-            id="_r_m_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-UQ9k6"
+            class="prc-Stack-Stack-UQ9k6"
             data-align="stretch"
-            data-direction="vertical"
+            data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="mb-0.5 truncate prc-Stack-Stack-UQ9k6"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test! [#123]"
+            <span
+              class="pr-1 prc-Text-Text-9mHv3"
+              title="You're watching the repository."
+            >
+              Updated
+            </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
+          </div>
+          <div
+            class="flex gap-1"
+          >
+            <button
+              aria-describedby="_r_j_"
+              type="button"
             >
               <span
-                class="truncate prc-Text-Text-9mHv3"
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
-                <span
-                  class="prc-Text-Text-9mHv3"
+                <div
+                  class="prc-Stack-Stack-UQ9k6"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  I am a robot and this is a test!
-                </span>
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-9mHv3"
-              >
-                123
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <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>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
+                  >
+                    1
+                  </span>
+                </div>
               </span>
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="wrap"
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_j_"
+              popover="auto"
+              role="tooltip"
             >
-              <button
-                data-testid="view-profile"
-                title="gitify-app"
-                type="button"
+              octocat approved these changes
+            </span>
+            <button
+              aria-describedby="_r_k_"
+              type="button"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
+                data-size="small"
+                data-variant="secondary"
+                tabindex="0"
               >
                 <div
                   class="prc-Stack-Stack-UQ9k6"
                   data-align="center"
                   data-direction="horizontal"
-                  data-gap="condensed"
+                  data-gap="none"
                   data-justify="start"
                   data-padding="none"
-                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-0xaUi"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
-                  />
-                </div>
-              </button>
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-9mHv3"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <button
-                  aria-describedby="_r_n_"
-                  type="button"
-                >
-                  <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-check text-gitify-icon-open"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <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>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
-                  </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_n_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  octocat approved these changes
-                </span>
-                <button
-                  aria-describedby="_r_o_"
-                  type="button"
-                >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
                   <span
-                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label-qG-Zu"
-                    data-size="small"
-                    data-variant="secondary"
-                    tabindex="0"
+                    class="text-xxs px-1 prc-Text-Text-9mHv3"
                   >
-                    <div
-                      class="prc-Stack-Stack-UQ9k6"
-                      data-align="center"
-                      data-direction="horizontal"
-                      data-gap="none"
-                      data-justify="start"
-                      data-padding="none"
-                      data-wrap="nowrap"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-file-diff text-gitify-icon-closed"
-                        display="inline-block"
-                        fill="currentColor"
-                        focusable="false"
-                        height="12"
-                        overflow="visible"
-                        style="vertical-align: text-bottom;"
-                        viewBox="0 0 16 16"
-                        width="12"
-                      >
-                        <path
-                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                        />
-                      </svg>
-                      <span
-                        class="text-xxs px-1 prc-Text-Text-9mHv3"
-                      >
-                        1
-                      </span>
-                    </div>
+                    1
                   </span>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="s"
-                  id="_r_o_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  gitify-app requested changes
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            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-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
+                </div>
+              </span>
+            </button>
+            <span
               aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              class="prc-TooltipV2-Tooltip-tLeuB"
+              data-direction="s"
+              id="_r_k_"
+              popover="auto"
+              role="tooltip"
             >
-              <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"
-              />
-            </svg>
-          </button>
+              gitify-app requested changes
+            </span>
+          </div>
         </div>
       </div>
     </div>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        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-unsubscribe-from-thread"
+        data-variant="invisible"
+        title="Unsubscribe from thread"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-bell-slash"
+          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="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>
+    </div>
   </div>
 </div>
 `;
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationTitle.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationTitle.test.tsx.snap
index 3e95ceff5..a673ed09f 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationTitle.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationTitle.test.tsx.snap
@@ -2,220 +2,143 @@
 
 exports[`renderer/components/notifications/NotificationTitle.tsx > should apply truncate className when wrapNotificationTitle is false 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="truncate prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="truncate prc-Text-Text-9mHv3"
-      >
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-          refactor: migrate deprecated atlaskit 
-        </span>
-        <span
-          class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
-        >
-          xcss
-        </span>
-      </span>
-    </div>
-  </div>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+      refactor: migrate deprecated atlaskit 
+    </span>
+    <span
+      class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
+    >
+      xcss
+    </span>
+  </span>
 </div>
 `;
 
 exports[`renderer/components/notifications/NotificationTitle.tsx > should not apply truncate className when wrapNotificationTitle is true 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="prc-Text-Text-9mHv3"
-      >
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-          refactor: migrate deprecated atlaskit 
-        </span>
-        <span
-          class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
-        >
-          xcss
-        </span>
-      </span>
-    </div>
-  </div>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+      refactor: migrate deprecated atlaskit 
+    </span>
+    <span
+      class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
+    >
+      xcss
+    </span>
+  </span>
 </div>
 `;
 
 exports[`renderer/components/notifications/NotificationTitle.tsx > should render plain text without code blocks 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="truncate prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="truncate prc-Text-Text-9mHv3"
-      >
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-          Simple notification title
-        </span>
-      </span>
-    </div>
-  </div>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+      Simple notification title
+    </span>
+  </span>
 </div>
 `;
 
 exports[`renderer/components/notifications/NotificationTitle.tsx > should render text with code block at the end 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="truncate prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="truncate prc-Text-Text-9mHv3"
-      >
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-          Fix issue with 
-        </span>
-        <span
-          class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
-        >
-          render
-        </span>
-      </span>
-    </div>
-  </div>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+      Fix issue with 
+    </span>
+    <span
+      class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
+    >
+      render
+    </span>
+  </span>
 </div>
 `;
 
 exports[`renderer/components/notifications/NotificationTitle.tsx > should render text with code block at the start 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="truncate prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="truncate prc-Text-Text-9mHv3"
-      >
-        <span
-          class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
-        >
-          useState
-        </span>
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-           hook implementation
-        </span>
-      </span>
-    </div>
-  </div>
+    <span
+      class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
+    >
+      useState
+    </span>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+       hook implementation
+    </span>
+  </span>
 </div>
 `;
 
 exports[`renderer/components/notifications/NotificationTitle.tsx > should render text with multiple inline code blocks 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="truncate prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="truncate prc-Text-Text-9mHv3"
-      >
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-          Replace 
-        </span>
-        <span
-          class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
-        >
-          foo
-        </span>
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-           with 
-        </span>
-        <span
-          class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
-        >
-          bar
-        </span>
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-           in config
-        </span>
-      </span>
-    </div>
-  </div>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+      Replace 
+    </span>
+    <span
+      class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
+    >
+      foo
+    </span>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+       with 
+    </span>
+    <span
+      class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
+    >
+      bar
+    </span>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+       in config
+    </span>
+  </span>
 </div>
 `;
 
 exports[`renderer/components/notifications/NotificationTitle.tsx > should render text with single inline code block 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="truncate prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="truncate prc-Text-Text-9mHv3"
-      >
-        <span
-          class="prc-Text-Text-9mHv3"
-        >
-          refactor: migrate deprecated atlaskit 
-        </span>
-        <span
-          class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
-        >
-          xcss
-        </span>
-      </span>
-    </div>
-  </div>
+    <span
+      class="prc-Text-Text-9mHv3"
+    >
+      refactor: migrate deprecated atlaskit 
+    </span>
+    <span
+      class="px-1 py-0.5 rounded bg-gitify-notification-hover font-mono text-xs prc-Text-Text-9mHv3"
+    >
+      xcss
+    </span>
+  </span>
 </div>
 `;
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index 88a88f16e..0525bfe64 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -3,751 +3,707 @@
 exports[`renderer/components/notifications/RepositoryNotifications.tsx > should render itself & its children - all notifications are read 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="open-repository"
+      data-variant="invisible"
+      title="Open repository ↗"
+      type="button"
     >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <img
-                  alt="gitify-app/notifications-test"
-                  class="prc-Avatar-Avatar-0xaUi"
-                  data-component="Avatar"
-                  height="18"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 18px;"
-                  width="18"
-                />
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
-                >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
+            <img
+              alt="gitify-app/notifications-test"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
+              height="18"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              style="--avatarSize-regular: 18px;"
+              width="18"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="gitify-app/notifications-test"
             >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+              gitify-app/notifications-test
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
         >
-          <button
-            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-toggle"
-            data-variant="invisible"
-            title="Hide repository notifications"
-            type="button"
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              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="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>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
+            2
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            2
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        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-toggle"
+        data-variant="invisible"
+        title="Hide repository notifications"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-down"
+          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="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>
     </div>
   </div>
+  <div>
+    NotificationRow
+  </div>
+  <div>
+    NotificationRow
+  </div>
 </div>
 `;
 
 exports[`renderer/components/notifications/RepositoryNotifications.tsx > should render itself & its children 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="open-repository"
+      data-variant="invisible"
+      title="Open repository ↗"
+      type="button"
     >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <img
-                  alt="gitify-app/notifications-test"
-                  class="prc-Avatar-Avatar-0xaUi"
-                  data-component="Avatar"
-                  height="18"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 18px;"
-                  width="18"
-                />
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
-                >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
+            <img
+              alt="gitify-app/notifications-test"
+              class="prc-Avatar-Avatar-0xaUi"
+              data-component="Avatar"
+              height="18"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              style="--avatarSize-regular: 18px;"
+              width="18"
+            />
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="gitify-app/notifications-test"
             >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+              gitify-app/notifications-test
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
         >
-          <button
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
-            data-variant="invisible"
-            title="Mark repository as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-label="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"
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
           >
-            <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="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-toggle"
-            data-variant="invisible"
-            title="Hide repository notifications"
-            type="button"
+            2
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              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="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>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
+             (
+            2
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="Mark repository as read"
+        class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
+        data-component="IconButton"
+        data-loading="false"
+        data-no-visuals="true"
+        data-size="small"
+        data-testid="repository-mark-as-read"
+        data-variant="invisible"
+        title="Mark repository as read"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-read"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
+        >
+          <path
+            d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="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="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-toggle"
+        data-variant="invisible"
+        title="Hide repository notifications"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-down"
+          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="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>
     </div>
   </div>
+  <div>
+    NotificationRow
+  </div>
+  <div>
+    NotificationRow
+  </div>
 </div>
 `;
 
 exports[`renderer/components/notifications/RepositoryNotifications.tsx > should toggle repository notifications visibility 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="open-repository"
+      data-variant="invisible"
+      title="Open repository ↗"
+      type="button"
     >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
-          >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-feed-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="18"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="18"
-                >
-                  <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-                  />
-                </svg>
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
-                >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
-            data-variant="invisible"
-            title="Mark repository as read"
-            type="button"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-read"
+              class="octicon octicon-feed-person"
               display="inline-block"
               fill="currentColor"
               focusable="false"
-              height="16"
+              height="18"
               overflow="visible"
               style="vertical-align: text-bottom;"
               viewBox="0 0 16 16"
-              width="16"
+              width="18"
             >
               <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="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
               />
             </svg>
-          </button>
-          <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"
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="gitify-app/notifications-test"
             >
-              <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="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-toggle"
-            data-variant="invisible"
-            title="Hide repository notifications"
-            type="button"
+              gitify-app/notifications-test
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              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="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>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
+            2
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            2
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="Mark repository as read"
+        class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
+        data-component="IconButton"
+        data-loading="false"
+        data-no-visuals="true"
+        data-size="small"
+        data-testid="repository-mark-as-read"
+        data-variant="invisible"
+        title="Mark repository as read"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-read"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
+        >
+          <path
+            d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="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="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-toggle"
+        data-variant="invisible"
+        title="Hide repository notifications"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-down"
+          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="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>
     </div>
   </div>
+  <div>
+    NotificationRow
+  </div>
+  <div>
+    NotificationRow
+  </div>
 </div>
 `;
 
 exports[`renderer/components/notifications/RepositoryNotifications.tsx > should use default repository icon when avatar is not available 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
+    data-align="stretch"
+    data-direction="horizontal"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <button
+      class="prc-Button-ButtonBase-9n-Xk"
+      data-has-count="true"
+      data-loading="false"
+      data-no-visuals="true"
+      data-size="medium"
+      data-testid="open-repository"
+      data-variant="invisible"
+      title="Open repository ↗"
+      type="button"
     >
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-UQ9k6"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+      <span
+        class="prc-Button-ButtonContent-Iohp5"
+        data-align="center"
+        data-component="buttonContent"
       >
-        <button
-          class="prc-Button-ButtonBase-9n-Xk"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <span
+          class="prc-Button-Label-FWkx3"
+          data-component="text"
         >
-          <span
-            class="prc-Button-ButtonContent-Iohp5"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
             data-align="center"
-            data-component="buttonContent"
-          >
-            <span
-              class="prc-Button-Label-FWkx3"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-feed-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="18"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="18"
-                >
-                  <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-                  />
-                </svg>
-                <div
-                  class="prc-Truncate-Truncate-2G1eo"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
-                >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-E4cnq"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
-                data-component="ButtonCounter"
-                data-variant="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
-            data-variant="invisible"
-            title="Mark repository as read"
-            type="button"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-read"
+              class="octicon octicon-feed-person"
               display="inline-block"
               fill="currentColor"
               focusable="false"
-              height="16"
+              height="18"
               overflow="visible"
               style="vertical-align: text-bottom;"
               viewBox="0 0 16 16"
-              width="16"
+              width="18"
             >
               <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="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
               />
             </svg>
-          </button>
-          <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"
+            <div
+              class="prc-Truncate-Truncate-2G1eo"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="gitify-app/notifications-test"
             >
-              <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="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-toggle"
-            data-variant="invisible"
-            title="Hide repository notifications"
-            type="button"
+              gitify-app/notifications-test
+            </div>
+          </div>
+        </span>
+        <span
+          class="prc-Button-VisualWrap-E4cnq"
+          data-component="trailingVisual"
+        >
+          <span
+            aria-hidden="true"
+            class="prc-Button-CounterLabel-5hAs4 prc-CounterLabel-CounterLabel-X-kRU"
+            data-component="ButtonCounter"
+            data-variant="secondary"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              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="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>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
+            2
+          </span>
+          <span
+            class="prc-VisuallyHidden-VisuallyHidden-Q0qSB"
+          >
+             (
+            2
+            )
+          </span>
+        </span>
+      </span>
+    </button>
+    <div
+      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="none"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
+      <button
+        aria-label="Mark repository as read"
+        class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
+        data-component="IconButton"
+        data-loading="false"
+        data-no-visuals="true"
+        data-size="small"
+        data-testid="repository-mark-as-read"
+        data-variant="invisible"
+        title="Mark repository as read"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-read"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
+        >
+          <path
+            d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+          />
+        </svg>
+      </button>
+      <button
+        aria-label="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="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-toggle"
+        data-variant="invisible"
+        title="Hide repository notifications"
+        type="button"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-chevron-down"
+          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="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>
     </div>
   </div>
+  <div>
+    NotificationRow
+  </div>
+  <div>
+    NotificationRow
+  </div>
 </div>
 `;
diff --git a/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap
index e56090903..e8cdf1ba6 100644
--- a/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap
@@ -2,21 +2,10 @@
 
 exports[`renderer/components/primitives/CustomCounter.tsx > should render itself & its children 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <span
+    class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <span
-        class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-9mHv3"
-      >
-        100
-      </span>
-    </div>
-  </div>
+    100
+  </span>
 </div>
 `;
diff --git a/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap
index cae4b1bc4..2a950bd71 100644
--- a/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap
@@ -3,25 +3,14 @@
 exports[`renderer/components/primitives/EmojiText.tsx > should render 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="text-7xl"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="text-7xl"
-      >
-        <img
-          alt="🍺"
-          class="emoji"
-          draggable="false"
-          src="/mock/images/assets/1f37a.svg"
-        />
-      </div>
-    </div>
+    <img
+      alt="🍺"
+      class="emoji"
+      draggable="false"
+      src="/mock/images/assets/1f37a.svg"
+    />
   </div>
 </div>
 `;
diff --git a/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap
index dda0fc622..e29b47e73 100644
--- a/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap
@@ -3,28 +3,17 @@
 exports[`renderer/components/primitives/Footer.tsx > should render itself & its children - end 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="left-sidebar bg-gitify-footer"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-justify="end"
+      data-padding="condensed"
+      data-wrap="nowrap"
     >
-      <div
-        class="left-sidebar bg-gitify-footer"
-      >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="end"
-          data-padding="condensed"
-          data-wrap="nowrap"
-        >
-          Test
-        </div>
-      </div>
+      Test
     </div>
   </div>
 </div>
@@ -33,28 +22,17 @@ exports[`renderer/components/primitives/Footer.tsx > should render itself & its
 exports[`renderer/components/primitives/Footer.tsx > should render itself & its children - space-between 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="left-sidebar bg-gitify-footer"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-justify="space-between"
+      data-padding="condensed"
+      data-wrap="nowrap"
     >
-      <div
-        class="left-sidebar bg-gitify-footer"
-      >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="condensed"
-          data-wrap="nowrap"
-        >
-          Test
-        </div>
-      </div>
+      Test
     </div>
   </div>
 </div>
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index 5bf8e1381..c1757d190 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -3,39 +3,61 @@
 exports[`renderer/components/primitives/Header.tsx > should render itself & its children 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="pl-4 pr-5 pt-3 pb-1"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="stretch"
+      data-direction="horizontal"
+      data-justify="space-between"
+      data-padding="none"
+      data-wrap="nowrap"
     >
-      <div
-        class="pl-4 pr-5 pt-3 pb-1"
+      <button
+        aria-labelledby="Go Back"
+        class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
+        data-component="IconButton"
+        data-loading="false"
+        data-no-visuals="true"
+        data-size="medium"
+        data-testid="header-nav-back"
+        data-variant="invisible"
+        type="button"
       >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-arrow-left"
+          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.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+          />
+        </svg>
+      </button>
+      <legend>
         <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="mb-2"
         >
-          <button
-            aria-labelledby="Go Back"
-            class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="header-nav-back"
-            data-variant="invisible"
-            type="button"
+          <div
+            class="prc-Stack-Stack-UQ9k6"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-test-header"
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-arrow-left"
+              class="octicon octicon-mark-github"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -46,50 +68,17 @@ exports[`renderer/components/primitives/Header.tsx > should render itself & its
               width="16"
             >
               <path
-                d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+                d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
               />
             </svg>
-          </button>
-          <legend>
-            <div
-              class="mb-2"
+            <h4
+              class="prc-Heading-Heading-MtWFE"
             >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="title-test-header"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  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="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-                  />
-                </svg>
-                <h4
-                  class="prc-Heading-Heading-MtWFE"
-                >
-                  Test Header
-                </h4>
-              </div>
-            </div>
-          </legend>
+              Test Header
+            </h4>
+          </div>
         </div>
-      </div>
+      </legend>
     </div>
   </div>
 </div>
diff --git a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
index 573a77b77..178efbac8 100644
--- a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
@@ -1,61 +1,37 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`renderer/components/primitives/HoverButton.tsx > should render - disabled 1`] = `
-<div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    />
-  </div>
-</div>
-`;
+exports[`renderer/components/primitives/HoverButton.tsx > should render - disabled 1`] = `<div />`;
 
 exports[`renderer/components/primitives/HoverButton.tsx > should render 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+  <button
+    aria-label="Hover Button"
+    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="hover-button"
+    data-variant="invisible"
+    title="Hover Button"
+    type="button"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+    <svg
+      aria-hidden="true"
+      class="octicon octicon-mark-github"
+      display="inline-block"
+      fill="currentColor"
+      focusable="false"
+      height="16"
+      overflow="visible"
+      style="vertical-align: text-bottom;"
+      viewBox="0 0 16 16"
+      width="16"
     >
-      <button
-        aria-label="Hover Button"
-        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="hover-button"
-        data-variant="invisible"
-        title="Hover Button"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github"
-          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="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-          />
-        </svg>
-      </button>
-    </div>
-  </div>
+      <path
+        d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
+      />
+    </svg>
+  </button>
 </div>
 `;
diff --git a/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap
index 5ed381a87..c4ad13372 100644
--- a/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap
@@ -3,26 +3,15 @@
 exports[`renderer/components/primitives/HoverGroup.tsx > should render 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="none"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
   >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-UQ9k6"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        Hover Group
-      </div>
-    </div>
+    Hover Group
   </div>
 </div>
 `;
diff --git a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
index d50714279..e0abd5fea 100644
--- a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
@@ -2,108 +2,86 @@
 
 exports[`renderer/routes/components/primitives/Title.tsx > should render the title - default size 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
+  <legend>
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="mb-2"
     >
-      <legend>
-        <div
-          class="mb-2"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+        id="title-legend"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-person-fill"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-legend"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person-fill"
-              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="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
-              />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-MtWFE"
-            >
-              Legend
-            </h4>
-          </div>
-        </div>
-      </legend>
+          <path
+            d="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
+          />
+        </svg>
+        <h4
+          class="prc-Heading-Heading-MtWFE"
+        >
+          Legend
+        </h4>
+      </div>
     </div>
-  </div>
+  </legend>
 </div>
 `;
 
 exports[`renderer/routes/components/primitives/Title.tsx > should render the title - specific size 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
+  <legend>
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="mb-2"
     >
-      <legend>
-        <div
-          class="mb-2"
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+        id="title-legend"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-person-fill"
+          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="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
+          />
+        </svg>
+        <h4
+          class="prc-Heading-Heading-MtWFE"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-legend"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person-fill"
-              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="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
-              />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-MtWFE"
-            >
-              Legend
-            </h4>
-          </div>
-        </div>
-      </legend>
+          Legend
+        </h4>
+      </div>
     </div>
-  </div>
+  </legend>
 </div>
 `;
diff --git a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
index 0de27ee15..aa6bd052e 100644
--- a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
+++ b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`renderer/components/settings/SettingsFooter.tsx > should show app version 1`] = `
 <button
-  aria-describedby="_r_1_"
+  aria-describedby="_r_0_"
   class="prc-Button-ButtonBase-9n-Xk"
   data-loading="false"
   data-no-visuals="true"
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index f44d1816c..9fb69a587 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -2057,7 +2057,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
       data-wrap="nowrap"
     >
       <button
-        aria-describedby="_r_s_"
+        aria-describedby="_r_r_"
         class="prc-Button-ButtonBase-9n-Xk"
         data-loading="false"
         data-size="medium"
@@ -2103,7 +2103,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-tLeuB"
         data-direction="n"
-        id="_r_s_"
+        id="_r_r_"
         popover="auto"
         role="tooltip"
       >
diff --git a/src/renderer/routes/__snapshots__/Login.test.tsx.snap b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
index bea1a2689..8a8df4186 100644
--- a/src/renderer/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
@@ -3,236 +3,225 @@
 exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="h-screen prc-Stack-Stack-UQ9k6"
+    data-align="center"
+    data-direction="vertical"
+    data-justify="center"
+    data-padding="spacious"
+    data-wrap="nowrap"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="prc-Stack-Stack-UQ9k6"
+      data-align="center"
+      data-direction="vertical"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
     >
+      <svg
+        aria-hidden="true"
+        aria-label="Gitify Logo"
+        class="size-16"
+        viewBox="0 0 500 500"
+        xmlns="https://www.w3.org/2000/svg"
+        xmlns:xlink="https://www.w3.org/1999/xlink"
+      >
+        <defs>
+          <lineargradient
+            id="linearGradient-dark"
+            x1="90.8779989%"
+            x2="-1.30249747%"
+            y1="80.0676288%"
+            y2="32.7108237%"
+          >
+            <stop
+              offset="0%"
+              stop-color="#22283B"
+            />
+            <stop
+              offset="100%"
+              stop-color="#555B6E"
+            />
+          </lineargradient>
+        </defs>
+        <g
+          fill="none"
+          fill-rule="evenodd"
+          stroke="none"
+          stroke-width="1"
+        >
+          <g
+            fill="url(#linearGradient-dark)"
+            fill-rule="nonzero"
+            id="Logo"
+            transform="translate(6.000000, 6.000000)"
+          >
+            <path
+              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+            />
+          </g>
+        </g>
+      </svg>
       <div
-        class="h-screen prc-Stack-Stack-UQ9k6"
+        class="prc-Stack-Stack-UQ9k6"
         data-align="center"
         data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
+        data-gap="none"
+        data-justify="start"
+        data-padding="none"
         data-wrap="nowrap"
       >
-        <div
-          class="prc-Stack-Stack-UQ9k6"
-          data-align="center"
-          data-direction="vertical"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+        <h2
+          class="prc-Heading-Heading-MtWFE"
+        >
+          GitHub Notifications
+        </h2>
+        <h3
+          class="prc-Heading-Heading-MtWFE"
         >
-          <svg
-            aria-hidden="true"
-            aria-label="Gitify Logo"
-            class="size-16"
-            viewBox="0 0 500 500"
-            xmlns="https://www.w3.org/2000/svg"
-            xmlns:xlink="https://www.w3.org/1999/xlink"
+          on your menu bar
+        </h3>
+      </div>
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="center"
+        data-direction="vertical"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <span
+          class="prc-Text-Text-9mHv3"
+        >
+          Login with
+        </span>
+        <button
+          class="prc-Button-ButtonBase-9n-Xk"
+          data-loading="false"
+          data-size="medium"
+          data-testid="login-github"
+          data-variant="primary"
+          type="button"
+        >
+          <span
+            class="prc-Button-ButtonContent-Iohp5"
+            data-align="center"
+            data-component="buttonContent"
           >
-            <defs>
-              <lineargradient
-                id="linearGradient-dark"
-                x1="90.8779989%"
-                x2="-1.30249747%"
-                y1="80.0676288%"
-                y2="32.7108237%"
-              >
-                <stop
-                  offset="0%"
-                  stop-color="#22283B"
-                />
-                <stop
-                  offset="100%"
-                  stop-color="#555B6E"
-                />
-              </lineargradient>
-            </defs>
-            <g
-              fill="none"
-              fill-rule="evenodd"
-              stroke="none"
-              stroke-width="1"
+            <span
+              class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+              data-component="leadingVisual"
             >
-              <g
-                fill="url(#linearGradient-dark)"
-                fill-rule="nonzero"
-                id="Logo"
-                transform="translate(6.000000, 6.000000)"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mark-github"
+                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="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                  d="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
                 />
-              </g>
-            </g>
-          </svg>
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <h2
-              class="prc-Heading-Heading-MtWFE"
-            >
-              GitHub Notifications
-            </h2>
-            <h3
-              class="prc-Heading-Heading-MtWFE"
+              </svg>
+            </span>
+            <span
+              class="prc-Button-Label-FWkx3"
+              data-component="text"
             >
-              on your menu bar
-            </h3>
-          </div>
-          <div
-            class="prc-Stack-Stack-UQ9k6"
+              GitHub
+            </span>
+          </span>
+        </button>
+        <button
+          class="prc-Button-ButtonBase-9n-Xk"
+          data-loading="false"
+          data-size="medium"
+          data-testid="login-pat"
+          data-variant="default"
+          type="button"
+        >
+          <span
+            class="prc-Button-ButtonContent-Iohp5"
             data-align="center"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            data-component="buttonContent"
           >
             <span
-              class="prc-Text-Text-9mHv3"
+              class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+              data-component="leadingVisual"
             >
-              Login with
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-key"
+                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="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                />
+              </svg>
             </span>
-            <button
-              class="prc-Button-ButtonBase-9n-Xk"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-github"
-              data-variant="primary"
-              type="button"
+            <span
+              class="prc-Button-Label-FWkx3"
+              data-component="text"
             >
-              <span
-                class="prc-Button-ButtonContent-Iohp5"
-                data-align="center"
-                data-component="buttonContent"
-              >
-                <span
-                  class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-mark-github"
-                    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="M6.766 11.328c-2.063-.25-3.516-1.734-3.516-3.656 0-.781.281-1.625.75-2.188-.203-.515-.172-1.609.063-2.062.625-.078 1.468.25 1.968.703.594-.187 1.219-.281 1.985-.281.765 0 1.39.094 1.953.265.484-.437 1.344-.765 1.969-.687.218.422.25 1.515.046 2.047.5.593.766 1.39.766 2.203 0 1.922-1.453 3.375-3.547 3.64.531.344.89 1.094.89 1.954v1.625c0 .468.391.734.86.547C13.781 14.359 16 11.53 16 8.03 16 3.61 12.406 0 7.984 0 3.563 0 0 3.61 0 8.031a7.88 7.88 0 0 0 5.172 7.422c.422.156.828-.125.828-.547v-1.25c-.219.094-.5.156-.75.156-1.031 0-1.64-.562-2.078-1.609-.172-.422-.36-.672-.719-.719-.187-.015-.25-.093-.25-.187 0-.188.313-.328.625-.328.453 0 .844.281 1.25.86.313.452.64.655 1.031.655s.641-.14 1-.5c.266-.265.47-.5.657-.656"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-FWkx3"
-                  data-component="text"
-                >
-                  GitHub
-                </span>
-              </span>
-            </button>
-            <button
-              class="prc-Button-ButtonBase-9n-Xk"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-pat"
-              data-variant="default"
-              type="button"
+              Personal Access Token
+            </span>
+          </span>
+        </button>
+        <button
+          class="prc-Button-ButtonBase-9n-Xk"
+          data-loading="false"
+          data-size="medium"
+          data-testid="login-oauth-app"
+          data-variant="default"
+          type="button"
+        >
+          <span
+            class="prc-Button-ButtonContent-Iohp5"
+            data-align="center"
+            data-component="buttonContent"
+          >
+            <span
+              class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+              data-component="leadingVisual"
             >
-              <span
-                class="prc-Button-ButtonContent-Iohp5"
-                data-align="center"
-                data-component="buttonContent"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-person"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
-                <span
-                  class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-key"
-                    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="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-FWkx3"
-                  data-component="text"
-                >
-                  Personal Access Token
-                </span>
-              </span>
-            </button>
-            <button
-              class="prc-Button-ButtonBase-9n-Xk"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-oauth-app"
-              data-variant="default"
-              type="button"
+                <path
+                  d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                />
+              </svg>
+            </span>
+            <span
+              class="prc-Button-Label-FWkx3"
+              data-component="text"
             >
-              <span
-                class="prc-Button-ButtonContent-Iohp5"
-                data-align="center"
-                data-component="buttonContent"
-              >
-                <span
-                  class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-person"
-                    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="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-FWkx3"
-                  data-component="text"
-                >
-                  OAuth App
-                </span>
-              </span>
-            </button>
-          </div>
-        </div>
+              OAuth App
+            </span>
+          </span>
+        </button>
       </div>
     </div>
   </div>
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 07b821fbf..abd136735 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -3,43 +3,65 @@
 exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="flex flex-col h-screen"
+    data-testid="Login With OAuth App"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="pl-4 pr-5 pt-3 pb-1"
     >
       <div
-        class="flex flex-col h-screen"
-        data-testid="Login With OAuth App"
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="horizontal"
+        data-justify="space-between"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <div
-          class="pl-4 pr-5 pt-3 pb-1"
+        <button
+          aria-labelledby="Go Back"
+          class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
+          data-component="IconButton"
+          data-loading="false"
+          data-no-visuals="true"
+          data-size="medium"
+          data-testid="header-nav-back"
+          data-variant="invisible"
+          type="button"
         >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-arrow-left"
+            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.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+            />
+          </svg>
+        </button>
+        <legend>
           <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="mb-2"
           >
-            <button
-              aria-labelledby="Go Back"
-              class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="medium"
-              data-testid="header-nav-back"
-              data-variant="invisible"
-              type="button"
+            <div
+              class="prc-Stack-Stack-UQ9k6"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-login-with-oauth-app"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-arrow-left"
+                class="octicon octicon-person"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -50,407 +72,374 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
                 width="16"
               >
                 <path
-                  d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+                  d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
                 />
               </svg>
-            </button>
-            <legend>
-              <div
-                class="mb-2"
+              <h4
+                class="prc-Heading-Heading-MtWFE"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
-                  id="title-login-with-oauth-app"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-person"
-                    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="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                    />
-                  </svg>
-                  <h4
-                    class="prc-Heading-Heading-MtWFE"
-                  >
-                    Login with OAuth App
-                  </h4>
-                </div>
-              </div>
-            </legend>
+                Login with OAuth App
+              </h4>
+            </div>
           </div>
+        </legend>
+      </div>
+    </div>
+    <div
+      class="grow overflow-x-hidden overflow-y-auto px-5"
+    >
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="normal"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <div
+          class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-has-label=""
+        >
+          <label
+            class="prc-components-Label-2mrqP"
+            for="_r_1_"
+            id="_r_1_-label"
+          >
+            <span
+              class="prc-components-RequiredText-7UsHS"
+            >
+              <span>
+                Hostname
+              </span>
+              <span>
+                *
+              </span>
+            </span>
+          </label>
+          <span
+            aria-busy="false"
+            class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
+            data-block="true"
+          >
+            <input
+              aria-describedby="_r_1_-caption"
+              aria-invalid="false"
+              aria-required="true"
+              class="prc-components-Input-IwWrt"
+              data-component="input"
+              data-testid="login-hostname"
+              id="_r_1_"
+              name="hostname"
+              placeholder="github.com"
+              type="text"
+              value="github.com"
+            />
+          </span>
+          <span
+            class="prc-FormControl-Caption-GNJPU prc-Text-Text-9mHv3"
+            id="_r_1_-caption"
+          >
+            <i
+              class="prc-Text-Text-9mHv3"
+            >
+              Change only if you are using GitHub Enterprise Server
+            </i>
+          </span>
         </div>
         <div
-          class="grow overflow-x-hidden overflow-y-auto px-5"
+          class="prc-Stack-Stack-UQ9k6"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="normal"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+          <button
+            class="prc-Button-ButtonBase-9n-Xk"
+            data-loading="false"
+            data-size="small"
+            data-testid="login-create-oauth-app"
+            data-variant="default"
+            type="button"
           >
-            <div
-              class="prc-FormControl-ControlVerticalLayout-8YotI"
-              data-has-label=""
+            <span
+              class="prc-Button-ButtonContent-Iohp5"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <label
-                class="prc-components-Label-2mrqP"
-                for="_r_2_"
-                id="_r_2_-label"
-              >
-                <span
-                  class="prc-components-RequiredText-7UsHS"
-                >
-                  <span>
-                    Hostname
-                  </span>
-                  <span>
-                    *
-                  </span>
-                </span>
-              </label>
               <span
-                aria-busy="false"
-                class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
-                data-block="true"
+                class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+                data-component="leadingVisual"
               >
-                <input
-                  aria-describedby="_r_2_-caption"
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-IwWrt"
-                  data-component="input"
-                  data-testid="login-hostname"
-                  id="_r_2_"
-                  name="hostname"
-                  placeholder="github.com"
-                  type="text"
-                  value="github.com"
-                />
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-person"
+                  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="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                  />
+                </svg>
               </span>
               <span
-                class="prc-FormControl-Caption-GNJPU prc-Text-Text-9mHv3"
-                id="_r_2_-caption"
+                class="prc-Button-Label-FWkx3"
+                data-component="text"
               >
-                <i
-                  class="prc-Text-Text-9mHv3"
-                >
-                  Change only if you are using GitHub Enterprise Server
-                </i>
+                Create new OAuth App
               </span>
-            </div>
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+            </span>
+          </button>
+          <span
+            class="text-xs prc-Text-Text-9mHv3"
+          >
+            and use your 
+            <i
+              class="prc-Text-Text-9mHv3"
+            >
+              client id & secret
+            </i>
+             below.
+          </span>
+        </div>
+        <div
+          class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-has-label=""
+        >
+          <label
+            class="prc-components-Label-2mrqP"
+            for="_r_8_"
+            id="_r_8_-label"
+          >
+            <span
+              class="prc-components-RequiredText-7UsHS"
+            >
+              <span>
+                Client ID
+              </span>
+              <span>
+                *
+              </span>
+            </span>
+          </label>
+          <span
+            aria-busy="false"
+            class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
+            data-block="true"
+          >
+            <input
+              aria-invalid="false"
+              aria-required="true"
+              class="prc-components-Input-IwWrt"
+              data-component="input"
+              data-testid="login-clientId"
+              id="_r_8_"
+              name="clientId"
+              placeholder="Your generated client id (20 characters)"
+              type="text"
+              value=""
+            />
+          </span>
+        </div>
+        <div
+          class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-has-label=""
+        >
+          <label
+            class="prc-components-Label-2mrqP"
+            for="_r_e_"
+            id="_r_e_-label"
+          >
+            <span
+              class="prc-components-RequiredText-7UsHS"
+            >
+              <span>
+                Client Secret
+              </span>
+              <span>
+                *
+              </span>
+            </span>
+          </label>
+          <span
+            aria-busy="false"
+            class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
+            data-block="true"
+            data-trailing-action="true"
+          >
+            <input
+              aria-invalid="false"
+              aria-required="true"
+              class="prc-components-Input-IwWrt"
+              data-component="input"
+              data-testid="login-clientSecret"
+              id="_r_e_"
+              name="clientSecret"
+              placeholder="Your generated client secret (40 characters)"
+              type="password"
+              value=""
+            />
+            <span
+              class="TextInput-action prc-components-TextInputAction-CjGDX"
             >
               <button
-                class="prc-Button-ButtonBase-9n-Xk"
+                aria-labelledby="_r_k_"
+                class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
+                data-component="IconButton"
                 data-loading="false"
+                data-no-visuals="true"
                 data-size="small"
-                data-testid="login-create-oauth-app"
-                data-variant="default"
+                data-variant="invisible"
                 type="button"
               >
-                <span
-                  class="prc-Button-ButtonContent-Iohp5"
-                  data-align="center"
-                  data-component="buttonContent"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-eye"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <span
-                    class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                    data-component="leadingVisual"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-person"
-                      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="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                      />
-                    </svg>
-                  </span>
-                  <span
-                    class="prc-Button-Label-FWkx3"
-                    data-component="text"
-                  >
-                    Create new OAuth App
-                  </span>
-                </span>
+                  <path
+                    d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+                  />
+                </svg>
               </button>
               <span
-                class="text-xs prc-Text-Text-9mHv3"
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_k_"
+                popover="auto"
               >
-                and use your 
-                <i
-                  class="prc-Text-Text-9mHv3"
-                >
-                  client id & secret
-                </i>
-                 below.
+                Show token
               </span>
-            </div>
-            <div
-              class="prc-FormControl-ControlVerticalLayout-8YotI"
-              data-has-label=""
+            </span>
+          </span>
+        </div>
+      </div>
+    </div>
+    <div
+      class="left-sidebar bg-gitify-footer"
+    >
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="horizontal"
+        data-justify="space-between"
+        data-padding="condensed"
+        data-wrap="nowrap"
+      >
+        <button
+          aria-describedby="_r_m_"
+          class="prc-Button-ButtonBase-9n-Xk"
+          data-loading="false"
+          data-size="small"
+          data-testid="login-docs"
+          data-variant="default"
+          type="button"
+        >
+          <span
+            class="prc-Button-ButtonContent-Iohp5"
+            data-align="center"
+            data-component="buttonContent"
+          >
+            <span
+              class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+              data-component="leadingVisual"
             >
-              <label
-                class="prc-components-Label-2mrqP"
-                for="_r_9_"
-                id="_r_9_-label"
-              >
-                <span
-                  class="prc-components-RequiredText-7UsHS"
-                >
-                  <span>
-                    Client ID
-                  </span>
-                  <span>
-                    *
-                  </span>
-                </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
-                data-block="true"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-book"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
-                <input
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-IwWrt"
-                  data-component="input"
-                  data-testid="login-clientId"
-                  id="_r_9_"
-                  name="clientId"
-                  placeholder="Your generated client id (20 characters)"
-                  type="text"
-                  value=""
+                <path
+                  d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
                 />
-              </span>
-            </div>
-            <div
-              class="prc-FormControl-ControlVerticalLayout-8YotI"
-              data-has-label=""
+              </svg>
+            </span>
+            <span
+              class="prc-Button-Label-FWkx3"
+              data-component="text"
             >
-              <label
-                class="prc-components-Label-2mrqP"
-                for="_r_f_"
-                id="_r_f_-label"
-              >
-                <span
-                  class="prc-components-RequiredText-7UsHS"
-                >
-                  <span>
-                    Client Secret
-                  </span>
-                  <span>
-                    *
-                  </span>
-                </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
-                data-block="true"
-                data-trailing-action="true"
-              >
-                <input
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-IwWrt"
-                  data-component="input"
-                  data-testid="login-clientSecret"
-                  id="_r_f_"
-                  name="clientSecret"
-                  placeholder="Your generated client secret (40 characters)"
-                  type="password"
-                  value=""
-                />
-                <span
-                  class="TextInput-action prc-components-TextInputAction-CjGDX"
-                >
-                  <button
-                    aria-labelledby="_r_l_"
-                    class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
-                    data-component="IconButton"
-                    data-loading="false"
-                    data-no-visuals="true"
-                    data-size="small"
-                    data-variant="invisible"
-                    type="button"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-eye"
-                      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="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-                      />
-                    </svg>
-                  </button>
-                  <span
-                    aria-hidden="true"
-                    class="prc-TooltipV2-Tooltip-tLeuB"
-                    data-direction="s"
-                    id="_r_l_"
-                    popover="auto"
-                  >
-                    Show token
-                  </span>
-                </span>
-              </span>
-            </div>
-          </div>
-        </div>
+              Docs
+            </span>
+          </span>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="s"
+          id="_r_m_"
+          popover="auto"
+          role="tooltip"
+        >
+          GitHub documentation
+        </span>
         <div
-          class="left-sidebar bg-gitify-footer"
+          data-loading-wrapper="true"
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="condensed"
-            data-wrap="nowrap"
+          <button
+            class="prc-Button-ButtonBase-9n-Xk"
+            data-loading="false"
+            data-size="medium"
+            data-testid="login-submit"
+            data-variant="primary"
+            type="button"
           >
-            <button
-              aria-describedby="_r_n_"
-              class="prc-Button-ButtonBase-9n-Xk"
-              data-loading="false"
-              data-size="small"
-              data-testid="login-docs"
-              data-variant="default"
-              type="button"
+            <span
+              class="prc-Button-ButtonContent-Iohp5"
+              data-align="center"
+              data-component="buttonContent"
             >
               <span
-                class="prc-Button-ButtonContent-Iohp5"
-                data-align="center"
-                data-component="buttonContent"
+                class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+                data-component="leadingVisual"
               >
-                <span
-                  class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-book"
-                    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 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-FWkx3"
-                  data-component="text"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-sign-in"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  Docs
-                </span>
+                  <path
+                    d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                  />
+                </svg>
               </span>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="s"
-              id="_r_n_"
-              popover="auto"
-              role="tooltip"
-            >
-              GitHub documentation
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                class="prc-Button-ButtonBase-9n-Xk"
-                data-loading="false"
-                data-size="medium"
-                data-testid="login-submit"
-                data-variant="primary"
-                type="button"
+              <span
+                class="prc-Button-Label-FWkx3"
+                data-component="text"
               >
-                <span
-                  class="prc-Button-ButtonContent-Iohp5"
-                  data-align="center"
-                  data-component="buttonContent"
-                >
-                  <span
-                    class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                    data-component="leadingVisual"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-sign-in"
-                      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="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
-                      />
-                    </svg>
-                  </span>
-                  <span
-                    class="prc-Button-Label-FWkx3"
-                    data-component="text"
-                  >
-                    Login
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
+                Login
+              </span>
+            </span>
+          </button>
         </div>
       </div>
     </div>
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 7075dd2b5..aaafce334 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -3,43 +3,65 @@
 exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`] = `
 <div>
   <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
+    class="flex flex-col h-screen"
+    data-testid="Login With Personal Access Token"
   >
     <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
+      class="pl-4 pr-5 pt-3 pb-1"
     >
       <div
-        class="flex flex-col h-screen"
-        data-testid="Login With Personal Access Token"
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="horizontal"
+        data-justify="space-between"
+        data-padding="none"
+        data-wrap="nowrap"
       >
-        <div
-          class="pl-4 pr-5 pt-3 pb-1"
+        <button
+          aria-labelledby="Go Back"
+          class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
+          data-component="IconButton"
+          data-loading="false"
+          data-no-visuals="true"
+          data-size="medium"
+          data-testid="header-nav-back"
+          data-variant="invisible"
+          type="button"
         >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-arrow-left"
+            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.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+            />
+          </svg>
+        </button>
+        <legend>
           <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="mb-2"
           >
-            <button
-              aria-labelledby="Go Back"
-              class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="medium"
-              data-testid="header-nav-back"
-              data-variant="invisible"
-              type="button"
+            <div
+              class="prc-Stack-Stack-UQ9k6"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-login-with-personal-access-token"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-arrow-left"
+                class="octicon octicon-key"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -50,306 +72,104 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
                 width="16"
               >
                 <path
-                  d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+                  d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
                 />
               </svg>
-            </button>
-            <legend>
-              <div
-                class="mb-2"
+              <h4
+                class="prc-Heading-Heading-MtWFE"
               >
-                <div
-                  class="prc-Stack-Stack-UQ9k6"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
-                  id="title-login-with-personal-access-token"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-key"
-                    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="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                    />
-                  </svg>
-                  <h4
-                    class="prc-Heading-Heading-MtWFE"
-                  >
-                    Login with Personal Access Token
-                  </h4>
-                </div>
-              </div>
-            </legend>
+                Login with Personal Access Token
+              </h4>
+            </div>
           </div>
-        </div>
+        </legend>
+      </div>
+    </div>
+    <div
+      class="grow overflow-x-hidden overflow-y-auto px-5"
+    >
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="vertical"
+        data-gap="normal"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
         <div
-          class="grow overflow-x-hidden overflow-y-auto px-5"
+          class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-has-label=""
         >
-          <div
-            class="prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="normal"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+          <label
+            class="prc-components-Label-2mrqP"
+            for="_r_1_"
+            id="_r_1_-label"
           >
-            <div
-              class="prc-FormControl-ControlVerticalLayout-8YotI"
-              data-has-label=""
+            <span
+              class="prc-components-RequiredText-7UsHS"
             >
-              <label
-                class="prc-components-Label-2mrqP"
-                for="_r_2_"
-                id="_r_2_-label"
-              >
-                <span
-                  class="prc-components-RequiredText-7UsHS"
-                >
-                  <span>
-                    Hostname
-                  </span>
-                  <span>
-                    *
-                  </span>
-                </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
-                data-block="true"
-              >
-                <input
-                  aria-describedby="_r_2_-caption"
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-IwWrt"
-                  data-component="input"
-                  data-testid="login-hostname"
-                  id="_r_2_"
-                  name="hostname"
-                  placeholder="github.com"
-                  type="text"
-                  value="github.com"
-                />
+              <span>
+                Hostname
               </span>
-              <span
-                class="prc-FormControl-Caption-GNJPU prc-Text-Text-9mHv3"
-                id="_r_2_-caption"
-              >
-                <i
-                  class="prc-Text-Text-9mHv3"
-                >
-                  Change only if you are using GitHub Enterprise Server
-                </i>
+              <span>
+                *
               </span>
-            </div>
-            <div
-              class="prc-Stack-Stack-UQ9k6"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-UQ9k6"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <button
-                  class="prc-Button-ButtonBase-9n-Xk"
-                  data-loading="false"
-                  data-size="small"
-                  data-testid="login-create-token"
-                  data-variant="default"
-                  type="button"
-                >
-                  <span
-                    class="prc-Button-ButtonContent-Iohp5"
-                    data-align="center"
-                    data-component="buttonContent"
-                  >
-                    <span
-                      class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                      data-component="leadingVisual"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="octicon octicon-key"
-                        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="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                        />
-                      </svg>
-                    </span>
-                    <span
-                      class="prc-Button-Label-FWkx3"
-                      data-component="text"
-                    >
-                      Generate a PAT
-                    </span>
-                  </span>
-                </button>
-                <span
-                  class="text-xs prc-Text-Text-9mHv3"
-                >
-                  on GitHub to paste the token below.
-                </span>
-              </div>
-              <i
-                class="text-xs prc-Text-Text-9mHv3"
-              >
-                The
-                 
-                <button
-                  aria-describedby="_r_9_"
-                  type="button"
-                >
-                  <u
-                    class="prc-Text-Text-9mHv3"
-                  >
-                    recommended scopes
-                  </u>
-                </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-tLeuB"
-                  data-direction="se"
-                  id="_r_9_"
-                  popover="auto"
-                  role="tooltip"
-                >
-                  notifications, read:user, repo
-                </span>
-                 
-                will be automatically selected for you.
-              </i>
-            </div>
-            <div
-              class="prc-FormControl-ControlVerticalLayout-8YotI"
-              data-has-label=""
+            </span>
+          </label>
+          <span
+            aria-busy="false"
+            class="TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
+            data-block="true"
+          >
+            <input
+              aria-describedby="_r_1_-caption"
+              aria-invalid="false"
+              aria-required="true"
+              class="prc-components-Input-IwWrt"
+              data-component="input"
+              data-testid="login-hostname"
+              id="_r_1_"
+              name="hostname"
+              placeholder="github.com"
+              type="text"
+              value="github.com"
+            />
+          </span>
+          <span
+            class="prc-FormControl-Caption-GNJPU prc-Text-Text-9mHv3"
+            id="_r_1_-caption"
+          >
+            <i
+              class="prc-Text-Text-9mHv3"
             >
-              <label
-                class="prc-components-Label-2mrqP"
-                for="_r_a_"
-                id="_r_a_-label"
-              >
-                <span
-                  class="prc-components-RequiredText-7UsHS"
-                >
-                  <span>
-                    Token
-                  </span>
-                  <span>
-                    *
-                  </span>
-                </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
-                data-block="true"
-                data-trailing-action="true"
-              >
-                <input
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-IwWrt"
-                  data-component="input"
-                  data-testid="login-token"
-                  id="_r_a_"
-                  name="token"
-                  placeholder="Your generated token (40 characters)"
-                  type="password"
-                  value=""
-                />
-                <span
-                  class="TextInput-action prc-components-TextInputAction-CjGDX"
-                >
-                  <button
-                    aria-labelledby="_r_g_"
-                    class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
-                    data-component="IconButton"
-                    data-loading="false"
-                    data-no-visuals="true"
-                    data-size="small"
-                    data-variant="invisible"
-                    type="button"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-eye"
-                      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="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-                      />
-                    </svg>
-                  </button>
-                  <span
-                    aria-hidden="true"
-                    class="prc-TooltipV2-Tooltip-tLeuB"
-                    data-direction="s"
-                    id="_r_g_"
-                    popover="auto"
-                  >
-                    Show token
-                  </span>
-                </span>
-              </span>
-            </div>
-          </div>
+              Change only if you are using GitHub Enterprise Server
+            </i>
+          </span>
         </div>
         <div
-          class="left-sidebar bg-gitify-footer"
+          class="prc-Stack-Stack-UQ9k6"
+          data-align="stretch"
+          data-direction="vertical"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
           <div
             class="prc-Stack-Stack-UQ9k6"
-            data-align="stretch"
+            data-align="center"
             data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="condensed"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
             data-wrap="nowrap"
           >
             <button
-              aria-describedby="_r_i_"
               class="prc-Button-ButtonBase-9n-Xk"
               data-loading="false"
               data-size="small"
-              data-testid="login-docs"
+              data-testid="login-create-token"
               data-variant="default"
               type="button"
             >
@@ -364,7 +184,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-book"
+                    class="octicon octicon-key"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -375,7 +195,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
                     width="16"
                   >
                     <path
-                      d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
+                      d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
                     />
                   </svg>
                 </span>
@@ -383,67 +203,236 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
                   class="prc-Button-Label-FWkx3"
                   data-component="text"
                 >
-                  Docs
+                  Generate a PAT
                 </span>
               </span>
             </button>
+            <span
+              class="text-xs prc-Text-Text-9mHv3"
+            >
+              on GitHub to paste the token below.
+            </span>
+          </div>
+          <i
+            class="text-xs prc-Text-Text-9mHv3"
+          >
+            The
+             
+            <button
+              aria-describedby="_r_8_"
+              type="button"
+            >
+              <u
+                class="prc-Text-Text-9mHv3"
+              >
+                recommended scopes
+              </u>
+            </button>
             <span
               aria-hidden="true"
               class="prc-TooltipV2-Tooltip-tLeuB"
-              data-direction="ne"
-              id="_r_i_"
+              data-direction="se"
+              id="_r_8_"
               popover="auto"
               role="tooltip"
             >
-              GitHub documentation
+              notifications, read:user, repo
             </span>
-            <div
-              data-loading-wrapper="true"
+             
+            will be automatically selected for you.
+          </i>
+        </div>
+        <div
+          class="prc-FormControl-ControlVerticalLayout-8YotI"
+          data-has-label=""
+        >
+          <label
+            class="prc-components-Label-2mrqP"
+            for="_r_9_"
+            id="_r_9_-label"
+          >
+            <span
+              class="prc-components-RequiredText-7UsHS"
+            >
+              <span>
+                Token
+              </span>
+              <span>
+                *
+              </span>
+            </span>
+          </label>
+          <span
+            aria-busy="false"
+            class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-Hpdqi prc-components-TextInputBaseWrapper-wY-n0"
+            data-block="true"
+            data-trailing-action="true"
+          >
+            <input
+              aria-invalid="false"
+              aria-required="true"
+              class="prc-components-Input-IwWrt"
+              data-component="input"
+              data-testid="login-token"
+              id="_r_9_"
+              name="token"
+              placeholder="Your generated token (40 characters)"
+              type="password"
+              value=""
+            />
+            <span
+              class="TextInput-action prc-components-TextInputAction-CjGDX"
             >
               <button
-                class="prc-Button-ButtonBase-9n-Xk"
+                aria-labelledby="_r_f_"
+                class="prc-Button-ButtonBase-9n-Xk prc-components-Invisible-bKOcl prc-Button-IconButton-fyge7"
+                data-component="IconButton"
                 data-loading="false"
-                data-size="medium"
-                data-testid="login-submit"
-                data-variant="primary"
+                data-no-visuals="true"
+                data-size="small"
+                data-variant="invisible"
                 type="button"
               >
-                <span
-                  class="prc-Button-ButtonContent-Iohp5"
-                  data-align="center"
-                  data-component="buttonContent"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-eye"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <span
-                    class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
-                    data-component="leadingVisual"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-sign-in"
-                      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="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
-                      />
-                    </svg>
-                  </span>
-                  <span
-                    class="prc-Button-Label-FWkx3"
-                    data-component="text"
-                  >
-                    Login
-                  </span>
-                </span>
+                  <path
+                    d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+                  />
+                </svg>
               </button>
-            </div>
-          </div>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-tLeuB"
+                data-direction="s"
+                id="_r_f_"
+                popover="auto"
+              >
+                Show token
+              </span>
+            </span>
+          </span>
+        </div>
+      </div>
+    </div>
+    <div
+      class="left-sidebar bg-gitify-footer"
+    >
+      <div
+        class="prc-Stack-Stack-UQ9k6"
+        data-align="stretch"
+        data-direction="horizontal"
+        data-justify="space-between"
+        data-padding="condensed"
+        data-wrap="nowrap"
+      >
+        <button
+          aria-describedby="_r_h_"
+          class="prc-Button-ButtonBase-9n-Xk"
+          data-loading="false"
+          data-size="small"
+          data-testid="login-docs"
+          data-variant="default"
+          type="button"
+        >
+          <span
+            class="prc-Button-ButtonContent-Iohp5"
+            data-align="center"
+            data-component="buttonContent"
+          >
+            <span
+              class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+              data-component="leadingVisual"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-book"
+                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 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
+                />
+              </svg>
+            </span>
+            <span
+              class="prc-Button-Label-FWkx3"
+              data-component="text"
+            >
+              Docs
+            </span>
+          </span>
+        </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-direction="ne"
+          id="_r_h_"
+          popover="auto"
+          role="tooltip"
+        >
+          GitHub documentation
+        </span>
+        <div
+          data-loading-wrapper="true"
+        >
+          <button
+            class="prc-Button-ButtonBase-9n-Xk"
+            data-loading="false"
+            data-size="medium"
+            data-testid="login-submit"
+            data-variant="primary"
+            type="button"
+          >
+            <span
+              class="prc-Button-ButtonContent-Iohp5"
+              data-align="center"
+              data-component="buttonContent"
+            >
+              <span
+                class="prc-Button-Visual-YNt2F prc-Button-VisualWrap-E4cnq"
+                data-component="leadingVisual"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-sign-in"
+                  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="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                  />
+                </svg>
+              </span>
+              <span
+                class="prc-Button-Label-FWkx3"
+                data-component="text"
+              >
+                Login
+              </span>
+            </span>
+          </button>
         </div>
       </div>
     </div>
diff --git a/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap b/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap
index b9b2581d9..de6f03b76 100644
--- a/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap
@@ -2,152 +2,64 @@
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (all read notifications) 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        AllRead
-      </p>
-    </div>
-  </div>
+  <p>
+    AllRead
+  </p>
 </div>
 `;
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (error conditions - oops) > bad credentials 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        Oops
-      </p>
-    </div>
-  </div>
+  <p>
+    Oops
+  </p>
 </div>
 `;
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (error conditions - oops) > default error 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        Oops
-      </p>
-    </div>
-  </div>
+  <p>
+    Oops
+  </p>
 </div>
 `;
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (error conditions - oops) > missing scopes 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        Oops
-      </p>
-    </div>
-  </div>
+  <p>
+    Oops
+  </p>
 </div>
 `;
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (error conditions - oops) > rate limited 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        Oops
-      </p>
-    </div>
-  </div>
+  <p>
+    Oops
+  </p>
 </div>
 `;
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (error conditions - oops) > unknown error 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        Oops
-      </p>
-    </div>
-  </div>
+  <p>
+    Oops
+  </p>
 </div>
 `;
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (show account header) 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        AllRead
-      </p>
-    </div>
-  </div>
+  <p>
+    AllRead
+  </p>
 </div>
 `;
 
 exports[`renderer/routes/Notifications.tsx > should render itself & its children (with notifications) 1`] = `
 <div>
-  <div
-    data-color-mode="light"
-    data-dark-theme="dark"
-    data-light-theme="light"
-  >
-    <div
-      class="prc-src-BaseStyles-aopSS"
-      data-portal-root="true"
-    >
-      <p>
-        AllRead
-      </p>
-    </div>
-  </div>
+  <p>
+    AllRead
+  </p>
 </div>
 `;
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index dfea1c5c3..33ebe69ea 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -2152,7 +2152,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_16_"
+          aria-describedby="_r_15_"
           class="prc-Button-ButtonBase-9n-Xk"
           data-loading="false"
           data-no-visuals="true"
@@ -2180,7 +2180,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_16_"
+          id="_r_15_"
           popover="auto"
           role="tooltip"
         >
@@ -2197,7 +2197,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_18_"
+          aria-describedby="_r_17_"
           aria-label="Accounts"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
@@ -2233,7 +2233,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           role="tooltip"
         >
           <span
-            id="_r_18_"
+            id="_r_17_"
           >
             Accounts
             <span
@@ -2272,7 +2272,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           </span>
         </span>
         <button
-          aria-describedby="_r_1a_"
+          aria-describedby="_r_19_"
           aria-label="Quit Gitify"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
@@ -2308,7 +2308,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           role="tooltip"
         >
           <span
-            id="_r_1a_"
+            id="_r_19_"
           >
             Quit Gitify
             <span
diff --git a/vitest.config.ts b/vitest.config.ts
index 92bdb1002..d099e8482 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -7,10 +7,13 @@ export default defineConfig({
     globals: true,
     pool: 'vmThreads',
     clearMocks: true,
-    // Server configuration to handle external dependencies
-    server: {
-      deps: {
-        inline: ['@primer/react', '@primer/css'],
+    // Pre-bundle @primer/react rather than re-transforming the raw package on every thread load.
+    // See https://vitest.dev/guide/profiling-test-performance.html#use-the-dependency-optimizer
+    deps: {
+      optimizer: {
+        client: {
+          include: ['@primer/react'],
+        },
       },
     },
     experimental: {

From fec3477be2f5d7646bb395d109ee65f47f7d6a92 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Wed, 1 Apr 2026 09:53:12 -0400
Subject: [PATCH 2/2] auth-splits

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 src/renderer/__mocks__/account-mocks.ts       |   2 +-
 .../settings/NotificationSettings.tsx         |   2 +-
 src/renderer/context/App.test.tsx             |   7 +-
 src/renderer/context/App.tsx                  |  10 +-
 src/renderer/routes/AccountScopes.tsx         |   2 +-
 src/renderer/routes/Accounts.tsx              |   8 +-
 src/renderer/routes/LoginWithDeviceFlow.tsx   |   2 +-
 .../routes/LoginWithPersonalAccessToken.tsx   |   2 +-
 src/renderer/utils/auth/flows.test.ts         | 240 +++++++++++++++
 src/renderer/utils/auth/flows.ts              | 194 ++++++++++++
 src/renderer/utils/auth/scopes.test.ts        | 115 ++++++++
 src/renderer/utils/auth/scopes.ts             |  90 ++++++
 src/renderer/utils/auth/utils.test.ts         | 233 +--------------
 src/renderer/utils/auth/utils.ts              | 279 +-----------------
 14 files changed, 661 insertions(+), 525 deletions(-)
 create mode 100644 src/renderer/utils/auth/flows.test.ts
 create mode 100644 src/renderer/utils/auth/flows.ts
 create mode 100644 src/renderer/utils/auth/scopes.test.ts
 create mode 100644 src/renderer/utils/auth/scopes.ts

diff --git a/src/renderer/__mocks__/account-mocks.ts b/src/renderer/__mocks__/account-mocks.ts
index 966391760..a40a0cc4c 100644
--- a/src/renderer/__mocks__/account-mocks.ts
+++ b/src/renderer/__mocks__/account-mocks.ts
@@ -8,7 +8,7 @@ import type {
   Token,
 } from '../types';
 
-import { getRecommendedScopeNames } from '../utils/auth/utils';
+import { getRecommendedScopeNames } from '../utils/auth/scopes';
 import { mockGitifyUser } from './user-mocks';
 
 export const mockGitHubAppAccount: Account = {
diff --git a/src/renderer/components/settings/NotificationSettings.tsx b/src/renderer/components/settings/NotificationSettings.tsx
index 990507709..1ec9463b1 100644
--- a/src/renderer/components/settings/NotificationSettings.tsx
+++ b/src/renderer/components/settings/NotificationSettings.tsx
@@ -36,7 +36,7 @@ import { FetchType, GroupBy, Size } from '../../types';
 import {
   hasAlternateScopes,
   hasRecommendedScopes,
-} from '../../utils/auth/utils';
+} from '../../utils/auth/scopes';
 import { openGitHubParticipatingDocs } from '../../utils/system/links';
 
 export const NotificationSettings: FC = () => {
diff --git a/src/renderer/context/App.test.tsx b/src/renderer/context/App.test.tsx
index 45d37e638..9da1629c0 100644
--- a/src/renderer/context/App.test.tsx
+++ b/src/renderer/context/App.test.tsx
@@ -19,6 +19,7 @@ import type {
 } from '../types';
 import type { DeviceFlowSession } from '../utils/auth/types';
 
+import * as authFlows from '../utils/auth/flows';
 import * as authUtils from '../utils/auth/utils';
 import * as storage from '../utils/core/storage';
 import * as notifications from '../utils/notifications/notifications';
@@ -230,7 +231,7 @@ describe('renderer/context/App.tsx', () => {
 
     it('loginWithDeviceFlowStart calls startGitHubDeviceFlow', async () => {
       const startGitHubDeviceFlowSpy = vi
-        .spyOn(authUtils, 'startGitHubDeviceFlow')
+        .spyOn(authFlows, 'startGitHubDeviceFlow')
         .mockImplementation(vi.fn());
 
       const getContext = renderWithContext();
@@ -244,7 +245,7 @@ describe('renderer/context/App.tsx', () => {
 
     it('loginWithDeviceFlowPoll calls pollGitHubDeviceFlow', async () => {
       const pollGitHubDeviceFlowSpy = vi
-        .spyOn(authUtils, 'pollGitHubDeviceFlow')
+        .spyOn(authFlows, 'pollGitHubDeviceFlow')
         .mockImplementation(vi.fn());
 
       const getContext = renderWithContext();
@@ -278,7 +279,7 @@ describe('renderer/context/App.tsx', () => {
 
     it('loginWithOAuthApp calls performGitHubWebOAuth', async () => {
       const performGitHubWebOAuthSpy = vi.spyOn(
-        authUtils,
+        authFlows,
         'performGitHubWebOAuth',
       );
 
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index a4e6e3986..116e860f5 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -39,15 +39,17 @@ import type {
 import { fetchAuthenticatedUserDetails } from '../utils/api/client';
 import { clearOctokitClientCache } from '../utils/api/octokit';
 import {
-  addAccount,
   exchangeAuthCodeForAccessToken,
-  getAccountUUID,
-  hasAccounts,
   performGitHubWebOAuth,
   pollGitHubDeviceFlow,
+  startGitHubDeviceFlow,
+} from '../utils/auth/flows';
+import {
+  addAccount,
+  getAccountUUID,
+  hasAccounts,
   refreshAccount,
   removeAccount,
-  startGitHubDeviceFlow,
 } from '../utils/auth/utils';
 import { clearState, loadState, saveState } from '../utils/core/storage';
 import {
diff --git a/src/renderer/routes/AccountScopes.tsx b/src/renderer/routes/AccountScopes.tsx
index 27707b475..b80777514 100644
--- a/src/renderer/routes/AccountScopes.tsx
+++ b/src/renderer/routes/AccountScopes.tsx
@@ -23,7 +23,7 @@ import {
   getRecommendedScopeNames,
   getRequiredScopeNames,
   hasRequiredScopes,
-} from '../utils/auth/utils';
+} from '../utils/auth/scopes';
 import { openDeveloperSettings } from '../utils/system/links';
 
 interface LocationState {
diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx
index 018546446..b4ac3aa6a 100644
--- a/src/renderer/routes/Accounts.tsx
+++ b/src/renderer/routes/Accounts.tsx
@@ -33,12 +33,8 @@ import { Header } from '../components/primitives/Header';
 import { type Account, type GitifyError, IconColor, Size } from '../types';
 
 import { determineFailureType } from '../utils/api/errors';
-import {
-  getAccountUUID,
-  hasAlternateScopes,
-  hasRecommendedScopes,
-  refreshAccount,
-} from '../utils/auth/utils';
+import { hasAlternateScopes, hasRecommendedScopes } from '../utils/auth/scopes';
+import { getAccountUUID, refreshAccount } from '../utils/auth/utils';
 import { Errors } from '../utils/core/errors';
 import { saveState } from '../utils/core/storage';
 import {
diff --git a/src/renderer/routes/LoginWithDeviceFlow.tsx b/src/renderer/routes/LoginWithDeviceFlow.tsx
index 51482ff9d..e6480da07 100644
--- a/src/renderer/routes/LoginWithDeviceFlow.tsx
+++ b/src/renderer/routes/LoginWithDeviceFlow.tsx
@@ -32,7 +32,7 @@ import type { DeviceFlowSession } from '../utils/auth/types';
 import {
   getAlternateScopeNames,
   getRecommendedScopeNames,
-} from '../utils/auth/utils';
+} from '../utils/auth/scopes';
 import { rendererLogError } from '../utils/core/logger';
 import { copyToClipboard, openExternalLink } from '../utils/system/comms';
 import { openDeveloperSettings } from '../utils/system/links';
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
index b947ff1d7..3a1b79d0c 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
@@ -30,8 +30,8 @@ import { Header } from '../components/primitives/Header';
 import type { Account, Hostname, Token } from '../types';
 import type { LoginPersonalAccessTokenOptions } from '../utils/auth/types';
 
+import { formatRecommendedOAuthScopes } from '../utils/auth/scopes';
 import {
-  formatRecommendedOAuthScopes,
   getNewTokenURL,
   isValidHostname,
   isValidToken,
diff --git a/src/renderer/utils/auth/flows.test.ts b/src/renderer/utils/auth/flows.test.ts
new file mode 100644
index 000000000..73dacce24
--- /dev/null
+++ b/src/renderer/utils/auth/flows.test.ts
@@ -0,0 +1,240 @@
+// Use a hoist-safe mock factory for '@octokit/oauth-methods'
+vi.mock('@octokit/oauth-methods', async () => {
+  const actual = await vi.importActual<typeof import('@octokit/oauth-methods')>(
+    '@octokit/oauth-methods',
+  );
+  return {
+    ...actual,
+    createDeviceCode: vi.fn(),
+    exchangeDeviceCode: vi.fn(),
+    exchangeWebFlowCode: vi.fn(),
+  };
+});
+
+import {
+  createDeviceCode,
+  exchangeDeviceCode,
+  exchangeWebFlowCode,
+} from '@octokit/oauth-methods';
+import { RequestError } from '@octokit/request-error';
+
+import type { MockedFunction } from 'vitest';
+
+import { Constants } from '../../constants';
+
+import type { AuthCode, ClientID, ClientSecret, Hostname } from '../../types';
+import type { DeviceFlowSession, LoginOAuthWebOptions } from './types';
+
+import * as comms from '../../utils/system/comms';
+import * as logger from '../core/logger';
+import * as authUtils from './flows';
+import { getRecommendedScopeNames } from './scopes';
+
+const createDeviceCodeMock = createDeviceCode as unknown as MockedFunction<
+  typeof createDeviceCode
+>;
+
+const exchangeDeviceCodeMock = exchangeDeviceCode as unknown as MockedFunction<
+  typeof exchangeDeviceCode
+>;
+
+const exchangeWebFlowCodeMock =
+  exchangeWebFlowCode as unknown as MockedFunction<typeof exchangeWebFlowCode>;
+
+describe('renderer/utils/auth/flows.ts', () => {
+  vi.spyOn(logger, 'rendererLogInfo').mockImplementation(vi.fn());
+  const openExternalLinkSpy = vi
+    .spyOn(comms, 'openExternalLink')
+    .mockImplementation(vi.fn());
+
+  beforeEach(() => {
+    // Mock OAUTH_DEVICE_FLOW_CLIENT_ID value
+    Constants.OAUTH_DEVICE_FLOW_CLIENT_ID = 'FAKE_CLIENT_ID_123' as ClientID;
+  });
+
+  describe('Gitify GitHub OAuth - Device Code Flow', () => {
+    describe('startGitHubDeviceFlow', () => {
+      it('should request a device code and return a session', async () => {
+        createDeviceCodeMock.mockResolvedValueOnce({
+          data: {
+            device_code: 'device-code-xyz',
+            user_code: 'user-code-xyz',
+            verification_uri: 'https://github.com/login/device',
+            expires_in: 600,
+            interval: 5,
+          },
+        } as unknown as Awaited<ReturnType<typeof createDeviceCode>>);
+
+        const session = await authUtils.startGitHubDeviceFlow();
+
+        expect(createDeviceCodeMock).toHaveBeenCalledWith({
+          clientType: 'oauth-app',
+          clientId: 'FAKE_CLIENT_ID_123',
+          scopes: getRecommendedScopeNames(),
+          request: expect.any(Function),
+        });
+
+        expect(session.deviceCode).toBe('device-code-xyz');
+        expect(session.userCode).toBe('user-code-xyz');
+        expect(session.verificationUri).toBe('https://github.com/login/device');
+        expect(session.intervalSeconds).toBe(5);
+        expect(session.expiresAt).toBeGreaterThan(Date.now());
+      });
+    });
+
+    describe('pollGitHubDeviceFlow', () => {
+      const baseSession = {
+        hostname: 'github.com',
+        clientId: 'FAKE_CLIENT_ID_123',
+        deviceCode: 'device-code',
+        userCode: 'user-code',
+        verificationUri: 'https://github.com/login/device',
+        intervalSeconds: 5,
+        expiresAt: Date.now() + 10000,
+      } as const;
+
+      it('returns token on successful exchange', async () => {
+        exchangeDeviceCodeMock.mockResolvedValueOnce({
+          authentication: { token: 'device-token-xyz' },
+        } as unknown as Awaited<ReturnType<typeof exchangeDeviceCode>>);
+
+        const token = await authUtils.pollGitHubDeviceFlow(
+          baseSession as DeviceFlowSession,
+        );
+
+        expect(exchangeDeviceCodeMock).toHaveBeenCalledWith({
+          clientType: 'oauth-app',
+          clientId: 'FAKE_CLIENT_ID_123',
+          code: 'device-code',
+          request: expect.any(Function),
+        });
+
+        expect(token).toBe('device-token-xyz');
+      });
+
+      it('returns null when authorization is pending or slow_down', async () => {
+        const pendingErr = Object.create(RequestError.prototype);
+        pendingErr.response = { data: { error: 'authorization_pending' } };
+
+        exchangeDeviceCodeMock.mockRejectedValueOnce(pendingErr);
+
+        const token = await authUtils.pollGitHubDeviceFlow(
+          baseSession as DeviceFlowSession,
+        );
+
+        expect(token).toBeNull();
+      });
+
+      it('throws on other errors', async () => {
+        const otherErr = new Error('boom');
+
+        exchangeDeviceCodeMock.mockRejectedValueOnce(otherErr);
+
+        await expect(
+          async () =>
+            await authUtils.pollGitHubDeviceFlow(
+              baseSession as DeviceFlowSession,
+            ),
+        ).rejects.toThrow('boom');
+      });
+    });
+  });
+
+  describe('performGitHubWebOAuth', () => {
+    const webAuthOptions: LoginOAuthWebOptions = {
+      hostname: 'github.com' as Hostname,
+      clientId: 'FAKE_CLIENT_ID_123' as ClientID,
+      clientSecret: 'FAKE_CLIENT_SECRET_123' as ClientSecret,
+    };
+
+    it('should call performGitHubWebOAuth using custom oauth app - success oauth flow', async () => {
+      window.gitify.onAuthCallback = vi.fn().mockImplementation((callback) => {
+        callback('gitify://oauth?code=123-456');
+      });
+
+      const res = await authUtils.performGitHubWebOAuth({
+        clientId: 'BYO_CLIENT_ID' as ClientID,
+        clientSecret: 'BYO_CLIENT_SECRET' as ClientSecret,
+        hostname: 'my.git.com' as Hostname,
+      });
+
+      expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
+      expect(openExternalLinkSpy).toHaveBeenCalledWith(
+        expect.stringContaining(
+          'https://my.git.com/login/oauth/authorize?allow_signup=false&client_id=BYO_CLIENT_ID&scope=notifications%2Cread%3Auser%2Crepo',
+        ),
+      );
+
+      expect(window.gitify.onAuthCallback).toHaveBeenCalledTimes(1);
+      expect(window.gitify.onAuthCallback).toHaveBeenCalledWith(
+        expect.any(Function),
+      );
+
+      expect(res.authMethod).toBe('OAuth App');
+      expect(res.authCode).toBe('123-456');
+    });
+
+    it('should call performGitHubWebOAuth - failure', async () => {
+      window.gitify.onAuthCallback = vi.fn().mockImplementation((callback) => {
+        callback(
+          'gitify://auth?error=invalid_request&error_description=The+redirect_uri+is+missing+or+invalid.&error_uri=https://docs.github.com/en/developers/apps/troubleshooting-oauth-errors',
+        );
+      });
+
+      await expect(
+        async () => await authUtils.performGitHubWebOAuth(webAuthOptions),
+      ).rejects.toEqual(
+        new Error(
+          "Oops! Something went wrong and we couldn't log you in using GitHub. Please try again. Reason: The redirect_uri is missing or invalid. Docs: https://docs.github.com/en/developers/apps/troubleshooting-oauth-errors",
+        ),
+      );
+
+      expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
+      expect(openExternalLinkSpy).toHaveBeenCalledWith(
+        expect.stringContaining(
+          'https://github.com/login/oauth/authorize?allow_signup=false&client_id=FAKE_CLIENT_ID_123&scope=notifications%2Cread%3Auser%2Crepo',
+        ),
+      );
+
+      expect(window.gitify.onAuthCallback).toHaveBeenCalledTimes(1);
+      expect(window.gitify.onAuthCallback).toHaveBeenCalledWith(
+        expect.any(Function),
+      );
+    });
+
+    describe('exchangeAuthCodeForAccessToken', () => {
+      const authCode = '123-456' as AuthCode;
+
+      it('should exchange auth code for access token', async () => {
+        exchangeWebFlowCodeMock.mockResolvedValueOnce({
+          authentication: {
+            token: 'this-is-a-token',
+          },
+        } as unknown as Awaited<ReturnType<typeof exchangeWebFlowCode>>);
+
+        const res = await authUtils.exchangeAuthCodeForAccessToken(authCode, {
+          ...webAuthOptions,
+        });
+
+        expect(exchangeWebFlowCodeMock).toHaveBeenCalledWith({
+          clientType: 'oauth-app',
+          clientId: 'FAKE_CLIENT_ID_123',
+          clientSecret: 'FAKE_CLIENT_SECRET_123',
+          code: '123-456',
+          request: expect.any(Function),
+        });
+        expect(res).toBe('this-is-a-token');
+      });
+
+      it('should throw when client secret is missing', async () => {
+        await expect(
+          async () =>
+            await authUtils.exchangeAuthCodeForAccessToken(authCode, {
+              ...webAuthOptions,
+              clientSecret: undefined as unknown as ClientSecret,
+            }),
+        ).rejects.toThrow('clientSecret is required to exchange an auth code');
+      });
+    });
+  });
+});
diff --git a/src/renderer/utils/auth/flows.ts b/src/renderer/utils/auth/flows.ts
new file mode 100644
index 000000000..25cf40c7c
--- /dev/null
+++ b/src/renderer/utils/auth/flows.ts
@@ -0,0 +1,194 @@
+import {
+  createDeviceCode,
+  exchangeDeviceCode,
+  exchangeWebFlowCode,
+  getWebFlowAuthorizationUrl,
+} from '@octokit/oauth-methods';
+import { request } from '@octokit/request';
+import { RequestError } from '@octokit/request-error';
+
+import { Constants } from '../../constants';
+
+import type { AuthCode, Hostname, Link, Token } from '../../types';
+import type {
+  AuthResponse,
+  DeviceFlowErrorResponse,
+  DeviceFlowSession,
+  LoginOAuthWebOptions,
+} from './types';
+
+import { rendererLogError, rendererLogInfo } from '../core/logger';
+import { openExternalLink } from '../system/comms';
+import { getRecommendedScopeNames } from './scopes';
+import { getGitHubAuthBaseUrl } from './utils';
+
+/**
+ * Initiate a GitHub OAuth Web Flow (OAuth App) authentication.
+ *
+ * Opens the GitHub authorization URL in the user's browser, then waits for the
+ * app's custom `gitify://oauth` callback to receive the authorization code.
+ *
+ * @param authOptions - The OAuth App client configuration and target hostname.
+ * @returns Resolves with the authorization code and options on success.
+ */
+export function performGitHubWebOAuth(
+  authOptions: LoginOAuthWebOptions,
+): Promise<AuthResponse> {
+  return new Promise((resolve, reject) => {
+    const { url } = getWebFlowAuthorizationUrl({
+      clientType: 'oauth-app',
+      clientId: authOptions.clientId,
+      scopes: getRecommendedScopeNames(),
+      allowSignup: false,
+      request: request.defaults({
+        baseUrl: `https://${authOptions.hostname}`,
+      }),
+    });
+
+    openExternalLink(url as Link);
+
+    const handleCallback = (callbackUrl: string) => {
+      const url = new URL(callbackUrl);
+
+      const type = url.hostname;
+      const code = url.searchParams.get('code');
+      const error = url.searchParams.get('error');
+      const errorDescription = url.searchParams.get('error_description');
+      const errorUri = url.searchParams.get('error_uri');
+
+      if (code && type === 'oauth') {
+        resolve({
+          authMethod: 'OAuth App',
+          authCode: code as AuthCode,
+          authOptions: authOptions,
+        });
+      } else if (error) {
+        reject(
+          new Error(
+            `Oops! Something went wrong and we couldn't log you in using GitHub. Please try again. Reason: ${errorDescription} Docs: ${errorUri}`,
+          ),
+        );
+      }
+    };
+
+    window.gitify.onAuthCallback((callbackUrl: string) => {
+      rendererLogInfo(
+        'renderer:auth-callback',
+        `received authentication callback URL ${callbackUrl}`,
+      );
+      handleCallback(callbackUrl);
+    });
+  });
+}
+
+/**
+ * Start a GitHub Device Flow authorization session.
+ *
+ * Requests a device code from GitHub and returns the session state
+ * (user code, verification URI, expiry) needed to complete the flow.
+ *
+ * @param hostname - The GitHub hostname to authenticate against. Defaults to github.com.
+ * @param scopes - Array of scope names to request. Defaults to recommended (full) scopes.
+ * @returns The device flow session data.
+ */
+export async function startGitHubDeviceFlow(
+  hostname: Hostname = Constants.GITHUB_HOSTNAME,
+  scopes: string[] = getRecommendedScopeNames(),
+): Promise<DeviceFlowSession> {
+  const deviceCode = await createDeviceCode({
+    clientType: 'oauth-app' as const,
+    clientId: Constants.OAUTH_DEVICE_FLOW_CLIENT_ID,
+    scopes: scopes,
+    request: request.defaults({
+      baseUrl: getGitHubAuthBaseUrl(hostname).toString(),
+    }),
+  });
+
+  return {
+    hostname: hostname,
+    clientId: Constants.OAUTH_DEVICE_FLOW_CLIENT_ID,
+    deviceCode: deviceCode.data.device_code,
+    userCode: deviceCode.data.user_code,
+    verificationUri: deviceCode.data.verification_uri,
+    intervalSeconds: deviceCode.data.interval,
+    expiresAt: Date.now() + deviceCode.data.expires_in * 1000,
+  } as DeviceFlowSession;
+}
+
+/**
+ * Poll GitHub to exchange a device code for an access token.
+ *
+ * Returns `null` when authorization is still pending ("authorization_pending"
+ * or "slow_down" error codes), allowing the caller to retry later.
+ * Throws for any other error.
+ *
+ * @param session - The active device flow session.
+ * @returns The access token when granted, or `null` when still pending.
+ */
+export async function pollGitHubDeviceFlow(
+  session: DeviceFlowSession,
+): Promise<Token | null> {
+  try {
+    const { authentication } = await exchangeDeviceCode({
+      clientType: 'oauth-app' as const,
+      clientId: session.clientId,
+      code: session.deviceCode,
+      request: request.defaults({
+        baseUrl: getGitHubAuthBaseUrl(session.hostname).toString(),
+      }),
+    });
+
+    return authentication.token as Token;
+  } catch (err) {
+    if (err instanceof RequestError) {
+      const response = err.response.data as DeviceFlowErrorResponse;
+      const errorCode = response.error;
+
+      if (errorCode === 'authorization_pending' || errorCode === 'slow_down') {
+        return null;
+      }
+    }
+
+    rendererLogError(
+      'pollGitHubDeviceFlow',
+      'Error exchanging device code',
+      err,
+    );
+
+    throw err;
+  }
+}
+
+/**
+ * Exchange an OAuth authorization code for an access token.
+ *
+ * `authOptions.clientSecret` is required; this step must be performed
+ * server-side or in a trusted context to keep the secret confidential.
+ *
+ * @param authCode - The authorization code received from the OAuth callback.
+ * @param authOptions - The OAuth App options, including the client secret.
+ * @returns The access token.
+ * @throws If `clientSecret` is absent.
+ */
+export async function exchangeAuthCodeForAccessToken(
+  authCode: AuthCode,
+  authOptions: LoginOAuthWebOptions,
+): Promise<Token> {
+  if (!authOptions.clientSecret) {
+    throw new Error('clientSecret is required to exchange an auth code');
+  }
+
+  const { authentication } = await exchangeWebFlowCode({
+    clientType: 'oauth-app',
+    clientId: authOptions.clientId,
+    clientSecret: authOptions.clientSecret,
+    code: authCode,
+    request: request.defaults({
+      baseUrl: getGitHubAuthBaseUrl(authOptions.hostname)
+        .toString()
+        .replace(/\/$/, ''),
+    }),
+  });
+
+  return authentication.token as Token;
+}
diff --git a/src/renderer/utils/auth/scopes.test.ts b/src/renderer/utils/auth/scopes.test.ts
new file mode 100644
index 000000000..647e28249
--- /dev/null
+++ b/src/renderer/utils/auth/scopes.test.ts
@@ -0,0 +1,115 @@
+import type { Account } from '../../types';
+
+import {
+  formatAlternateOAuthScopes,
+  formatRecommendedOAuthScopes,
+  formatRequiredOAuthScopes,
+  getAlternateScopeNames,
+  getRecommendedScopeNames,
+  getRequiredScopeNames,
+  hasAlternateScopes,
+  hasRecommendedScopes,
+  hasRequiredScopes,
+} from './scopes';
+
+describe('renderer/utils/auth/scopes.ts', () => {
+  describe('getRequiredScopeNames', () => {
+    it('returns the required scope names', () => {
+      expect(getRequiredScopeNames()).toEqual(['notifications', 'read:user']);
+    });
+  });
+
+  describe('getRecommendedScopeNames', () => {
+    it('returns the recommended scope names', () => {
+      expect(getRecommendedScopeNames()).toEqual([
+        'notifications',
+        'read:user',
+        'repo',
+      ]);
+    });
+  });
+
+  describe('getAlternateScopeNames', () => {
+    it('returns the alternate scope names', () => {
+      expect(getAlternateScopeNames()).toEqual([
+        'notifications',
+        'read:user',
+        'public_repo',
+      ]);
+    });
+  });
+
+  describe('formatRequiredOAuthScopes', () => {
+    it('returns required scopes as a comma-separated string', () => {
+      expect(formatRequiredOAuthScopes()).toBe('notifications, read:user');
+    });
+  });
+
+  describe('formatRecommendedOAuthScopes', () => {
+    it('returns recommended scopes as a comma-separated string', () => {
+      expect(formatRecommendedOAuthScopes()).toBe(
+        'notifications, read:user, repo',
+      );
+    });
+  });
+
+  describe('formatAlternateOAuthScopes', () => {
+    it('returns alternate scopes as a comma-separated string', () => {
+      expect(formatAlternateOAuthScopes()).toBe(
+        'notifications, read:user, public_repo',
+      );
+    });
+  });
+
+  describe('hasRequiredScopes', () => {
+    it('returns true when the account has all required scopes', () => {
+      const account = {
+        scopes: ['notifications', 'read:user', 'repo'],
+      } as Account;
+      expect(hasRequiredScopes(account)).toBe(true);
+    });
+
+    it('returns true for exactly the required scopes', () => {
+      const account = { scopes: ['notifications', 'read:user'] } as Account;
+      expect(hasRequiredScopes(account)).toBe(true);
+    });
+
+    it('returns false when a required scope is missing', () => {
+      const account = { scopes: ['notifications'] } as Account;
+      expect(hasRequiredScopes(account)).toBe(false);
+    });
+
+    it('returns false when scopes is undefined', () => {
+      const account = { scopes: undefined } as Account;
+      expect(hasRequiredScopes(account)).toBe(false);
+    });
+  });
+
+  describe('hasRecommendedScopes', () => {
+    it('returns true when the account has all recommended scopes', () => {
+      const account = {
+        scopes: ['notifications', 'read:user', 'repo'],
+      } as Account;
+      expect(hasRecommendedScopes(account)).toBe(true);
+    });
+
+    it('returns false when a recommended scope is missing', () => {
+      const account = { scopes: ['notifications', 'read:user'] } as Account;
+      expect(hasRecommendedScopes(account)).toBe(false);
+    });
+  });
+
+  describe('hasAlternateScopes', () => {
+    it('returns true when the account has all alternate scopes', () => {
+      const account = {
+        scopes: ['notifications', 'read:user', 'public_repo'],
+      } as Account;
+      expect(hasAlternateScopes(account)).toBe(true);
+    });
+
+    it('returns false when an alternate scope is missing', () => {
+      const account = { scopes: ['notifications', 'read:user'] } as Account;
+      expect(hasAlternateScopes(account)).toBe(false);
+    });
+  });
+});
diff --git a/src/renderer/utils/auth/scopes.ts b/src/renderer/utils/auth/scopes.ts
new file mode 100644
index 000000000..d2e3a7f51
--- /dev/null
+++ b/src/renderer/utils/auth/scopes.ts
@@ -0,0 +1,90 @@
+import { Constants } from '../../constants';
+
+import type { Account } from '../../types';
+
+/**
+ * Return true if the account has all required OAuth scopes.
+ *
+ * @param account - The account whose scopes to check.
+ */
+export function hasRequiredScopes(account: Account): boolean {
+  return Constants.OAUTH_SCOPES.REQUIRED.every(({ name }) =>
+    (account.scopes ?? []).includes(name),
+  );
+}
+
+/**
+ * Return true if the account has all recommended OAuth scopes.
+ *
+ * @param account - The account whose scopes to check.
+ */
+export function hasRecommendedScopes(account: Account): boolean {
+  return Constants.OAUTH_SCOPES.RECOMMENDED.every(({ name }) =>
+    (account.scopes ?? []).includes(name),
+  );
+}
+
+/**
+ * Return true if the account has all alternate OAuth scopes.
+ *
+ * @param account - The account whose scopes to check.
+ */
+export function hasAlternateScopes(account: Account): boolean {
+  return Constants.OAUTH_SCOPES.ALTERNATE.every(({ name }) =>
+    (account.scopes ?? []).includes(name),
+  );
+}
+
+/**
+ * Return the list of required OAuth scope names.
+ *
+ * @returns Array of required scope name strings.
+ */
+export function getRequiredScopeNames(): string[] {
+  return Constants.OAUTH_SCOPES.REQUIRED.map(({ name }) => name);
+}
+
+/**
+ * Return the list of recommended OAuth scope names.
+ *
+ * @returns Array of recommended scope name strings.
+ */
+export function getRecommendedScopeNames(): string[] {
+  return Constants.OAUTH_SCOPES.RECOMMENDED.map(({ name }) => name);
+}
+
+/**
+ * Return the list of alternate OAuth scope names.
+ *
+ * @returns Array of alternate scope name strings.
+ */
+export function getAlternateScopeNames(): string[] {
+  return Constants.OAUTH_SCOPES.ALTERNATE.map(({ name }) => name);
+}
+
+/**
+ * Return the required OAuth scopes as a comma-separated string.
+ *
+ * @returns Comma-separated required scope names.
+ */
+export function formatRequiredOAuthScopes(): string {
+  return getRequiredScopeNames().join(', ');
+}
+
+/**
+ * Return the recommended OAuth scopes as a comma-separated string.
+ *
+ * @returns Comma-separated recommended scope names.
+ */
+export function formatRecommendedOAuthScopes(): string {
+  return getRecommendedScopeNames().join(', ');
+}
+
+/**
+ * Return the alternate OAuth scopes as a comma-separated string.
+ *
+ * @returns Comma-separated alternate scope names.
+ */
+export function formatAlternateOAuthScopes(): string {
+  return getAlternateScopeNames().join(', ');
+}
diff --git a/src/renderer/utils/auth/utils.test.ts b/src/renderer/utils/auth/utils.test.ts
index 71b3e6ec5..2cd041170 100644
--- a/src/renderer/utils/auth/utils.test.ts
+++ b/src/renderer/utils/auth/utils.test.ts
@@ -1,25 +1,3 @@
-// Use a hoist-safe mock factory for '@octokit/oauth-methods'
-vi.mock('@octokit/oauth-methods', async () => {
-  const actual = await vi.importActual<typeof import('@octokit/oauth-methods')>(
-    '@octokit/oauth-methods',
-  );
-  return {
-    ...actual,
-    createDeviceCode: vi.fn(),
-    exchangeDeviceCode: vi.fn(),
-    exchangeWebFlowCode: vi.fn(),
-  };
-});
-
-import {
-  createDeviceCode,
-  exchangeDeviceCode,
-  exchangeWebFlowCode,
-} from '@octokit/oauth-methods';
-import { RequestError } from '@octokit/request-error';
-
-import type { MockedFunction } from 'vitest';
-
 import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
 import { mockAuth } from '../../__mocks__/state-mocks';
 import { mockRawUser } from '../api/__mocks__/response-mocks';
@@ -28,240 +6,33 @@ import { Constants } from '../../constants';
 
 import type {
   Account,
-  AuthCode,
   AuthState,
   ClientID,
-  ClientSecret,
   Hostname,
   Link,
   Token,
 } from '../../types';
 import type { GetAuthenticatedUserResponse } from '../api/types';
-import type {
-  AuthMethod,
-  DeviceFlowSession,
-  LoginOAuthWebOptions,
-} from './types';
+import type { AuthMethod } from './types';
 
-import * as comms from '../../utils/system/comms';
 import * as apiClient from '../api/client';
 import * as logger from '../core/logger';
+import { getRecommendedScopeNames } from './scopes';
 import * as authUtils from './utils';
 import {
   getGitHubAuthBaseUrl,
   getNewOAuthAppURL,
   getNewTokenURL,
-  getRecommendedScopeNames,
 } from './utils';
 
-const createDeviceCodeMock = createDeviceCode as unknown as MockedFunction<
-  typeof createDeviceCode
->;
-
-const exchangeDeviceCodeMock = exchangeDeviceCode as unknown as MockedFunction<
-  typeof exchangeDeviceCode
->;
-
-const exchangeWebFlowCodeMock =
-  exchangeWebFlowCode as unknown as MockedFunction<typeof exchangeWebFlowCode>;
-
 describe('renderer/utils/auth/utils.ts', () => {
   vi.spyOn(logger, 'rendererLogInfo').mockImplementation(vi.fn());
-  const openExternalLinkSpy = vi
-    .spyOn(comms, 'openExternalLink')
-    .mockImplementation(vi.fn());
 
   beforeEach(() => {
     // Mock OAUTH_DEVICE_FLOW_CLIENT_ID value
     Constants.OAUTH_DEVICE_FLOW_CLIENT_ID = 'FAKE_CLIENT_ID_123' as ClientID;
   });
 
-  describe('Gitify GitHub OAuth - Device Code Flow', () => {
-    describe('startGitHubDeviceFlow', () => {
-      it('should request a device code and return a session', async () => {
-        createDeviceCodeMock.mockResolvedValueOnce({
-          data: {
-            device_code: 'device-code-xyz',
-            user_code: 'user-code-xyz',
-            verification_uri: 'https://github.com/login/device',
-            expires_in: 600,
-            interval: 5,
-          },
-        } as unknown as Awaited<ReturnType<typeof createDeviceCode>>);
-
-        const session = await authUtils.startGitHubDeviceFlow();
-
-        expect(createDeviceCodeMock).toHaveBeenCalledWith({
-          clientType: 'oauth-app',
-          clientId: 'FAKE_CLIENT_ID_123',
-          scopes: getRecommendedScopeNames(),
-          request: expect.any(Function),
-        });
-
-        expect(session.deviceCode).toBe('device-code-xyz');
-        expect(session.userCode).toBe('user-code-xyz');
-        expect(session.verificationUri).toBe('https://github.com/login/device');
-        expect(session.intervalSeconds).toBe(5);
-        expect(session.expiresAt).toBeGreaterThan(Date.now());
-      });
-    });
-
-    describe('pollGitHubDeviceFlow', () => {
-      const baseSession = {
-        hostname: 'github.com',
-        clientId: 'FAKE_CLIENT_ID_123',
-        deviceCode: 'device-code',
-        userCode: 'user-code',
-        verificationUri: 'https://github.com/login/device',
-        intervalSeconds: 5,
-        expiresAt: Date.now() + 10000,
-      } as const;
-
-      it('returns token on successful exchange', async () => {
-        exchangeDeviceCodeMock.mockResolvedValueOnce({
-          authentication: { token: 'device-token-xyz' },
-        } as unknown as Awaited<ReturnType<typeof exchangeDeviceCode>>);
-
-        const token = await authUtils.pollGitHubDeviceFlow(
-          baseSession as DeviceFlowSession,
-        );
-
-        expect(exchangeDeviceCodeMock).toHaveBeenCalledWith({
-          clientType: 'oauth-app',
-          clientId: 'FAKE_CLIENT_ID_123',
-          code: 'device-code',
-          request: expect.any(Function),
-        });
-
-        expect(token).toBe('device-token-xyz');
-      });
-
-      it('returns null when authorization is pending or slow_down', async () => {
-        const pendingErr = Object.create(RequestError.prototype);
-        pendingErr.response = { data: { error: 'authorization_pending' } };
-
-        exchangeDeviceCodeMock.mockRejectedValueOnce(pendingErr);
-
-        const token = await authUtils.pollGitHubDeviceFlow(
-          baseSession as DeviceFlowSession,
-        );
-
-        expect(token).toBeNull();
-      });
-
-      it('throws on other errors', async () => {
-        const otherErr = new Error('boom');
-
-        exchangeDeviceCodeMock.mockRejectedValueOnce(otherErr);
-
-        await expect(
-          async () =>
-            await authUtils.pollGitHubDeviceFlow(
-              baseSession as DeviceFlowSession,
-            ),
-        ).rejects.toThrow('boom');
-      });
-    });
-  });
-
-  describe('performGitHubWebOAuth', () => {
-    const webAuthOptions: LoginOAuthWebOptions = {
-      hostname: 'github.com' as Hostname,
-      clientId: 'FAKE_CLIENT_ID_123' as ClientID,
-      clientSecret: 'FAKE_CLIENT_SECRET_123' as ClientSecret,
-    };
-
-    it('should call performGitHubWebOAuth using custom oauth app - success oauth flow', async () => {
-      window.gitify.onAuthCallback = vi.fn().mockImplementation((callback) => {
-        callback('gitify://oauth?code=123-456');
-      });
-
-      const res = await authUtils.performGitHubWebOAuth({
-        clientId: 'BYO_CLIENT_ID' as ClientID,
-        clientSecret: 'BYO_CLIENT_SECRET' as ClientSecret,
-        hostname: 'my.git.com' as Hostname,
-      });
-
-      expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          'https://my.git.com/login/oauth/authorize?allow_signup=false&client_id=BYO_CLIENT_ID&scope=notifications%2Cread%3Auser%2Crepo',
-        ),
-      );
-
-      expect(window.gitify.onAuthCallback).toHaveBeenCalledTimes(1);
-      expect(window.gitify.onAuthCallback).toHaveBeenCalledWith(
-        expect.any(Function),
-      );
-
-      expect(res.authMethod).toBe('OAuth App');
-      expect(res.authCode).toBe('123-456');
-    });
-
-    it('should call performGitHubWebOAuth - failure', async () => {
-      window.gitify.onAuthCallback = vi.fn().mockImplementation((callback) => {
-        callback(
-          'gitify://auth?error=invalid_request&error_description=The+redirect_uri+is+missing+or+invalid.&error_uri=https://docs.github.com/en/developers/apps/troubleshooting-oauth-errors',
-        );
-      });
-
-      await expect(
-        async () => await authUtils.performGitHubWebOAuth(webAuthOptions),
-      ).rejects.toEqual(
-        new Error(
-          "Oops! Something went wrong and we couldn't log you in using GitHub. Please try again. Reason: The redirect_uri is missing or invalid. Docs: https://docs.github.com/en/developers/apps/troubleshooting-oauth-errors",
-        ),
-      );
-
-      expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          'https://github.com/login/oauth/authorize?allow_signup=false&client_id=FAKE_CLIENT_ID_123&scope=notifications%2Cread%3Auser%2Crepo',
-        ),
-      );
-
-      expect(window.gitify.onAuthCallback).toHaveBeenCalledTimes(1);
-      expect(window.gitify.onAuthCallback).toHaveBeenCalledWith(
-        expect.any(Function),
-      );
-    });
-
-    describe('exchangeAuthCodeForAccessToken', () => {
-      const authCode = '123-456' as AuthCode;
-
-      it('should exchange auth code for access token', async () => {
-        exchangeWebFlowCodeMock.mockResolvedValueOnce({
-          authentication: {
-            token: 'this-is-a-token',
-          },
-        } as unknown as Awaited<ReturnType<typeof exchangeWebFlowCode>>);
-
-        const res = await authUtils.exchangeAuthCodeForAccessToken(authCode, {
-          ...webAuthOptions,
-        });
-
-        expect(exchangeWebFlowCodeMock).toHaveBeenCalledWith({
-          clientType: 'oauth-app',
-          clientId: 'FAKE_CLIENT_ID_123',
-          clientSecret: 'FAKE_CLIENT_SECRET_123',
-          code: '123-456',
-          request: expect.any(Function),
-        });
-        expect(res).toBe('this-is-a-token');
-      });
-
-      it('should throw when client secret is missing', async () => {
-        await expect(
-          async () =>
-            await authUtils.exchangeAuthCodeForAccessToken(authCode, {
-              ...webAuthOptions,
-              clientSecret: undefined as unknown as ClientSecret,
-            }),
-        ).rejects.toThrow('clientSecret is required to exchange an auth code');
-      });
-    });
-  });
-
   describe('addAccount', () => {
     let mockAuthState: AuthState;
 
diff --git a/src/renderer/utils/auth/utils.ts b/src/renderer/utils/auth/utils.ts
index 71f9b7cb5..561f6ef3c 100644
--- a/src/renderer/utils/auth/utils.ts
+++ b/src/renderer/utils/auth/utils.ts
@@ -1,12 +1,3 @@
-import {
-  createDeviceCode,
-  exchangeDeviceCode,
-  exchangeWebFlowCode,
-  getWebFlowAuthorizationUrl,
-} from '@octokit/oauth-methods';
-import { request } from '@octokit/request';
-import { RequestError } from '@octokit/request-error';
-
 import { format } from 'date-fns/format';
 import semver from 'semver';
 
@@ -17,20 +8,13 @@ import { Constants } from '../../constants';
 import type {
   Account,
   AccountUUID,
-  AuthCode,
   AuthState,
   ClientID,
   Hostname,
   Link,
   Token,
 } from '../../types';
-import type {
-  AuthMethod,
-  AuthResponse,
-  DeviceFlowErrorResponse,
-  DeviceFlowSession,
-  LoginOAuthWebOptions,
-} from './types';
+import type { AuthMethod } from './types';
 
 import { fetchAuthenticatedUserDetails } from '../api/client';
 import { clearOctokitClientCacheForAccount } from '../api/octokit';
@@ -39,179 +23,9 @@ import {
   rendererLogInfo,
   rendererLogWarn,
 } from '../core/logger';
-import { encryptValue, openExternalLink } from '../system/comms';
+import { encryptValue } from '../system/comms';
 import { getPlatformFromHostname } from './platform';
-
-/**
- * Initiate a GitHub OAuth Web Flow (OAuth App) authentication.
- *
- * Opens the GitHub authorization URL in the user's browser, then waits for the
- * app's custom `gitify://oauth` callback to receive the authorization code.
- *
- * @param authOptions - The OAuth App client configuration and target hostname.
- * @returns Resolves with the authorization code and options on success.
- */
-export function performGitHubWebOAuth(
-  authOptions: LoginOAuthWebOptions,
-): Promise<AuthResponse> {
-  return new Promise((resolve, reject) => {
-    const { url } = getWebFlowAuthorizationUrl({
-      clientType: 'oauth-app',
-      clientId: authOptions.clientId,
-      scopes: getRecommendedScopeNames(),
-      allowSignup: false,
-      request: request.defaults({
-        baseUrl: `https://${authOptions.hostname}`,
-      }),
-    });
-
-    openExternalLink(url as Link);
-
-    const handleCallback = (callbackUrl: string) => {
-      const url = new URL(callbackUrl);
-
-      const type = url.hostname;
-      const code = url.searchParams.get('code');
-      const error = url.searchParams.get('error');
-      const errorDescription = url.searchParams.get('error_description');
-      const errorUri = url.searchParams.get('error_uri');
-
-      if (code && type === 'oauth') {
-        resolve({
-          authMethod: 'OAuth App',
-          authCode: code as AuthCode,
-          authOptions: authOptions,
-        });
-      } else if (error) {
-        reject(
-          new Error(
-            `Oops! Something went wrong and we couldn't log you in using GitHub. Please try again. Reason: ${errorDescription} Docs: ${errorUri}`,
-          ),
-        );
-      }
-    };
-
-    window.gitify.onAuthCallback((callbackUrl: string) => {
-      rendererLogInfo(
-        'renderer:auth-callback',
-        `received authentication callback URL ${callbackUrl}`,
-      );
-      handleCallback(callbackUrl);
-    });
-  });
-}
-
-/**
- * Start a GitHub Device Flow authorization session.
- *
- * Requests a device code from GitHub and returns the session state
- * (user code, verification URI, expiry) needed to complete the flow.
- *
- * @param hostname - The GitHub hostname to authenticate against. Defaults to github.com.
- * @param scopes - Array of scope names to request. Defaults to recommended (full) scopes.
- * @returns The device flow session data.
- */
-export async function startGitHubDeviceFlow(
-  hostname: Hostname = Constants.GITHUB_HOSTNAME,
-  scopes: string[] = getRecommendedScopeNames(),
-): Promise<DeviceFlowSession> {
-  const deviceCode = await createDeviceCode({
-    clientType: 'oauth-app' as const,
-    clientId: Constants.OAUTH_DEVICE_FLOW_CLIENT_ID,
-    scopes: scopes,
-    request: request.defaults({
-      baseUrl: getGitHubAuthBaseUrl(hostname).toString(),
-    }),
-  });
-
-  return {
-    hostname: hostname,
-    clientId: Constants.OAUTH_DEVICE_FLOW_CLIENT_ID,
-    deviceCode: deviceCode.data.device_code,
-    userCode: deviceCode.data.user_code,
-    verificationUri: deviceCode.data.verification_uri,
-    intervalSeconds: deviceCode.data.interval,
-    expiresAt: Date.now() + deviceCode.data.expires_in * 1000,
-  } as DeviceFlowSession;
-}
-
-/**
- * Poll GitHub to exchange a device code for an access token.
- *
- * Returns `null` when authorization is still pending ("authorization_pending"
- * or "slow_down" error codes), allowing the caller to retry later.
- * Throws for any other error.
- *
- * @param session - The active device flow session.
- * @returns The access token when granted, or `null` when still pending.
- */
-export async function pollGitHubDeviceFlow(
-  session: DeviceFlowSession,
-): Promise<Token | null> {
-  try {
-    const { authentication } = await exchangeDeviceCode({
-      clientType: 'oauth-app' as const,
-      clientId: session.clientId,
-      code: session.deviceCode,
-      request: request.defaults({
-        baseUrl: getGitHubAuthBaseUrl(session.hostname).toString(),
-      }),
-    });
-
-    return authentication.token as Token;
-  } catch (err) {
-    if (err instanceof RequestError) {
-      const response = err.response.data as DeviceFlowErrorResponse;
-      const errorCode = response.error;
-
-      if (errorCode === 'authorization_pending' || errorCode === 'slow_down') {
-        return null;
-      }
-    }
-
-    rendererLogError(
-      'pollGitHubDeviceFlow',
-      'Error exchanging device code',
-      err,
-    );
-
-    throw err;
-  }
-}
-
-/**
- * Exchange an OAuth authorization code for an access token.
- *
- * `authOptions.clientSecret` is required; this step must be performed
- * server-side or in a trusted context to keep the secret confidential.
- *
- * @param authCode - The authorization code received from the OAuth callback.
- * @param authOptions - The OAuth App options, including the client secret.
- * @returns The access token.
- * @throws If `clientSecret` is absent.
- */
-export async function exchangeAuthCodeForAccessToken(
-  authCode: AuthCode,
-  authOptions: LoginOAuthWebOptions,
-): Promise<Token> {
-  if (!authOptions.clientSecret) {
-    throw new Error('clientSecret is required to exchange an auth code');
-  }
-
-  const { authentication } = await exchangeWebFlowCode({
-    clientType: 'oauth-app',
-    clientId: authOptions.clientId,
-    clientSecret: authOptions.clientSecret,
-    code: authCode,
-    request: request.defaults({
-      baseUrl: getGitHubAuthBaseUrl(authOptions.hostname)
-        .toString()
-        .replace(/\/$/, ''),
-    }),
-  });
-
-  return authentication.token as Token;
-}
+import { getRecommendedScopeNames, hasRequiredScopes } from './scopes';
 
 /**
  * Add or update an account in the auth state.
@@ -549,90 +363,3 @@ export function hasAccounts(auth: AuthState) {
 export function hasMultipleAccounts(auth: AuthState) {
   return auth.accounts.length > 1;
 }
-
-/**
- * Return true if the account has all required OAuth scopes.
- *
- * @param account - The account whose scopes to check.
- */
-export function hasRequiredScopes(account: Account): boolean {
-  return Constants.OAUTH_SCOPES.REQUIRED.every(({ name }) =>
-    (account.scopes ?? []).includes(name),
-  );
-}
-
-/**
- * Return true if the account has all recommended OAuth scopes.
- *
- * @param account - The account whose scopes to check.
- */
-export function hasRecommendedScopes(account: Account): boolean {
-  return Constants.OAUTH_SCOPES.RECOMMENDED.every(({ name }) =>
-    (account.scopes ?? []).includes(name),
-  );
-}
-
-/**
- * Return true if the account has all alternate OAuth scopes.
- *
- * @param account - The account whose scopes to check.
- */
-export function hasAlternateScopes(account: Account): boolean {
-  return Constants.OAUTH_SCOPES.ALTERNATE.every(({ name }) =>
-    (account.scopes ?? []).includes(name),
-  );
-}
-
-/**
- * Return the list of required OAuth scope names.
- *
- * @returns Array of required scope name strings.
- */
-export function getRequiredScopeNames(): string[] {
-  return Constants.OAUTH_SCOPES.REQUIRED.map(({ name }) => name);
-}
-
-/**
- * Return the list of recommended OAuth scope names.
- *
- * @returns Array of recommended scope name strings.
- */
-export function getRecommendedScopeNames(): string[] {
-  return Constants.OAUTH_SCOPES.RECOMMENDED.map(({ name }) => name);
-}
-
-/**
- * Return the list of alternate OAuth scope names.
- *
- * @returns Array of alternate scope name strings.
- */
-export function getAlternateScopeNames(): string[] {
-  return Constants.OAUTH_SCOPES.ALTERNATE.map(({ name }) => name);
-}
-
-/**
- * Return the required OAuth scopes as a comma-separated string.
- *
- * @returns Comma-separated required scope names.
- */
-export function formatRequiredOAuthScopes(): string {
-  return getRequiredScopeNames().join(', ');
-}
-
-/**
- * Return the recommended OAuth scopes as a comma-separated string.
- *
- * @returns Comma-separated recommended scope names.
- */
-export function formatRecommendedOAuthScopes(): string {
-  return getRecommendedScopeNames().join(', ');
-}
-
-/**
- * Return the alternate OAuth scopes as a comma-separated string.
- *
- * @returns Comma-separated alternate scope names.
- */
-export function formatAlternateOAuthScopes(): string {
-  return getAlternateScopeNames().join(', ');
-}