diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 72a5950fc..ac392bbb5 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -101,9 +101,9 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
             type="button"
           >
             <svg
+              aria-hidden="true"
               aria-label="Gitify Logo"
               class="size-2.5"
-              role="img"
               viewBox="0 0 500 500"
               xmlns="https://www.w3.org/2000/svg"
               xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -360,9 +360,9 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
           type="button"
         >
           <svg
+            aria-hidden="true"
             aria-label="Gitify Logo"
             class="size-2.5"
-            role="img"
             viewBox="0 0 500 500"
             xmlns="https://www.w3.org/2000/svg"
             xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -676,9 +676,9 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
             type="button"
           >
             <svg
+              aria-hidden="true"
               aria-label="Gitify Logo"
               class="size-2.5"
-              role="img"
               viewBox="0 0 500 500"
               xmlns="https://www.w3.org/2000/svg"
               xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -935,9 +935,9 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
           type="button"
         >
           <svg
+            aria-hidden="true"
             aria-label="Gitify Logo"
             class="size-2.5"
-            role="img"
             viewBox="0 0 500 500"
             xmlns="https://www.w3.org/2000/svg"
             xmlns:xlink="https://www.w3.org/1999/xlink"
diff --git a/src/renderer/components/icons/LogoIcon.tsx b/src/renderer/components/icons/LogoIcon.tsx
index 488132fc7..133722fe3 100644
--- a/src/renderer/components/icons/LogoIcon.tsx
+++ b/src/renderer/components/icons/LogoIcon.tsx
@@ -24,6 +24,7 @@ export const LogoIcon: FC<ILogoIcon> = ({
   ...props
 }: ILogoIcon) => (
   <svg
+    aria-hidden="true"
     aria-label={`${APPLICATION.NAME} Logo`}
     className={cn(
       size === Size.SMALL && 'size-2.5',
@@ -31,7 +32,6 @@ export const LogoIcon: FC<ILogoIcon> = ({
       size === Size.LARGE && 'size-8',
     )}
     onClick={() => onClick?.()}
-    role="img"
     viewBox="0 0 500 500"
     xmlns="https://www.w3.org/2000/svg"
     xmlnsXlink="https://www.w3.org/1999/xlink"
diff --git a/src/renderer/components/icons/VolumeDownIcon.tsx b/src/renderer/components/icons/VolumeDownIcon.tsx
index a841368a3..bbdfa4370 100644
--- a/src/renderer/components/icons/VolumeDownIcon.tsx
+++ b/src/renderer/components/icons/VolumeDownIcon.tsx
@@ -2,11 +2,11 @@ import type { FC } from 'react';
 
 export const VolumeDownIcon: FC = () => (
   <svg
+    aria-hidden="true"
     aria-label="Volume Down Icon"
     className="size-2"
     fill="currentColor"
     height="24"
-    role="img"
     viewBox="0 0 24 24"
     width="24"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/renderer/components/icons/VolumeUpIcon.tsx b/src/renderer/components/icons/VolumeUpIcon.tsx
index 9b91b7b1a..0a7c67039 100644
--- a/src/renderer/components/icons/VolumeUpIcon.tsx
+++ b/src/renderer/components/icons/VolumeUpIcon.tsx
@@ -2,11 +2,11 @@ import type { FC } from 'react';
 
 export const VolumeUpIcon: FC = () => (
   <svg
+    aria-hidden="true"
     aria-label="Volume Up Icon"
     className="size-2"
     fill="currentColor"
     height="24"
-    role="img"
     viewBox="0 0 24 24"
     width="24"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap b/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
index f51a52f66..c1b16306c 100644
--- a/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
+++ b/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
@@ -6,9 +6,9 @@ exports[`renderer/components/icons/LogoIcon.tsx renders correctly (dark) 1`] = `
   "baseElement": <body>
     <div>
       <svg
+        aria-hidden="true"
         aria-label="Gitify Logo"
         class="size-2.5"
-        role="img"
         viewBox="0 0 500 500"
         xmlns="https://www.w3.org/2000/svg"
         xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -53,9 +53,9 @@ exports[`renderer/components/icons/LogoIcon.tsx renders correctly (dark) 1`] = `
   </body>,
   "container": <div>
     <svg
+      aria-hidden="true"
       aria-label="Gitify Logo"
       class="size-2.5"
-      role="img"
       viewBox="0 0 500 500"
       xmlns="https://www.w3.org/2000/svg"
       xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -157,9 +157,9 @@ exports[`renderer/components/icons/LogoIcon.tsx renders correctly (light) 1`] =
   "baseElement": <body>
     <div>
       <svg
+        aria-hidden="true"
         aria-label="Gitify Logo"
         class="size-2.5"
-        role="img"
         viewBox="0 0 500 500"
         xmlns="https://www.w3.org/2000/svg"
         xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -204,9 +204,9 @@ exports[`renderer/components/icons/LogoIcon.tsx renders correctly (light) 1`] =
   </body>,
   "container": <div>
     <svg
+      aria-hidden="true"
       aria-label="Gitify Logo"
       class="size-2.5"
-      role="img"
       viewBox="0 0 500 500"
       xmlns="https://www.w3.org/2000/svg"
       xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -308,9 +308,9 @@ exports[`renderer/components/icons/LogoIcon.tsx should render large size 1`] = `
   "baseElement": <body>
     <div>
       <svg
+        aria-hidden="true"
         aria-label="Gitify Logo"
         class="size-8"
-        role="img"
         viewBox="0 0 500 500"
         xmlns="https://www.w3.org/2000/svg"
         xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -355,9 +355,9 @@ exports[`renderer/components/icons/LogoIcon.tsx should render large size 1`] = `
   </body>,
   "container": <div>
     <svg
+      aria-hidden="true"
       aria-label="Gitify Logo"
       class="size-8"
-      role="img"
       viewBox="0 0 500 500"
       xmlns="https://www.w3.org/2000/svg"
       xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -459,9 +459,9 @@ exports[`renderer/components/icons/LogoIcon.tsx should render medium size 1`] =
   "baseElement": <body>
     <div>
       <svg
+        aria-hidden="true"
         aria-label="Gitify Logo"
         class="size-5"
-        role="img"
         viewBox="0 0 500 500"
         xmlns="https://www.w3.org/2000/svg"
         xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -506,9 +506,9 @@ exports[`renderer/components/icons/LogoIcon.tsx should render medium size 1`] =
   </body>,
   "container": <div>
     <svg
+      aria-hidden="true"
       aria-label="Gitify Logo"
       class="size-5"
-      role="img"
       viewBox="0 0 500 500"
       xmlns="https://www.w3.org/2000/svg"
       xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -610,9 +610,9 @@ exports[`renderer/components/icons/LogoIcon.tsx should render small size 1`] = `
   "baseElement": <body>
     <div>
       <svg
+        aria-hidden="true"
         aria-label="Gitify Logo"
         class="size-2.5"
-        role="img"
         viewBox="0 0 500 500"
         xmlns="https://www.w3.org/2000/svg"
         xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -657,9 +657,9 @@ exports[`renderer/components/icons/LogoIcon.tsx should render small size 1`] = `
   </body>,
   "container": <div>
     <svg
+      aria-hidden="true"
       aria-label="Gitify Logo"
       class="size-2.5"
-      role="img"
       viewBox="0 0 500 500"
       xmlns="https://www.w3.org/2000/svg"
       xmlns:xlink="https://www.w3.org/1999/xlink"
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 83d117f71..4d30b1831 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -38,9 +38,9 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
               type="button"
             >
               <svg
+                aria-hidden="true"
                 aria-label="Gitify Logo"
                 class="size-2.5"
-                role="img"
                 viewBox="0 0 500 500"
                 xmlns="https://www.w3.org/2000/svg"
                 xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -306,9 +306,9 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
             type="button"
           >
             <svg
+              aria-hidden="true"
               aria-label="Gitify Logo"
               class="size-2.5"
-              role="img"
               viewBox="0 0 500 500"
               xmlns="https://www.w3.org/2000/svg"
               xmlns:xlink="https://www.w3.org/1999/xlink"
diff --git a/src/renderer/routes/__snapshots__/Login.test.tsx.snap b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
index b85a64005..e22758aed 100644
--- a/src/renderer/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
@@ -22,9 +22,9 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
           data-wrap="nowrap"
         >
           <svg
+            aria-hidden="true"
             aria-label="Gitify Logo"
             class="size-8"
-            role="img"
             viewBox="0 0 500 500"
             xmlns="https://www.w3.org/2000/svg"
             xmlns:xlink="https://www.w3.org/1999/xlink"
@@ -253,9 +253,9 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
         data-wrap="nowrap"
       >
         <svg
+          aria-hidden="true"
           aria-label="Gitify Logo"
           class="size-8"
-          role="img"
           viewBox="0 0 500 500"
           xmlns="https://www.w3.org/2000/svg"
           xmlns:xlink="https://www.w3.org/1999/xlink"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 7df4cda34..29a5db996 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -1384,11 +1384,11 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
                   type="button"
                 >
                   <svg
+                    aria-hidden="true"
                     aria-label="Volume Down Icon"
                     class="size-2"
                     fill="currentColor"
                     height="24"
-                    role="img"
                     viewBox="0 0 24 24"
                     width="24"
                     xmlns="http://www.w3.org/2000/svg"
@@ -1447,11 +1447,11 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
                   type="button"
                 >
                   <svg
+                    aria-hidden="true"
                     aria-label="Volume Up Icon"
                     class="size-2"
                     fill="currentColor"
                     height="24"
-                    role="img"
                     viewBox="0 0 24 24"
                     width="24"
                     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/renderer/utils/api/client.ts b/src/renderer/utils/api/client.ts
index fa6eb1b12..2b87ea02c 100644
--- a/src/renderer/utils/api/client.ts
+++ b/src/renderer/utils/api/client.ts
@@ -268,9 +268,9 @@ export async function getLatestDiscussion(
   try {
     const response = await searchDiscussions(notification);
     return (
-      response.data?.data.search.nodes.filter(
+      response.data?.data.search.nodes.find(
         (discussion) => discussion.title === notification.subject.title,
-      )[0] ?? null
+      ) ?? null
     );
   } catch (err) {
     rendererLogError(