diff --git a/src/renderer/components/avatars/AvatarWithFallback.test.tsx b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
index b94762e47..e358c048a 100644
--- a/src/renderer/components/avatars/AvatarWithFallback.test.tsx
+++ b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 
 import { type Link, Size } from '../../types';
 import {
@@ -47,8 +47,8 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
 
-    // Simulate an error event on the image element
-    avatar.dispatchEvent(new Event('error'));
+    // Simulate image load error (wrapped in act via fireEvent)
+    fireEvent.error(avatar);
 
     expect(screen.getByTestId('avatar')).toMatchSnapshot();
   });
@@ -59,8 +59,8 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
 
-    // Simulate an error event on the image element
-    avatar.dispatchEvent(new Event('error'));
+    // Simulate image load error (wrapped in act via fireEvent)
+    fireEvent.error(avatar);
 
     expect(screen.getByTestId('avatar')).toMatchSnapshot();
   });
diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
index d7a5d4110..d02e07b1d 100644
--- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
+++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
@@ -273,16 +273,22 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback
   data-testid="avatar"
   data-wrap="nowrap"
 >
-  <img
-    alt="gitify-app"
-    class="Avatar__StyledAvatar-sc-2lv0r8-0 hAAPGf"
-    data-component="Avatar"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-feed-person"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
     height="16"
-    size="16"
-    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-    sx="[object Object]"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 16 16"
     width="16"
-  />
+  >
+    <path
+      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+    />
+  </svg>
   <div
     class="Truncate__StyledTruncate-sc-23o1d2-0 MmGIa"
     maxwidth="280"
@@ -304,16 +310,22 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback
   data-testid="avatar"
   data-wrap="nowrap"
 >
-  <img
-    alt="gitify-app"
-    class="Avatar__StyledAvatar-sc-2lv0r8-0 cZJOrN"
-    data-component="Avatar"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-mark-github"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
     height="16"
-    size="16"
-    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-    sx="[object Object]"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 16 16"
     width="16"
-  />
+  >
+    <path
+      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+    />
+  </svg>
   <div
     class="Truncate__StyledTruncate-sc-23o1d2-0 MmGIa"
     maxwidth="280"