diff --git a/package.json b/package.json
index 2d8029f6f..0b37b8399 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "@octokit/types": "16.0.0",
     "@parcel/watcher": "2.5.6",
     "@primer/css": "22.1.1",
-    "@primer/octicons-react": "19.23.1",
+    "@primer/octicons-react": "19.24.1",
     "@primer/react": "38.20.0",
     "@swc-contrib/plugin-graphql-codegen-client-preset": "0.20.0",
     "@tailwindcss/vite": "4.2.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 06eb7150d..44b7eacf4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -85,8 +85,8 @@ importers:
         specifier: 22.1.1
         version: 22.1.1(@primer/primitives@11.7.1)
       '@primer/octicons-react':
-        specifier: 19.23.1
-        version: 19.23.1(react@19.2.5)
+        specifier: 19.24.1
+        version: 19.24.1(react@19.2.5)
       '@primer/react':
         specifier: 38.20.0
         version: 38.20.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@19.2.5)(react@19.2.5)
@@ -1034,8 +1034,8 @@ packages:
   '@primer/live-region-element@0.7.2':
     resolution: {integrity: sha512-wdxCHfcJzE1IPPjZNFR4RTwRcSWb7TN0fRdMH5HcxphLEnuZBWy0TAxk3xPA+/6lwiN3uEJ+ZWV4UF/glXh43A==}
 
-  '@primer/octicons-react@19.23.1':
-    resolution: {integrity: sha512-Ldiu3zZ46YGKj4PawrbnbPxwKs+8+2Zz0J24bV4PPYPrqbNo9sSbd9aHtIAyWs8PaMohlsJGfxQtHMyKt7odjg==}
+  '@primer/octicons-react@19.24.1':
+    resolution: {integrity: sha512-Y4EqqNb6VrFWfs9HDu3EUpFNm2xbOWMh6uEyXn968gQgXDxfRjBKhWoogrMsbo74S3mGAP0KYSxL8ZebWHDRtA==}
     engines: {node: '>=8'}
     peerDependencies:
       react: '>=16.3'
@@ -5169,7 +5169,7 @@ snapshots:
     dependencies:
       '@lit-labs/ssr-dom-shim': 1.5.1
 
-  '@primer/octicons-react@19.23.1(react@19.2.5)':
+  '@primer/octicons-react@19.24.1(react@19.2.5)':
     dependencies:
       react: 19.2.5
 
@@ -5184,7 +5184,7 @@ snapshots:
       '@oddbird/popover-polyfill': 0.5.2
       '@primer/behaviors': 1.10.2
       '@primer/live-region-element': 0.7.2
