diff --git a/src/renderer/components/buttons/PillButton.tsx b/src/renderer/components/buttons/PillButton.tsx
index d9735c2e7..569ac6c3c 100644
--- a/src/renderer/components/buttons/PillButton.tsx
+++ b/src/renderer/components/buttons/PillButton.tsx
@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 
 import type { Icon } from '@primer/octicons-react';
-import { Octicon, Stack, Text } from '@primer/react';
+import { Stack, Text } from '@primer/react';
 
 import { type IconColor, Size } from '../../types';
 
@@ -21,7 +21,7 @@ export const PillButton: FC<IPillButton> = (props: IPillButton) => {
       className="flex gap-1 items-center text-xxs px-1 m-0.5 rounded-full bg-gitify-pill-rest hover:bg-gitify-pill-hover"
     >
       <Stack direction="horizontal" align="center" gap="condensed">
-        <Octicon icon={props.icon} size={Size.XSMALL} className={props.color} />
+        <props.icon size={Size.XSMALL} className={props.color} />
         {props.metric && <Text>{props.metric}</Text>}
       </Stack>
     </button>
diff --git a/src/renderer/components/buttons/__snapshots__/PillButton.test.tsx.snap b/src/renderer/components/buttons/__snapshots__/PillButton.test.tsx.snap
index c0017bb51..c12eda093 100644
--- a/src/renderer/components/buttons/__snapshots__/PillButton.test.tsx.snap
+++ b/src/renderer/components/buttons/__snapshots__/PillButton.test.tsx.snap
@@ -21,7 +21,7 @@ exports[`renderer/components/buttons/PillButton.tsx should render with metric 1`
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-mark-github Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-mark-github text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -61,7 +61,7 @@ exports[`renderer/components/buttons/PillButton.tsx should render with metric 1`
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-mark-github Octicon-sc-9kayk9-0 text-primer-open"
+          class="octicon octicon-mark-github text-primer-open"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -158,7 +158,7 @@ exports[`renderer/components/buttons/PillButton.tsx should render without metric
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-mark-github Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-mark-github text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -193,7 +193,7 @@ exports[`renderer/components/buttons/PillButton.tsx should render without metric
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-mark-github Octicon-sc-9kayk9-0 text-primer-open"
+          class="octicon octicon-mark-github text-primer-open"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/notifications/NotificationRow.tsx b/src/renderer/components/notifications/NotificationRow.tsx
index 8dcdbb4fa..123257ca8 100644
--- a/src/renderer/components/notifications/NotificationRow.tsx
+++ b/src/renderer/components/notifications/NotificationRow.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react';
 
 import { BellSlashIcon, CheckIcon, ReadIcon } from '@primer/octicons-react';
-import { IconButton, Octicon, Tooltip } from '@primer/react';
+import { IconButton, Tooltip } from '@primer/react';
 
 import { AppContext } from '../../context/App';
 import { Opacity, Size } from '../../types';
@@ -96,11 +96,7 @@ export const NotificationRow: FC<INotificationRow> = ({
     >
       <div className="mr-3 flex items-center justify-center">
         <Tooltip text={notificationType} direction="e">
-          <Octicon
-            icon={NotificationIcon}
-            size={Size.LARGE}
-            className={iconColor}
-          />
+          <NotificationIcon size={Size.LARGE} className={iconColor} />
         </Tooltip>
       </div>
 
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 2b3d69300..d72381d3d 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -762,7 +762,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-opened text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -880,7 +880,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                    class="octicon octicon-check text-primer-open"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -917,7 +917,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                    class="octicon octicon-file-diff text-primer-closed"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1085,7 +1085,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-issue-opened text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1543,7 +1543,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-opened text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1661,7 +1661,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                  class="octicon octicon-check text-primer-open"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1698,7 +1698,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                  class="octicon octicon-file-diff text-primer-closed"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1866,7 +1866,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-issue-opened text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
index 6336237a3..f39c94326 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -51,7 +51,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                class="octicon octicon-check text-primer-open"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -88,7 +88,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                class="octicon octicon-file-diff text-primer-closed"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -160,7 +160,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -197,7 +197,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -326,7 +326,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                class="octicon octicon-check text-primer-open"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -363,7 +363,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                class="octicon octicon-file-diff text-primer-closed"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -435,7 +435,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -472,7 +472,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -605,7 +605,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                class="octicon octicon-check text-primer-open"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -642,7 +642,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                class="octicon octicon-file-diff text-primer-closed"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -718,7 +718,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -755,7 +755,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -884,7 +884,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                class="octicon octicon-check text-primer-open"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -921,7 +921,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                class="octicon octicon-file-diff text-primer-closed"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -993,7 +993,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1030,7 +1030,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1159,7 +1159,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                class="octicon octicon-check text-primer-open"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1196,7 +1196,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                class="octicon octicon-file-diff text-primer-closed"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1268,7 +1268,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1305,7 +1305,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index c0463e94d..a3188463e 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-opened text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -138,7 +138,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                    class="octicon octicon-check text-primer-open"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -175,7 +175,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                    class="octicon octicon-file-diff text-primer-closed"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -346,7 +346,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-opened text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -464,7 +464,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                  class="octicon octicon-check text-primer-open"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -501,7 +501,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                  class="octicon octicon-file-diff text-primer-closed"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -729,7 +729,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-opened text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -811,7 +811,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                    class="octicon octicon-check text-primer-open"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -848,7 +848,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                    class="octicon octicon-file-diff text-primer-closed"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1019,7 +1019,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-opened text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1101,7 +1101,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                  class="octicon octicon-check text-primer-open"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1138,7 +1138,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                  class="octicon octicon-file-diff text-primer-closed"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1366,7 +1366,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-opened text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1448,7 +1448,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                    class="octicon octicon-check text-primer-open"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1485,7 +1485,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                    class="octicon octicon-file-diff text-primer-closed"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1656,7 +1656,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-opened Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-opened text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1738,7 +1738,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+                  class="octicon octicon-check text-primer-open"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1775,7 +1775,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+                  class="octicon octicon-file-diff text-primer-closed"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
diff --git a/src/renderer/components/notifications/__snapshots__/Pills.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/Pills.test.tsx.snap
index d0a982938..6fb7651bf 100644
--- a/src/renderer/components/notifications/__snapshots__/Pills.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/Pills.test.tsx.snap
@@ -24,7 +24,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -64,7 +64,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -101,7 +101,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -138,7 +138,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-comment text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -182,7 +182,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -222,7 +222,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -259,7 +259,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -296,7 +296,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-comment text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -397,7 +397,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -437,7 +437,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -474,7 +474,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -511,7 +511,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-comment text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -555,7 +555,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -595,7 +595,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -632,7 +632,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -669,7 +669,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-comment text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -770,7 +770,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -810,7 +810,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -847,7 +847,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -891,7 +891,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -931,7 +931,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -968,7 +968,7 @@ exports[`renderer/components/notifications/Pills.tsx comment pills should render
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1069,7 +1069,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1109,7 +1109,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1146,7 +1146,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1183,7 +1183,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-comment text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1221,7 +1221,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-tag Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-tag text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1265,7 +1265,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1305,7 +1305,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1342,7 +1342,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1379,7 +1379,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-comment text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1417,7 +1417,7 @@ exports[`renderer/components/notifications/Pills.tsx label pills should render l
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-tag Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-tag text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1518,7 +1518,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1558,7 +1558,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1595,7 +1595,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1639,7 +1639,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1679,7 +1679,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1716,7 +1716,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1817,7 +1817,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1857,7 +1857,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1894,7 +1894,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1938,7 +1938,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -1978,7 +1978,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2015,7 +2015,7 @@ exports[`renderer/components/notifications/Pills.tsx linked issue pills should r
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2116,7 +2116,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2156,7 +2156,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2193,7 +2193,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2230,7 +2230,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-comment text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2268,7 +2268,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-tag Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-tag text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2305,7 +2305,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-milestone Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-milestone text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2344,7 +2344,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2384,7 +2384,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2421,7 +2421,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2458,7 +2458,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-comment text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2496,7 +2496,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-tag Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-tag text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2533,7 +2533,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-milestone Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-milestone text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2629,7 +2629,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-issue-closed text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2669,7 +2669,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-check text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2706,7 +2706,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+              class="octicon octicon-file-diff text-primer-closed"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2743,7 +2743,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-comment text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2781,7 +2781,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-tag Octicon-sc-9kayk9-0 text-primer-muted"
+              class="octicon octicon-tag text-primer-muted"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2818,7 +2818,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-milestone Octicon-sc-9kayk9-0 text-primer-open"
+              class="octicon octicon-milestone text-primer-open"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -2857,7 +2857,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-issue-closed Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-issue-closed text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2897,7 +2897,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-check Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-check text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2934,7 +2934,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-file-diff Octicon-sc-9kayk9-0 text-primer-closed"
+            class="octicon octicon-file-diff text-primer-closed"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2971,7 +2971,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-comment Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-comment text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -3009,7 +3009,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-tag Octicon-sc-9kayk9-0 text-primer-muted"
+            class="octicon octicon-tag text-primer-muted"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -3046,7 +3046,7 @@ exports[`renderer/components/notifications/Pills.tsx milestone pills should rend
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-milestone Octicon-sc-9kayk9-0 text-primer-open"
+            class="octicon octicon-milestone text-primer-open"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/primitives/Header.tsx b/src/renderer/components/primitives/Header.tsx
index 60709bad0..8152d5ab3 100644
--- a/src/renderer/components/primitives/Header.tsx
+++ b/src/renderer/components/primitives/Header.tsx
@@ -2,8 +2,8 @@ import { type FC, useContext } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { ArrowLeftIcon, type Icon } from '@primer/octicons-react';
+import { Heading, IconButton, Stack } from '@primer/react';
 
-import { Heading, IconButton, Octicon, Stack } from '@primer/react';
 import { AppContext } from '../../context/App';
 import { Size } from '../../types';
 
@@ -36,7 +36,7 @@ export const Header: FC<IHeader> = (props: IHeader) => {
         />
 
         <Stack direction="horizontal" align="center" gap="condensed">
-          <Octicon icon={props.icon} size={Size.LARGE} />
+          <props.icon size={Size.LARGE} />
           <Heading sx={{ fontSize: 3 }}>{props.children}</Heading>
         </Stack>
       </Stack>
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index a754a6d36..81cc5f4b3 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -55,7 +55,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-mark-github Octicon-sc-9kayk9-0"
+              class="octicon octicon-mark-github"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -131,7 +131,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-mark-github Octicon-sc-9kayk9-0"
+            class="octicon octicon-mark-github"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/routes/Settings.tsx b/src/renderer/routes/Settings.tsx
index 769318502..ec75d7635 100644
--- a/src/renderer/routes/Settings.tsx
+++ b/src/renderer/routes/Settings.tsx
@@ -34,7 +34,7 @@ export const SettingsRoute: FC = () => {
           <NotificationSettings />
           <SystemSettings />
         </Stack>
-        <Stack align="center">
+        <Stack align="center" padding={'spacious'}>
           <Button
             variant="danger"
             onClick={() => setIsOpen(!isOpen)}
diff --git a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
index 182587cdb..627af1577 100644
--- a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
@@ -55,7 +55,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-person Octicon-sc-9kayk9-0"
+          class="octicon octicon-person"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1286,7 +1286,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-person Octicon-sc-9kayk9-0"
+          class="octicon octicon-person"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -2517,7 +2517,7 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-person Octicon-sc-9kayk9-0"
+          class="octicon octicon-person"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index 9365209c6..024fb13af 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -55,7 +55,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-filter Octicon-sc-9kayk9-0"
+          class="octicon octicon-filter"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index f6de0dcc7..bb06c8397 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-person Octicon-sc-9kayk9-0"
+                class="octicon octicon-person"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -386,7 +386,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-person Octicon-sc-9kayk9-0"
+              class="octicon octicon-person"
               display="inline-block"
               fill="currentColor"
               focusable="false"
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index b145a2a12..e2e8c5f43 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -55,7 +55,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-key Octicon-sc-9kayk9-0"
+              class="octicon octicon-key"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -364,7 +364,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
         >
           <svg
             aria-hidden="true"
-            class="octicon octicon-key Octicon-sc-9kayk9-0"
+            class="octicon octicon-key"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 975476ca3..1986a2d97 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -55,7 +55,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
       >
         <svg
           aria-hidden="true"
-          class="octicon octicon-gear Octicon-sc-9kayk9-0"
+          class="octicon octicon-gear"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1062,7 +1062,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
       data-align="center"
       data-direction="vertical"
       data-justify="start"
-      data-padding="none"
+      data-padding="spacious"
       data-wrap="nowrap"
     >
       <button