-      '@primer/octicons-react': 19.23.1(react@19.2.5)
+      '@primer/octicons-react': 19.24.1(react@19.2.5)
       '@primer/primitives': 11.7.1
       '@tanstack/react-virtual': 3.13.24(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       clsx: 2.1.1
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 184073b15..ca874fa2b 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`renderer/components/Sidebar.tsx > Filter notifications > highlight filt
   <svg
     aria-hidden="true"
     class="octicon octicon-filter"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -48,6 +49,7 @@ exports[`renderer/components/Sidebar.tsx > notifications icon > renders correct
   <svg
     aria-hidden="true"
     class="octicon octicon-bell"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -80,6 +82,7 @@ exports[`renderer/components/Sidebar.tsx > notifications icon > renders correct
   <svg
     aria-hidden="true"
     class="octicon octicon-bell"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -233,6 +236,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-bell"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -308,6 +312,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-eye"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -383,6 +388,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-filter"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -457,6 +463,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -533,6 +540,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -617,6 +625,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-sync"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -692,6 +701,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-gear"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -894,6 +904,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-bell"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -968,6 +979,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1044,6 +1056,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1127,6 +1140,7 @@ exports[`renderer/components/Sidebar.tsx > should render itself & its children (
         <svg
           aria-hidden="true"
           class="octicon octicon-x-circle"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
index cb5c38f18..8b702e204 100644
--- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
+++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
@@ -15,6 +15,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallba
     <svg
       aria-hidden="true"
       class="octicon octicon-feed-person"
+      data-component="Octicon"
       display="inline-block"
       fill="currentColor"
       focusable="false"
@@ -55,6 +56,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallba
     <svg
       aria-hidden="true"
       class="octicon octicon-mark-github"
+      data-component="Octicon"
       display="inline-block"
       fill="currentColor"
       focusable="false"
@@ -94,6 +96,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallba
   <svg
     aria-hidden="true"
     class="octicon octicon-feed-person"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -132,6 +135,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx > renders the fallba
   <svg
     aria-hidden="true"
     class="octicon octicon-mark-github"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
diff --git a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
index 53df831a9..99d271ce6 100644
--- a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
@@ -132,6 +132,7 @@ exports[`renderer/components/fields/Checkbox.tsx > should render - tooltip 1`] =
       <svg
         aria-hidden="true"
         class="octicon octicon-question text-gitify-tooltip-icon"
+        data-component="Octicon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index 377746471..ec762201a 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-mark-github"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -85,6 +86,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -192,6 +194,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -245,6 +248,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -292,6 +296,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-mark-github"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -355,6 +360,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -462,6 +468,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -515,6 +522,7 @@ exports[`renderer/components/filters/FilterSection.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index 24cb7ed65..42ad345a1 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-note"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -52,6 +53,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
             <svg
               aria-hidden="true"
               class="octicon octicon-question text-gitify-tooltip-icon"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -111,6 +113,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -164,6 +167,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -217,6 +221,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -270,6 +275,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -323,6 +329,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -376,6 +383,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -429,6 +437,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -482,6 +491,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -535,6 +545,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -588,6 +599,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -641,6 +653,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -694,6 +707,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -747,6 +761,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -800,6 +815,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -853,6 +869,7 @@ exports[`renderer/components/filters/ReasonFilter.tsx > should render itself & i
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index 040a89a04..8469ecbc7 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`renderer/components/filters/StateFilter.tsx > should render itself & it
           <svg
             aria-hidden="true"
             class="octicon octicon-issue-opened"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -55,6 +56,7 @@ exports[`renderer/components/filters/StateFilter.tsx > should render itself & it
             <svg
               aria-hidden="true"
               class="octicon octicon-question text-gitify-tooltip-icon"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -114,6 +116,7 @@ exports[`renderer/components/filters/StateFilter.tsx > should render itself & it
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -221,6 +224,7 @@ exports[`renderer/components/filters/StateFilter.tsx > should render itself & it
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -274,6 +278,7 @@ exports[`renderer/components/filters/StateFilter.tsx > should render itself & it
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index 6dcf3346f..6c286defc 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx > should render itsel
           <svg
             aria-hidden="true"
             class="octicon octicon-bell"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -52,6 +53,7 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx > should render itsel
             <svg
               aria-hidden="true"
               class="octicon octicon-question text-gitify-tooltip-icon"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index 5a3986d57..47620f6ee 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-feed-person"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -52,6 +53,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx > should render itself &
             <svg
               aria-hidden="true"
               class="octicon octicon-question text-gitify-tooltip-icon"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -111,6 +113,7 @@ exports[`renderer/components/filters/UserTypeFilter.tsx > should render itself &
           <svg
             aria-hidden="true"
             class="octicon octicon-question text-gitify-tooltip-icon"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap b/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap
index 3d6be51be..846348b01 100644
--- a/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap
+++ b/src/renderer/components/icons/__snapshots__/ScopeStatusIcon.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`renderer/components/icons/ScopeStatusIcon.tsx > granted state > renders
   <svg
     aria-hidden="true"
     class="octicon octicon-check-circle-fill text-gitify-success"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -26,6 +27,7 @@ exports[`renderer/components/icons/ScopeStatusIcon.tsx > missing state > renders
   <svg
     aria-hidden="true"
     class="octicon octicon-x-circle-fill text-gitify-danger"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -47,6 +49,7 @@ exports[`renderer/components/icons/ScopeStatusIcon.tsx > notApplicable state > r
   <svg
     aria-hidden="true"
     class="octicon octicon-dash opacity-30"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
@@ -68,6 +71,7 @@ exports[`renderer/components/icons/ScopeStatusIcon.tsx > size prop > renders cor
   <svg
     aria-hidden="true"
     class="octicon octicon-check-circle-fill text-gitify-success"
+    data-component="Octicon"
     display="inline-block"
     fill="currentColor"
     focusable="false"
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index c5280203d..35edfe5fc 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -147,6 +147,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <svg
             aria-hidden="true"
             class="octicon octicon-bell"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -222,6 +223,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <svg
             aria-hidden="true"
             class="octicon octicon-eye"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -297,6 +299,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <svg
             aria-hidden="true"
             class="octicon octicon-filter"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -371,6 +374,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <svg
             aria-hidden="true"
             class="octicon octicon-issue-opened"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -447,6 +451,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <svg
             aria-hidden="true"
             class="octicon octicon-git-pull-request"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -531,6 +536,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <svg
             aria-hidden="true"
             class="octicon octicon-sync"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -606,6 +612,7 @@ exports[`renderer/components/layout/AppLayout.tsx > should render itself & its c
           <svg
             aria-hidden="true"
             class="octicon octicon-gear"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
index d5e2d778f..4dddf0e9f 100644
--- a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with 1 comment 1
         <svg
           aria-hidden="true"
           class="octicon octicon-comment text-gitify-icon-muted"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -82,6 +83,7 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with multiple co
         <svg
           aria-hidden="true"
           class="octicon octicon-comment text-gitify-icon-muted"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
index 3d57d29ca..93a5f1d2e 100644
--- a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`renderer/components/metrics/LabelsPill.tsx > renders with labels 1`] =
         <svg
           aria-hidden="true"
           class="octicon octicon-tag text-gitify-icon-muted"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
index 2ac1a61b6..0eb2c5444 100644
--- a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened text-gitify-icon-muted"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -85,6 +86,7 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened text-gitify-icon-muted"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
index 19dd79b28..ace47e83e 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
@@ -29,6 +29,7 @@ exports[`renderer/components/metrics/MetricGroup.tsx > should render pills when
           <svg
             aria-hidden="true"
             class="octicon octicon-check text-gitify-icon-open"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -82,6 +83,7 @@ exports[`renderer/components/metrics/MetricGroup.tsx > should render pills when
           <svg
             aria-hidden="true"
             class="octicon octicon-file-diff text-gitify-icon-closed"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
index 0266c6600..fc7cffa8d 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`renderer/components/metrics/MetricPill.tsx > should render with metric
         <svg
           aria-hidden="true"
           class="octicon octicon-mark-github text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -82,6 +83,7 @@ exports[`renderer/components/metrics/MetricPill.tsx > should render without metr
         <svg
           aria-hidden="true"
           class="octicon octicon-mark-github text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
index add54dd78..741da2696 100644
--- a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders closed mileston
         <svg
           aria-hidden="true"
           class="octicon octicon-milestone text-gitify-icon-done"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -77,6 +78,7 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders open milestone
         <svg
           aria-hidden="true"
           class="octicon octicon-milestone text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
index 17c41dec9..510390c34 100644
--- a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when multiple r
         <svg
           aria-hidden="true"
           class="octicon octicon-smiley text-gitify-icon-muted"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -215,6 +216,7 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when one reacti
         <svg
           aria-hidden="true"
           class="octicon octicon-smiley text-gitify-icon-muted"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
index 14e29f23f..e313eb638 100644
--- a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
@@ -26,6 +26,7 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
         <svg
           aria-hidden="true"
           class="octicon octicon-check text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -79,6 +80,7 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
         <svg
           aria-hidden="true"
           class="octicon octicon-file-diff text-gitify-icon-closed"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 5c6dae8ad..c5a33832a 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -105,6 +105,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -137,6 +138,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -166,6 +168,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-left"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -339,6 +342,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -371,6 +375,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -400,6 +405,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-left"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -573,6 +579,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -605,6 +612,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -634,6 +642,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-down"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -670,6 +679,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-label="Open Issue"
           class="octicon octicon-issue-opened text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -868,6 +878,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-check text-gitify-icon-open"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -921,6 +932,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-file-diff text-gitify-icon-closed"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -980,6 +992,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1009,6 +1022,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1038,6 +1052,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-bell-slash"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1074,6 +1089,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-label="Issue"
           class="octicon octicon-issue-opened text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1213,6 +1229,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
             <svg
               aria-hidden="true"
               class="octicon octicon-feed-person"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1278,6 +1295,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1307,6 +1325,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1336,6 +1355,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-bell-slash"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1460,6 +1480,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1492,6 +1513,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1521,6 +1543,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-down"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1648,6 +1671,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1680,6 +1704,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1709,6 +1734,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should ren
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-left"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1877,6 +1903,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should tog
         <svg
           aria-hidden="true"
           class="octicon octicon-issue-opened"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1909,6 +1936,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should tog
         <svg
           aria-hidden="true"
           class="octicon octicon-git-pull-request"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1938,6 +1966,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx > should tog
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-down"
+          data-component="Octicon"
           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 936946389..1132c0cf4 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -83,6 +83,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
             <svg
               aria-hidden="true"
               class="octicon octicon-check text-gitify-icon-open"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -136,6 +137,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
             <svg
               aria-hidden="true"
               class="octicon octicon-file-diff text-gitify-icon-closed"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -255,6 +257,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
             <svg
               aria-hidden="true"
               class="octicon octicon-check text-gitify-icon-open"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -308,6 +311,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > security ale
             <svg
               aria-hidden="true"
               class="octicon octicon-file-diff text-gitify-icon-closed"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -368,6 +372,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
       <svg
         aria-hidden="true"
         class="octicon octicon-feed-person"
+        data-component="Octicon"
         display="inline-block"
         fill="currentColor"
         focusable="false"
@@ -428,6 +433,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
             <svg
               aria-hidden="true"
               class="octicon octicon-check text-gitify-icon-open"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -481,6 +487,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should defau
             <svg
               aria-hidden="true"
               class="octicon octicon-file-diff text-gitify-icon-closed"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -600,6 +607,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should rende
             <svg
               aria-hidden="true"
               class="octicon octicon-check text-gitify-icon-open"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -653,6 +661,7 @@ exports[`renderer/components/notifications/NotificationFooter.tsx > should rende
             <svg
               aria-hidden="true"
               class="octicon octicon-file-diff text-gitify-icon-closed"
+              data-component="Octicon"
               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 4ccec3a9d..6fd42b010 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-label="Open Issue"
           class="octicon octicon-issue-opened text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -220,6 +221,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-check text-gitify-icon-open"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -273,6 +275,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-file-diff text-gitify-icon-closed"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -332,6 +335,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -361,6 +365,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -390,6 +395,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-bell-slash"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -431,6 +437,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-label="Open Issue"
           class="octicon octicon-issue-opened text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -575,6 +582,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-check text-gitify-icon-open"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -628,6 +636,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-file-diff text-gitify-icon-closed"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -687,6 +696,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -716,6 +726,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -745,6 +756,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-bell-slash"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -786,6 +798,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-label="Open Issue"
           class="octicon octicon-issue-opened text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -930,6 +943,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-check text-gitify-icon-open"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -983,6 +997,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-file-diff text-gitify-icon-closed"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1042,6 +1057,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1071,6 +1087,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1100,6 +1117,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-bell-slash"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1141,6 +1159,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-label="Open Issue"
           class="octicon octicon-issue-opened text-gitify-icon-open"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -1285,6 +1304,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-check text-gitify-icon-open"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1338,6 +1358,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-file-diff text-gitify-icon-closed"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1397,6 +1418,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx > should render i
         <svg
           aria-hidden="true"
           class="octicon octicon-bell-slash"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index 0525bfe64..84e1c0cf8 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -105,6 +105,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-down"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -235,6 +236,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -264,6 +266,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -293,6 +296,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-down"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -361,6 +365,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
             <svg
               aria-hidden="true"
               class="octicon octicon-feed-person"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -430,6 +435,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -459,6 +465,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -488,6 +495,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-down"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -556,6 +564,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
             <svg
               aria-hidden="true"
               class="octicon octicon-feed-person"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -625,6 +634,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-read"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -654,6 +664,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-check"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -683,6 +694,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx > should
         <svg
           aria-hidden="true"
           class="octicon octicon-chevron-down"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index c1757d190..c88f5be97 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -27,6 +27,7 @@ exports[`renderer/components/primitives/Header.tsx > should render itself & its
         <svg
           aria-hidden="true"
           class="octicon octicon-arrow-left"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -58,6 +59,7 @@ exports[`renderer/components/primitives/Header.tsx > should render itself & its
             <svg
               aria-hidden="true"
               class="octicon octicon-mark-github"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
diff --git a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
index 178efbac8..861e82f5c 100644
--- a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
@@ -19,6 +19,7 @@ exports[`renderer/components/primitives/HoverButton.tsx > should render 1`] = `
     <svg
       aria-hidden="true"
       class="octicon octicon-mark-github"
+      data-component="Octicon"
       display="inline-block"
       fill="currentColor"
       focusable="false"
diff --git a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
index e0abd5fea..e119529e9 100644
--- a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
@@ -19,6 +19,7 @@ exports[`renderer/routes/components/primitives/Title.tsx > should render the tit
         <svg
           aria-hidden="true"
           class="octicon octicon-person-fill"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -62,6 +63,7 @@ exports[`renderer/routes/components/primitives/Title.tsx > should render the tit
         <svg
           aria-hidden="true"
           class="octicon octicon-person-fill"
+          data-component="Octicon"
           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 0b78e0e01..ef3ede770 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -30,6 +30,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
         <svg
           aria-hidden="true"
           class="octicon octicon-arrow-left"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -61,6 +62,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
             <svg
               aria-hidden="true"
               class="octicon octicon-filter"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -114,6 +116,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-search"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -144,6 +147,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-question text-gitify-tooltip-icon"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -194,6 +198,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-check-circle-fill text-gitify-icon-open"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -266,6 +271,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-no-entry-fill text-gitify-icon-closed"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -336,6 +342,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-feed-person"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -366,6 +373,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-question text-gitify-tooltip-icon"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -425,6 +433,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -521,6 +530,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-bell"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -551,6 +561,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-question text-gitify-tooltip-icon"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -896,6 +907,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-issue-opened"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -929,6 +941,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-question text-gitify-tooltip-icon"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -988,6 +1001,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1095,6 +1109,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1148,6 +1163,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1190,6 +1206,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-note"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1220,6 +1237,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-question text-gitify-tooltip-icon"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1279,6 +1297,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1332,6 +1351,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1385,6 +1405,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1438,6 +1459,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1491,6 +1513,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1544,6 +1567,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1597,6 +1621,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1650,6 +1675,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1703,6 +1729,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1756,6 +1783,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1809,6 +1837,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1862,6 +1891,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1915,6 +1945,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1968,6 +1999,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2021,6 +2053,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2077,6 +2110,7 @@ exports[`renderer/routes/Filters.tsx > General > should render itself & its chil
             <svg
               aria-hidden="true"
               class="octicon octicon-filter-remove"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
diff --git a/src/renderer/routes/__snapshots__/Login.test.tsx.snap b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
index 8a8df4186..1d0130324 100644
--- a/src/renderer/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
@@ -116,6 +116,7 @@ exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
               <svg
                 aria-hidden="true"
                 class="octicon octicon-mark-github"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -158,6 +159,7 @@ exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
               <svg
                 aria-hidden="true"
                 class="octicon octicon-key"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -200,6 +202,7 @@ exports[`renderer/routes/Login.tsx > should render itself & its children 1`] = `
               <svg
                 aria-hidden="true"
                 class="octicon octicon-person"
+                data-component="Octicon"
                 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 abd136735..4a80af439 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -31,6 +31,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
           <svg
             aria-hidden="true"
             class="octicon octicon-arrow-left"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -62,6 +63,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
               <svg
                 aria-hidden="true"
                 class="octicon octicon-person"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -176,6 +178,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-person"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -303,6 +306,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-eye"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -363,6 +367,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
               <svg
                 aria-hidden="true"
                 class="octicon octicon-book"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -418,6 +423,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx > renders correctly 1`] = `
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-sign-in"
+                  data-component="Octicon"
                   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 aaafce334..0a4a1e5bb 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -31,6 +31,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
           <svg
             aria-hidden="true"
             class="octicon octicon-arrow-left"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -62,6 +63,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
               <svg
                 aria-hidden="true"
                 class="octicon octicon-key"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -185,6 +187,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-key"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -296,6 +299,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-eye"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -356,6 +360,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
               <svg
                 aria-hidden="true"
                 class="octicon octicon-book"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -411,6 +416,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx > renders correctly 1`
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-sign-in"
+                  data-component="Octicon"
                   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 cea607544..b27febd1f 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -30,6 +30,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
         <svg
           aria-hidden="true"
           class="octicon octicon-arrow-left"
+          data-component="Octicon"
           display="inline-block"
           fill="currentColor"
           focusable="false"
@@ -61,6 +62,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             <svg
               aria-hidden="true"
               class="octicon octicon-gear"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -114,6 +116,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-paintbrush"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -268,6 +271,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -316,6 +320,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-zoom-out"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -375,6 +380,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-zoom-in"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -408,6 +414,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-sync"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -458,6 +465,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -493,6 +501,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-bell"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -599,6 +608,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -690,6 +700,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -738,6 +749,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-dash"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -793,6 +805,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-plus"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -823,6 +836,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-sync"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -874,6 +888,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -923,6 +938,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -951,6 +967,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
             <svg
               aria-hidden="true"
               class="octicon octicon-alert-fill text-gitify-warning"
+              data-component="Octicon"
               display="inline-block"
               fill="currentColor"
               focusable="false"
@@ -1040,6 +1057,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-question text-gitify-tooltip-icon"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1089,6 +1107,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-question text-gitify-tooltip-icon"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1139,6 +1158,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1187,6 +1207,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1235,6 +1256,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1283,6 +1305,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1331,6 +1354,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1366,6 +1390,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-devices"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1433,6 +1458,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1482,6 +1508,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1530,6 +1557,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1565,6 +1593,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-device-desktop"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1671,6 +1700,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -1729,6 +1759,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                 <svg
                   aria-hidden="true"
                   class="octicon octicon-question text-gitify-tooltip-icon"
+                  data-component="Octicon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1763,6 +1794,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-pencil"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1823,6 +1855,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-sync"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -1874,6 +1907,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2032,6 +2066,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
                   <svg
                     aria-hidden="true"
                     class="octicon octicon-sync"
+                    data-component="Octicon"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -2082,6 +2117,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
               <svg
                 aria-hidden="true"
                 class="octicon octicon-question text-gitify-tooltip-icon"
+                data-component="Octicon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -2211,6 +2247,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           <svg
             aria-hidden="true"
             class="octicon octicon-person"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"
@@ -2286,6 +2323,7 @@ exports[`renderer/routes/Settings.tsx > should render itself & its children 1`]
           <svg
             aria-hidden="true"
             class="octicon octicon-x-circle"
+            data-component="Octicon"
             display="inline-block"
             fill="currentColor"
             focusable="false"