diff --git a/src/renderer/components/avatars/AvatarWithFallback.test.tsx b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
new file mode 100644
index 000000000..b94762e47
--- /dev/null
+++ b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
@@ -0,0 +1,67 @@
+import { render, screen } from '@testing-library/react';
+
+import { type Link, Size } from '../../types';
+import {
+  AvatarWithFallback,
+  type IAvatarWithFallback,
+} from './AvatarWithFallback';
+
+describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
+  const props: IAvatarWithFallback = {
+    src: 'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
+    alt: 'gitify-app',
+    name: '@gitify-app',
+    size: Size.MEDIUM,
+    userType: 'User',
+  };
+
+  it('should render avatar - human user', () => {
+    const tree = render(<AvatarWithFallback {...props} />);
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render avatar - non-human user', () => {
+    const tree = render(
+      <AvatarWithFallback {...props} userType={'Organization'} />,
+    );
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('renders the fallback icon when no src url - human user', () => {
+    const tree = render(<AvatarWithFallback {...props} src={null} />);
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('renders the fallback icon when no src url - non human user', () => {
+    const tree = render(
+      <AvatarWithFallback {...props} src={null} userType="Bot" />,
+    );
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('renders the fallback icon when the image fails to load (isBroken = true) - human user', () => {
+    render(<AvatarWithFallback {...props} />);
+
+    // 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'));
+
+    expect(screen.getByTestId('avatar')).toMatchSnapshot();
+  });
+
+  it('renders the fallback icon when the image fails to load (isBroken = true) - non human user', () => {
+    render(<AvatarWithFallback {...props} userType={'Bot'} />);
+
+    // 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'));
+
+    expect(screen.getByTestId('avatar')).toMatchSnapshot();
+  });
+});
diff --git a/src/renderer/components/avatars/AvatarWithFallback.tsx b/src/renderer/components/avatars/AvatarWithFallback.tsx
new file mode 100644
index 000000000..8610c922e
--- /dev/null
+++ b/src/renderer/components/avatars/AvatarWithFallback.tsx
@@ -0,0 +1,54 @@
+import type React from 'react';
+import { useState } from 'react';
+
+import { FeedPersonIcon, MarkGithubIcon } from '@primer/octicons-react';
+import { Avatar, Stack, Text } from '@primer/react';
+
+import { type Link, Size } from '../../types';
+import type { UserType } from '../../typesGitHub';
+import { isNonHumanUser } from '../../utils/helpers';
+
+export interface IAvatarWithFallback {
+  src?: Link;
+  alt?: string;
+  name?: string;
+  size?: number;
+  userType?: UserType;
+}
+
+export const AvatarWithFallback: React.FC<IAvatarWithFallback> = ({
+  src,
+  alt,
+  name,
+  size = Size.MEDIUM,
+  userType = 'User',
+}) => {
+  const [isBroken, setIsBroken] = useState(false);
+
+  const isNonHuman = isNonHumanUser(userType);
+  return (
+    <Stack
+      direction="horizontal"
+      align="center"
+      gap="condensed"
+      data-testid="avatar"
+    >
+      {!src || isBroken ? (
+        isNonHuman ? (
+          <MarkGithubIcon size={size} />
+        ) : (
+          <FeedPersonIcon size={size} />
+        )
+      ) : (
+        <Avatar
+          src={src}
+          alt={alt}
+          size={size}
+          square={isNonHuman}
+          onError={() => setIsBroken(true)}
+        />
+      )}
+      {name && <Text>{name}</Text>}
+    </Stack>
+  );
+};
diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
new file mode 100644
index 000000000..16d16b195
--- /dev/null
+++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
@@ -0,0 +1,543 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback icon when no src url - human user 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-testid="avatar"
+        data-wrap="nowrap"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-feed-person"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
+        >
+          <path
+            d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+          />
+        </svg>
+        <span
+          class="Text-sc-17v1xeu-0 hmAFGJ"
+        >
+          @gitify-app
+        </span>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-testid="avatar"
+      data-wrap="nowrap"
+    >
+      <svg
+        aria-hidden="true"
+        class="octicon octicon-feed-person"
+        display="inline-block"
+        fill="currentColor"
+        focusable="false"
+        height="16"
+        overflow="visible"
+        style="vertical-align: text-bottom;"
+        viewBox="0 0 16 16"
+        width="16"
+      >
+        <path
+          d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+        />
+      </svg>
+      <span
+        class="Text-sc-17v1xeu-0 hmAFGJ"
+      >
+        @gitify-app
+      </span>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback icon when no src url - non human user 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-testid="avatar"
+        data-wrap="nowrap"
+      >
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-mark-github"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="16"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="16"
+        >
+          <path
+            d="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>
+        <span
+          class="Text-sc-17v1xeu-0 hmAFGJ"
+        >
+          @gitify-app
+        </span>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-testid="avatar"
+      data-wrap="nowrap"
+    >
+      <svg
+        aria-hidden="true"
+        class="octicon octicon-mark-github"
+        display="inline-block"
+        fill="currentColor"
+        focusable="false"
+        height="16"
+        overflow="visible"
+        style="vertical-align: text-bottom;"
+        viewBox="0 0 16 16"
+        width="16"
+      >
+        <path
+          d="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>
+      <span
+        class="Text-sc-17v1xeu-0 hmAFGJ"
+      >
+        @gitify-app
+      </span>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback icon when the image fails to load (isBroken = true) - human user 1`] = `
+<div
+  class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+  data-align="center"
+  data-direction="horizontal"
+  data-gap="condensed"
+  data-justify="start"
+  data-padding="none"
+  data-testid="avatar"
+  data-wrap="nowrap"
+>
+  <img
+    alt="gitify-app"
+    class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
+    data-component="Avatar"
+    height="16"
+    size="16"
+    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+    sx="[object Object]"
+    width="16"
+  />
+  <span
+    class="Text-sc-17v1xeu-0 hmAFGJ"
+  >
+    @gitify-app
+  </span>
+</div>
+`;
+
+exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback icon when the image fails to load (isBroken = true) - non human user 1`] = `
+<div
+  class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+  data-align="center"
+  data-direction="horizontal"
+  data-gap="condensed"
+  data-justify="start"
+  data-padding="none"
+  data-testid="avatar"
+  data-wrap="nowrap"
+>
+  <img
+    alt="gitify-app"
+    class="Avatar__StyledAvatar-sc-2lv0r8-0 fdrsHc"
+    data-component="Avatar"
+    height="16"
+    size="16"
+    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+    sx="[object Object]"
+    width="16"
+  />
+  <span
+    class="Text-sc-17v1xeu-0 hmAFGJ"
+  >
+    @gitify-app
+  </span>
+</div>
+`;
+
+exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar - human user 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-testid="avatar"
+        data-wrap="nowrap"
+      >
+        <img
+          alt="gitify-app"
+          class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
+          data-component="Avatar"
+          height="16"
+          size="16"
+          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+          sx="[object Object]"
+          width="16"
+        />
+        <span
+          class="Text-sc-17v1xeu-0 hmAFGJ"
+        >
+          @gitify-app
+        </span>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-testid="avatar"
+      data-wrap="nowrap"
+    >
+      <img
+        alt="gitify-app"
+        class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
+        data-component="Avatar"
+        height="16"
+        size="16"
+        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+        sx="[object Object]"
+        width="16"
+      />
+      <span
+        class="Text-sc-17v1xeu-0 hmAFGJ"
+      >
+        @gitify-app
+      </span>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar - non-human user 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-testid="avatar"
+        data-wrap="nowrap"
+      >
+        <img
+          alt="gitify-app"
+          class="Avatar__StyledAvatar-sc-2lv0r8-0 fdrsHc"
+          data-component="Avatar"
+          height="16"
+          size="16"
+          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+          sx="[object Object]"
+          width="16"
+        />
+        <span
+          class="Text-sc-17v1xeu-0 hmAFGJ"
+        >
+          @gitify-app
+        </span>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-testid="avatar"
+      data-wrap="nowrap"
+    >
+      <img
+        alt="gitify-app"
+        class="Avatar__StyledAvatar-sc-2lv0r8-0 fdrsHc"
+        data-component="Avatar"
+        height="16"
+        size="16"
+        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+        sx="[object Object]"
+        width="16"
+      />
+      <span
+        class="Text-sc-17v1xeu-0 hmAFGJ"
+      >
+        @gitify-app
+      </span>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
diff --git a/src/renderer/components/fields/RadioGroup.test.tsx b/src/renderer/components/fields/RadioGroup.test.tsx
index 67c3a8719..b55091935 100644
--- a/src/renderer/components/fields/RadioGroup.test.tsx
+++ b/src/renderer/components/fields/RadioGroup.test.tsx
@@ -27,7 +27,9 @@ describe('renderer/components/fields/RadioGroup.tsx', () => {
 
   it('should check that NProgress is getting called in getDerivedStateFromProps (loading)', () => {
     render(<RadioGroup {...props} />);
+
     fireEvent.click(screen.getByLabelText('Value 1'));
+
     expect(props.onChange).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/renderer/components/notifications/AccountNotifications.tsx b/src/renderer/components/notifications/AccountNotifications.tsx
index c42452c66..db2f0fabc 100644
--- a/src/renderer/components/notifications/AccountNotifications.tsx
+++ b/src/renderer/components/notifications/AccountNotifications.tsx
@@ -1,7 +1,7 @@
 import { type FC, type MouseEvent, useContext, useMemo, useState } from 'react';
 
 import { GitPullRequestIcon, IssueOpenedIcon } from '@primer/octicons-react';
-import { Avatar, Button, IconButton, Stack, Text } from '@primer/react';
+import { Button, IconButton } from '@primer/react';
 
 import { AppContext } from '../../context/App';
 import { type Account, type GitifyError, Size } from '../../types';
@@ -15,6 +15,7 @@ import {
 } from '../../utils/links';
 import { AllRead } from '../AllRead';
 import { Oops } from '../Oops';
+import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
 import { HoverGroup } from '../primitives/HoverGroup';
 import { NotificationRow } from './NotificationRow';
 import { RepositoryNotifications } from './RepositoryNotifications';
@@ -87,10 +88,12 @@ export const AccountNotifications: FC<IAccountNotifications> = (
             }}
             data-testid="account-profile"
           >
-            <Stack direction="horizontal" align="center" gap="condensed">
-              <Avatar src={account.user.avatar} size={Size.MEDIUM} />
-              <Text>@{account.user.login}</Text>
-            </Stack>
+            <AvatarWithFallback
+              src={account.user.avatar}
+              alt={account.user.login}
+              name={`@${account.user.login}`}
+              size={Size.MEDIUM}
+            />
           </Button>
 
           <HoverGroup>
diff --git a/src/renderer/components/notifications/NotificationFooter.tsx b/src/renderer/components/notifications/NotificationFooter.tsx
index 445799075..37655d41e 100644
--- a/src/renderer/components/notifications/NotificationFooter.tsx
+++ b/src/renderer/components/notifications/NotificationFooter.tsx
@@ -1,14 +1,13 @@
 import type { FC, MouseEvent } from 'react';
 
-import { FeedPersonIcon, MarkGithubIcon } from '@primer/octicons-react';
-import { Avatar, RelativeTime, Stack, Text } from '@primer/react';
+import { Box, RelativeTime, Stack, Text } from '@primer/react';
 
-import { IconColor, Opacity, Size } from '../../types';
+import { Opacity, Size } from '../../types';
 import type { Notification } from '../../typesGitHub';
 import { cn } from '../../utils/cn';
-import { isNonHumanUser } from '../../utils/helpers';
 import { openUserProfile } from '../../utils/links';
 import { formatReason } from '../../utils/reason';
+import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
 import { MetricGroup } from '../metrics/MetricGroup';
 
 interface INotificationFooter {
@@ -29,27 +28,32 @@ export const NotificationFooter: FC<INotificationFooter> = ({
       className={cn('text-xs', Opacity.MEDIUM)}
     >
       {notification.subject.user ? (
-        <Avatar
+        <Box
           title={`View profile: ${notification.subject.user.login}`}
-          src={notification.subject.user.avatar_url}
-          size={Size.SMALL}
-          square={isNonHumanUser(notification.subject.user.type)}
           onClick={(event: MouseEvent<HTMLElement>) => {
             // Don't trigger onClick of parent element.
             event.stopPropagation();
             openUserProfile(notification.subject.user);
           }}
           data-testid="view-profile"
-        />
+        >
+          <AvatarWithFallback
+            src={notification.subject.user.avatar_url}
+            alt={notification.subject.user.login}
+            size={Size.SMALL}
+            userType={notification.subject.user.type}
+          />
+        </Box>
       ) : (
-        <>
-          {notification.subject.type === 'RepositoryDependabotAlertsThread' ||
-          notification.subject.type === 'RepositoryVulnerabilityAlert' ? (
-            <MarkGithubIcon size={Size.SMALL} />
-          ) : (
-            <FeedPersonIcon size={Size.SMALL} className={IconColor.GRAY} />
-          )}
-        </>
+        <AvatarWithFallback
+          size={Size.SMALL}
+          userType={
+            notification.subject.type === 'RepositoryDependabotAlertsThread' ||
+            notification.subject.type === 'RepositoryVulnerabilityAlert'
+              ? 'Bot'
+              : 'User'
+          }
+        />
       )}
 
       <Stack direction="horizontal" gap="none">
diff --git a/src/renderer/components/notifications/NotificationHeader.tsx b/src/renderer/components/notifications/NotificationHeader.tsx
index f424ba541..7863429a7 100644
--- a/src/renderer/components/notifications/NotificationHeader.tsx
+++ b/src/renderer/components/notifications/NotificationHeader.tsx
@@ -1,12 +1,13 @@
 import { type FC, type MouseEvent, useContext } from 'react';
 
-import { Avatar, Stack, Tooltip } from '@primer/react';
+import { Box, Stack, Tooltip } from '@primer/react';
 
 import { AppContext } from '../../context/App';
 import { GroupBy, Opacity, Size } from '../../types';
 import type { Notification } from '../../typesGitHub';
 import { cn } from '../../utils/cn';
 import { openRepository } from '../../utils/links';
+import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
 
 interface INotificationHeader {
   notification: Notification;
@@ -17,7 +18,6 @@ export const NotificationHeader: FC<INotificationHeader> = ({
 }: INotificationHeader) => {
   const { settings } = useContext(AppContext);
 
-  const repoAvatarUrl = notification.repository.owner.avatar_url;
   const repoSlug = notification.repository.full_name;
 
   const notificationNumber = notification.subject?.number
@@ -28,30 +28,36 @@ export const NotificationHeader: FC<INotificationHeader> = ({
 
   return (
     groupByDate && (
-      <Tooltip text={`View repository: ${repoSlug}`} direction="se">
-        <div
-          onClick={(event: MouseEvent<HTMLElement>) => {
-            // Don't trigger onClick of parent element.
-            event.stopPropagation();
-            openRepository(notification.repository);
-          }}
-          data-testid="view-repository"
+      <Stack direction="horizontal" align="center" gap="condensed">
+        <Tooltip text={`View repository: ${repoSlug}`} direction="se">
+          <Box
+            className="text-xs font-medium"
+            onClick={(event: MouseEvent<HTMLElement>) => {
+              // Don't trigger onClick of parent element.
+              event.stopPropagation();
+              openRepository(notification.repository);
+            }}
+            data-testid="view-repository"
+          >
+            <AvatarWithFallback
+              src={notification.repository.owner.avatar_url}
+              alt={repoSlug}
+              name={repoSlug}
+              size={Size.SMALL}
+              userType={notification.repository.owner.type}
+            />
+          </Box>
+        </Tooltip>
+        <Box
+          className={cn(
+            'text-xxs',
+            Opacity.READ,
+            !settings.showNumber && 'hidden',
+          )}
         >
-          <Stack direction="horizontal" align="center" gap="condensed">
-            <Avatar src={repoAvatarUrl} size={Size.SMALL} />
-            <span className="text-xs font-medium">{repoSlug}</span>
-            <span
-              className={cn(
-                'text-xxs',
-                Opacity.READ,
-                !settings.showNumber && 'hidden',
-              )}
-            >
-              {notificationNumber}
-            </span>
-          </Stack>
-        </div>
-      </Tooltip>
+          {notificationNumber}
+        </Box>
+      </Stack>
     )
   );
 };
diff --git a/src/renderer/components/notifications/RepositoryNotifications.tsx b/src/renderer/components/notifications/RepositoryNotifications.tsx
index d0e997c1c..1714f6a52 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.tsx
@@ -1,5 +1,5 @@
 import { CheckIcon, ReadIcon } from '@primer/octicons-react';
-import { Avatar, Button, IconButton, Stack, Text } from '@primer/react';
+import { Button, IconButton } from '@primer/react';
 import { type FC, type MouseEvent, useContext, useState } from 'react';
 
 import { AppContext } from '../../context/App';
@@ -7,8 +7,9 @@ import { Opacity, Size } from '../../types';
 import type { Notification } from '../../typesGitHub';
 import { cn } from '../../utils/cn';
 import { isMarkAsDoneFeatureSupported } from '../../utils/features';
-import { getChevronDetails, isNonHumanUser } from '../../utils/helpers';
+import { getChevronDetails } from '../../utils/helpers';
 import { openRepository } from '../../utils/links';
+import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
 import { HoverGroup } from '../primitives/HoverGroup';
 import { NotificationRow } from './NotificationRow';
 
@@ -65,16 +66,13 @@ export const RepositoryNotifications: FC<IRepositoryNotifications> = ({
               openRepository(repoNotifications[0].repository);
             }}
           >
-            <Stack direction="horizontal" gap="condensed" align="center">
-              <Avatar
-                src={avatarUrl}
-                size={Size.LARGE}
-                square={isNonHumanUser(
-                  repoNotifications[0].repository.owner.type,
-                )}
-              />
-              <Text>{repoName}</Text>
-            </Stack>
+            <AvatarWithFallback
+              src={avatarUrl}
+              alt={repoName}
+              name={repoName}
+              size={Size.LARGE}
+              userType={repoNotifications[0].repository.owner.type}
+            />
           </Button>
         </div>
 
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 59dd6950b..38eaea97a 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -33,10 +33,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
                 <img
-                  alt=""
+                  alt="octocat"
                   class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                   data-component="Avatar"
                   height="16"
@@ -48,8 +49,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
-                  @
-                  octocat
+                  @octocat
                 </span>
               </div>
             </span>
@@ -284,10 +284,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
+              data-testid="avatar"
               data-wrap="nowrap"
             >
               <img
-                alt=""
+                alt="octocat"
                 class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                 data-component="Avatar"
                 height="16"
@@ -299,8 +300,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               <span
                 class="Text-sc-17v1xeu-0 hmAFGJ"
               >
-                @
-                octocat
+                @octocat
               </span>
             </div>
           </span>
@@ -592,10 +592,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
                 <img
-                  alt=""
+                  alt="octocat"
                   class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                   data-component="Avatar"
                   height="16"
@@ -607,8 +608,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
-                  @
-                  octocat
+                  @octocat
                 </span>
               </div>
             </span>
@@ -800,45 +800,57 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
         <div
           class="flex-1 truncate cursor-pointer"
         >
-          <span
-            aria-label="View repository: gitify-app/notifications-test"
-            class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-            id=":rf:"
-            role="tooltip"
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              data-testid="view-repository"
+            <span
+              aria-label="View repository: gitify-app/notifications-test"
+              class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+              id=":rf:"
+              role="tooltip"
             >
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+                class="Box-sc-g0xbh4-0 text-xs font-medium"
+                data-testid="view-repository"
               >
-                <img
-                  alt=""
-                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-                  data-component="Avatar"
-                  height="14"
-                  size="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  sx="[object Object]"
-                  width="14"
-                />
-                <span
-                  class="text-xs font-medium"
+                <div
+                  class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
                 >
-                  gitify-app/notifications-test
-                </span>
-                <span
-                  class="text-xxs opacity-50"
-                />
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                    data-component="Avatar"
+                    height="14"
+                    size="14"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    sx="[object Object]"
+                    width="14"
+                  />
+                  <span
+                    class="Text-sc-17v1xeu-0 hmAFGJ"
+                  >
+                    gitify-app/notifications-test
+                  </span>
+                </div>
               </div>
-            </div>
-          </span>
+            </span>
+            <div
+              class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+            />
+          </div>
           <div
             class="flex gap-1 items-center mb-1 truncate text-sm"
             data-testid="notification-row"
@@ -862,18 +874,33 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-padding="none"
             data-wrap="wrap"
           >
-            <img
-              alt=""
-              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-              data-component="Avatar"
+            <div
+              class="Box-sc-g0xbh4-0"
               data-testid="view-profile"
-              height="14"
-              size="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              sx="[object Object]"
               title="View profile: gitify-app"
-              width="14"
-            />
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                  data-component="Avatar"
+                  height="14"
+                  size="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  sx="[object Object]"
+                  width="14"
+                />
+              </div>
+            </div>
             <div
               class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
               data-align="stretch"
@@ -1138,45 +1165,57 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
         <div
           class="flex-1 truncate cursor-pointer"
         >
-          <span
-            aria-label="View repository: gitify-app/notifications-test"
-            class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-            id=":rn:"
-            role="tooltip"
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              data-testid="view-repository"
+            <span
+              aria-label="View repository: gitify-app/notifications-test"
+              class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+              id=":rn:"
+              role="tooltip"
             >
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+                class="Box-sc-g0xbh4-0 text-xs font-medium"
+                data-testid="view-repository"
               >
-                <img
-                  alt=""
-                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-                  data-component="Avatar"
-                  height="14"
-                  size="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  sx="[object Object]"
-                  width="14"
-                />
-                <span
-                  class="text-xs font-medium"
+                <div
+                  class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
                 >
-                  gitify-app/notifications-test
-                </span>
-                <span
-                  class="text-xxs opacity-50"
-                />
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                    data-component="Avatar"
+                    height="14"
+                    size="14"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    sx="[object Object]"
+                    width="14"
+                  />
+                  <span
+                    class="Text-sc-17v1xeu-0 hmAFGJ"
+                  >
+                    gitify-app/notifications-test
+                  </span>
+                </div>
               </div>
-            </div>
-          </span>
+            </span>
+            <div
+              class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+            />
+          </div>
           <div
             class="flex gap-1 items-center mb-1 truncate text-sm"
             data-testid="notification-row"
@@ -1200,22 +1239,33 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
             data-padding="none"
             data-wrap="wrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-feed-person text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="14"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="14"
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
             >
-              <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>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-feed-person"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="14"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="14"
+              >
+                <path
+                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                />
+              </svg>
+            </div>
             <div
               class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
               data-align="stretch"
@@ -1399,10 +1449,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
+              data-testid="avatar"
               data-wrap="nowrap"
             >
               <img
-                alt=""
+                alt="octocat"
                 class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                 data-component="Avatar"
                 height="16"
@@ -1414,8 +1465,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               <span
                 class="Text-sc-17v1xeu-0 hmAFGJ"
               >
-                @
-                octocat
+                @octocat
               </span>
             </div>
           </span>
@@ -1607,45 +1657,57 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
       <div
         class="flex-1 truncate cursor-pointer"
       >
-        <span
-          aria-label="View repository: gitify-app/notifications-test"
-          class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-          id=":rf:"
-          role="tooltip"
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
-          <div
-            data-testid="view-repository"
+          <span
+            aria-label="View repository: gitify-app/notifications-test"
+            class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+            id=":rf:"
+            role="tooltip"
           >
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="Box-sc-g0xbh4-0 text-xs font-medium"
+              data-testid="view-repository"
             >
-              <img
-                alt=""
-                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-                data-component="Avatar"
-                height="14"
-                size="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                sx="[object Object]"
-                width="14"
-              />
-              <span
-                class="text-xs font-medium"
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
               >
-                gitify-app/notifications-test
-              </span>
-              <span
-                class="text-xxs opacity-50"
-              />
+                <img
+                  alt="gitify-app/notifications-test"
+                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                  data-component="Avatar"
+                  height="14"
+                  size="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  sx="[object Object]"
+                  width="14"
+                />
+                <span
+                  class="Text-sc-17v1xeu-0 hmAFGJ"
+                >
+                  gitify-app/notifications-test
+                </span>
+              </div>
             </div>
-          </div>
-        </span>
+          </span>
+          <div
+            class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+          />
+        </div>
         <div
           class="flex gap-1 items-center mb-1 truncate text-sm"
           data-testid="notification-row"
@@ -1669,18 +1731,33 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           data-padding="none"
           data-wrap="wrap"
         >
-          <img
-            alt=""
-            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-            data-component="Avatar"
+          <div
+            class="Box-sc-g0xbh4-0"
             data-testid="view-profile"
-            height="14"
-            size="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            sx="[object Object]"
             title="View profile: gitify-app"
-            width="14"
-          />
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                data-component="Avatar"
+                height="14"
+                size="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                sx="[object Object]"
+                width="14"
+              />
+            </div>
+          </div>
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
             data-align="stretch"
@@ -1945,45 +2022,57 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
       <div
         class="flex-1 truncate cursor-pointer"
       >
-        <span
-          aria-label="View repository: gitify-app/notifications-test"
-          class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-          id=":rn:"
-          role="tooltip"
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
-          <div
-            data-testid="view-repository"
+          <span
+            aria-label="View repository: gitify-app/notifications-test"
+            class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+            id=":rn:"
+            role="tooltip"
           >
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="Box-sc-g0xbh4-0 text-xs font-medium"
+              data-testid="view-repository"
             >
-              <img
-                alt=""
-                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-                data-component="Avatar"
-                height="14"
-                size="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                sx="[object Object]"
-                width="14"
-              />
-              <span
-                class="text-xs font-medium"
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
               >
-                gitify-app/notifications-test
-              </span>
-              <span
-                class="text-xxs opacity-50"
-              />
+                <img
+                  alt="gitify-app/notifications-test"
+                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                  data-component="Avatar"
+                  height="14"
+                  size="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  sx="[object Object]"
+                  width="14"
+                />
+                <span
+                  class="Text-sc-17v1xeu-0 hmAFGJ"
+                >
+                  gitify-app/notifications-test
+                </span>
+              </div>
             </div>
-          </div>
-        </span>
+          </span>
+          <div
+            class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+          />
+        </div>
         <div
           class="flex gap-1 items-center mb-1 truncate text-sm"
           data-testid="notification-row"
@@ -2007,22 +2096,33 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
           data-padding="none"
           data-wrap="wrap"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-feed-person text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="14"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="14"
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
           >
-            <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>
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-feed-person"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="14"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="14"
+            >
+              <path
+                d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+              />
+            </svg>
+          </div>
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
             data-align="stretch"
@@ -2263,10 +2363,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
                 <img
-                  alt=""
+                  alt="octocat"
                   class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                   data-component="Avatar"
                   height="16"
@@ -2278,8 +2379,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
-                  @
-                  octocat
+                  @octocat
                 </span>
               </div>
             </span>
@@ -2468,10 +2568,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
+              data-testid="avatar"
               data-wrap="nowrap"
             >
               <img
-                alt=""
+                alt="octocat"
                 class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                 data-component="Avatar"
                 height="16"
@@ -2483,8 +2584,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               <span
                 class="Text-sc-17v1xeu-0 hmAFGJ"
               >
-                @
-                octocat
+                @octocat
               </span>
             </div>
           </span>
@@ -2730,10 +2830,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
                 <img
-                  alt=""
+                  alt="octocat"
                   class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                   data-component="Avatar"
                   height="16"
@@ -2745,8 +2846,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
-                  @
-                  octocat
+                  @octocat
                 </span>
               </div>
             </span>
@@ -2976,10 +3076,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
+              data-testid="avatar"
               data-wrap="nowrap"
             >
               <img
-                alt=""
+                alt="octocat"
                 class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                 data-component="Avatar"
                 height="16"
@@ -2991,8 +3092,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
               <span
                 class="Text-sc-17v1xeu-0 hmAFGJ"
               >
-                @
-                octocat
+                @octocat
               </span>
             </div>
           </span>
@@ -3279,10 +3379,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
                 <img
-                  alt=""
+                  alt="octocat"
                   class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                   data-component="Avatar"
                   height="16"
@@ -3294,8 +3395,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
-                  @
-                  octocat
+                  @octocat
                 </span>
               </div>
             </span>
@@ -3480,10 +3580,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
                 <img
-                  alt=""
+                  alt="octocat"
                   class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                   data-component="Avatar"
                   height="16"
@@ -3495,8 +3596,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
-                  @
-                  octocat
+                  @octocat
                 </span>
               </div>
             </span>
@@ -3685,10 +3785,11 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
+              data-testid="avatar"
               data-wrap="nowrap"
             >
               <img
-                alt=""
+                alt="octocat"
                 class="Avatar__StyledAvatar-sc-2lv0r8-0 kuZlm"
                 data-component="Avatar"
                 height="16"
@@ -3700,8 +3801,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
               <span
                 class="Text-sc-17v1xeu-0 hmAFGJ"
               >
-                @
-                octocat
+                @octocat
               </span>
             </div>
           </span>
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
index 022d35715..6f826c09f 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -14,18 +14,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
         data-padding="none"
         data-wrap="wrap"
       >
-        <img
-          alt=""
-          class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-          data-component="Avatar"
+        <div
+          class="Box-sc-g0xbh4-0"
           data-testid="view-profile"
-          height="14"
-          size="14"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          sx="[object Object]"
           title="View profile: gitify-app"
-          width="14"
-        />
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="gitify-app"
+              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+              data-component="Avatar"
+              height="14"
+              size="14"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              sx="[object Object]"
+              width="14"
+            />
+          </div>
+        </div>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
           data-align="stretch"
@@ -139,18 +154,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
       data-padding="none"
       data-wrap="wrap"
     >
-      <img
-        alt=""
-        class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-        data-component="Avatar"
+      <div
+        class="Box-sc-g0xbh4-0"
         data-testid="view-profile"
-        height="14"
-        size="14"
-        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-        sx="[object Object]"
         title="View profile: gitify-app"
-        width="14"
-      />
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <img
+            alt="gitify-app"
+            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+            data-component="Avatar"
+            height="14"
+            size="14"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            sx="[object Object]"
+            width="14"
+          />
+        </div>
+      </div>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
         data-align="stretch"
@@ -321,18 +351,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
         data-padding="none"
         data-wrap="wrap"
       >
-        <img
-          alt=""
-          class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-          data-component="Avatar"
+        <div
+          class="Box-sc-g0xbh4-0"
           data-testid="view-profile"
-          height="14"
-          size="14"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          sx="[object Object]"
           title="View profile: gitify-app"
-          width="14"
-        />
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="gitify-app"
+              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+              data-component="Avatar"
+              height="14"
+              size="14"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              sx="[object Object]"
+              width="14"
+            />
+          </div>
+        </div>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
           data-align="stretch"
@@ -446,18 +491,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
       data-padding="none"
       data-wrap="wrap"
     >
-      <img
-        alt=""
-        class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-        data-component="Avatar"
+      <div
+        class="Box-sc-g0xbh4-0"
         data-testid="view-profile"
-        height="14"
-        size="14"
-        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-        sx="[object Object]"
         title="View profile: gitify-app"
-        width="14"
-      />
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <img
+            alt="gitify-app"
+            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+            data-component="Avatar"
+            height="14"
+            size="14"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            sx="[object Object]"
+            width="14"
+          />
+        </div>
+      </div>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
         data-align="stretch"
@@ -628,22 +688,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
         data-padding="none"
         data-wrap="wrap"
       >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="14"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="14"
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
         >
-          <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>
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-mark-github"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="14"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="14"
+          >
+            <path
+              d="M8 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>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
           data-align="stretch"
@@ -757,22 +828,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
       data-padding="none"
       data-wrap="wrap"
     >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-mark-github"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="14"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 16 16"
-        width="14"
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-testid="avatar"
+        data-wrap="nowrap"
       >
-        <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>
+        <svg
+          aria-hidden="true"
+          class="octicon octicon-mark-github"
+          display="inline-block"
+          fill="currentColor"
+          focusable="false"
+          height="14"
+          overflow="visible"
+          style="vertical-align: text-bottom;"
+          viewBox="0 0 16 16"
+          width="14"
+        >
+          <path
+            d="M8 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>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
         data-align="stretch"
@@ -943,18 +1025,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
         data-padding="none"
         data-wrap="wrap"
       >
-        <img
-          alt=""
-          class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-          data-component="Avatar"
+        <div
+          class="Box-sc-g0xbh4-0"
           data-testid="view-profile"
-          height="14"
-          size="14"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          sx="[object Object]"
           title="View profile: gitify-app"
-          width="14"
-        />
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="gitify-app"
+              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+              data-component="Avatar"
+              height="14"
+              size="14"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              sx="[object Object]"
+              width="14"
+            />
+          </div>
+        </div>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
           data-align="stretch"
@@ -1068,18 +1165,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
       data-padding="none"
       data-wrap="wrap"
     >
-      <img
-        alt=""
-        class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-        data-component="Avatar"
+      <div
+        class="Box-sc-g0xbh4-0"
         data-testid="view-profile"
-        height="14"
-        size="14"
-        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-        sx="[object Object]"
         title="View profile: gitify-app"
-        width="14"
-      />
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <img
+            alt="gitify-app"
+            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+            data-component="Avatar"
+            height="14"
+            size="14"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            sx="[object Object]"
+            width="14"
+          />
+        </div>
+      </div>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
         data-align="stretch"
@@ -1250,18 +1362,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
         data-padding="none"
         data-wrap="wrap"
       >
-        <img
-          alt=""
-          class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-          data-component="Avatar"
+        <div
+          class="Box-sc-g0xbh4-0"
           data-testid="view-profile"
-          height="14"
-          size="14"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          sx="[object Object]"
           title="View profile: gitify-app"
-          width="14"
-        />
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="gitify-app"
+              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+              data-component="Avatar"
+              height="14"
+              size="14"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              sx="[object Object]"
+              width="14"
+            />
+          </div>
+        </div>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
           data-align="stretch"
@@ -1375,18 +1502,33 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
       data-padding="none"
       data-wrap="wrap"
     >
-      <img
-        alt=""
-        class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-        data-component="Avatar"
+      <div
+        class="Box-sc-g0xbh4-0"
         data-testid="view-profile"
-        height="14"
-        size="14"
-        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-        sx="[object Object]"
         title="View profile: gitify-app"
-        width="14"
-      />
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <img
+            alt="gitify-app"
+            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+            data-component="Avatar"
+            height="14"
+            size="14"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            sx="[object Object]"
+            width="14"
+          />
+        </div>
+      </div>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
         data-align="stretch"
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
index 6568dc452..cc02a60e2 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
@@ -5,6 +5,69 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
   "asFragment": [Function],
   "baseElement": <body>
     <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <span
+          aria-label="View repository: gitify-app/notifications-test"
+          class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+          id=":r0:"
+          role="tooltip"
+        >
+          <div
+            class="Box-sc-g0xbh4-0 text-xs font-medium"
+            data-testid="view-repository"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app/notifications-test"
+                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                data-component="Avatar"
+                height="14"
+                size="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                sx="[object Object]"
+                width="14"
+              />
+              <span
+                class="Text-sc-17v1xeu-0 hmAFGJ"
+              >
+                gitify-app/notifications-test
+              </span>
+            </div>
+          </div>
+        </span>
+        <div
+          class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+        />
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
       <span
         aria-label="View repository: gitify-app/notifications-test"
         class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
@@ -12,6 +75,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
         role="tooltip"
       >
         <div
+          class="Box-sc-g0xbh4-0 text-xs font-medium"
           data-testid="view-repository"
         >
           <div
@@ -21,10 +85,11 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
+            data-testid="avatar"
             data-wrap="nowrap"
           >
             <img
-              alt=""
+              alt="gitify-app/notifications-test"
               class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
               data-component="Avatar"
               height="14"
@@ -34,58 +99,17 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
               width="14"
             />
             <span
-              class="text-xs font-medium"
+              class="Text-sc-17v1xeu-0 hmAFGJ"
             >
               gitify-app/notifications-test
             </span>
-            <span
-              class="text-xxs opacity-50"
-            />
           </div>
         </div>
       </span>
-    </div>
-  </body>,
-  "container": <div>
-    <span
-      aria-label="View repository: gitify-app/notifications-test"
-      class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-      id=":r0:"
-      role="tooltip"
-    >
       <div
-        data-testid="view-repository"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <img
-            alt=""
-            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-            data-component="Avatar"
-            height="14"
-            size="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            sx="[object Object]"
-            width="14"
-          />
-          <span
-            class="text-xs font-medium"
-          >
-            gitify-app/notifications-test
-          </span>
-          <span
-            class="text-xxs opacity-50"
-          />
-        </div>
-      </div>
-    </span>
+        class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+      />
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -146,6 +170,69 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
   "asFragment": [Function],
   "baseElement": <body>
     <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <span
+          aria-label="View repository: gitify-app/notifications-test"
+          class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+          id=":r1:"
+          role="tooltip"
+        >
+          <div
+            class="Box-sc-g0xbh4-0 text-xs font-medium"
+            data-testid="view-repository"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app/notifications-test"
+                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                data-component="Avatar"
+                height="14"
+                size="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                sx="[object Object]"
+                width="14"
+              />
+              <span
+                class="Text-sc-17v1xeu-0 hmAFGJ"
+              >
+                gitify-app/notifications-test
+              </span>
+            </div>
+          </div>
+        </span>
+        <div
+          class="Box-sc-g0xbh4-0 text-xxs opacity-50 hidden"
+        />
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
       <span
         aria-label="View repository: gitify-app/notifications-test"
         class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
@@ -153,6 +240,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
         role="tooltip"
       >
         <div
+          class="Box-sc-g0xbh4-0 text-xs font-medium"
           data-testid="view-repository"
         >
           <div
@@ -162,10 +250,11 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
+            data-testid="avatar"
             data-wrap="nowrap"
           >
             <img
-              alt=""
+              alt="gitify-app/notifications-test"
               class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
               data-component="Avatar"
               height="14"
@@ -175,58 +264,17 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
               width="14"
             />
             <span
-              class="text-xs font-medium"
+              class="Text-sc-17v1xeu-0 hmAFGJ"
             >
               gitify-app/notifications-test
             </span>
-            <span
-              class="text-xxs opacity-50 hidden"
-            />
           </div>
         </div>
       </span>
-    </div>
-  </body>,
-  "container": <div>
-    <span
-      aria-label="View repository: gitify-app/notifications-test"
-      class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-      id=":r1:"
-      role="tooltip"
-    >
       <div
-        data-testid="view-repository"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <img
-            alt=""
-            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-            data-component="Avatar"
-            height="14"
-            size="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            sx="[object Object]"
-            width="14"
-          />
-          <span
-            class="text-xs font-medium"
-          >
-            gitify-app/notifications-test
-          </span>
-          <span
-            class="text-xxs opacity-50 hidden"
-          />
-        </div>
-      </div>
-    </span>
+        class="Box-sc-g0xbh4-0 text-xxs opacity-50 hidden"
+      />
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -287,6 +335,69 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
   "asFragment": [Function],
   "baseElement": <body>
     <div>
+      <div
+        class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+        data-align="center"
+        data-direction="horizontal"
+        data-gap="condensed"
+        data-justify="start"
+        data-padding="none"
+        data-wrap="nowrap"
+      >
+        <span
+          aria-label="View repository: gitify-app/notifications-test"
+          class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+          id=":r2:"
+          role="tooltip"
+        >
+          <div
+            class="Box-sc-g0xbh4-0 text-xs font-medium"
+            data-testid="view-repository"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app/notifications-test"
+                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                data-component="Avatar"
+                height="14"
+                size="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                sx="[object Object]"
+                width="14"
+              />
+              <span
+                class="Text-sc-17v1xeu-0 hmAFGJ"
+              >
+                gitify-app/notifications-test
+              </span>
+            </div>
+          </div>
+        </span>
+        <div
+          class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+        />
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+      data-align="center"
+      data-direction="horizontal"
+      data-gap="condensed"
+      data-justify="start"
+      data-padding="none"
+      data-wrap="nowrap"
+    >
       <span
         aria-label="View repository: gitify-app/notifications-test"
         class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
@@ -294,6 +405,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
         role="tooltip"
       >
         <div
+          class="Box-sc-g0xbh4-0 text-xs font-medium"
           data-testid="view-repository"
         >
           <div
@@ -303,10 +415,11 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
+            data-testid="avatar"
             data-wrap="nowrap"
           >
             <img
-              alt=""
+              alt="gitify-app/notifications-test"
               class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
               data-component="Avatar"
               height="14"
@@ -316,58 +429,17 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
               width="14"
             />
             <span
-              class="text-xs font-medium"
+              class="Text-sc-17v1xeu-0 hmAFGJ"
             >
               gitify-app/notifications-test
             </span>
-            <span
-              class="text-xxs opacity-50"
-            />
           </div>
         </div>
       </span>
-    </div>
-  </body>,
-  "container": <div>
-    <span
-      aria-label="View repository: gitify-app/notifications-test"
-      class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-      id=":r2:"
-      role="tooltip"
-    >
       <div
-        data-testid="view-repository"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <img
-            alt=""
-            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-            data-component="Avatar"
-            height="14"
-            size="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            sx="[object Object]"
-            width="14"
-          />
-          <span
-            class="text-xs font-medium"
-          >
-            gitify-app/notifications-test
-          </span>
-          <span
-            class="text-xxs opacity-50"
-          />
-        </div>
-      </div>
-    </span>
+        class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+      />
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index 6bd5a6b7b..6ba008acd 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -42,45 +42,57 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
         <div
           class="flex-1 truncate cursor-pointer"
         >
-          <span
-            aria-label="View repository: gitify-app/notifications-test"
-            class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-            id=":r1:"
-            role="tooltip"
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              data-testid="view-repository"
+            <span
+              aria-label="View repository: gitify-app/notifications-test"
+              class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+              id=":r1:"
+              role="tooltip"
             >
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+                class="Box-sc-g0xbh4-0 text-xs font-medium"
+                data-testid="view-repository"
               >
-                <img
-                  alt=""
-                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-                  data-component="Avatar"
-                  height="14"
-                  size="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  sx="[object Object]"
-                  width="14"
-                />
-                <span
-                  class="text-xs font-medium"
+                <div
+                  class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
                 >
-                  gitify-app/notifications-test
-                </span>
-                <span
-                  class="text-xxs opacity-50"
-                />
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                    data-component="Avatar"
+                    height="14"
+                    size="14"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    sx="[object Object]"
+                    width="14"
+                  />
+                  <span
+                    class="Text-sc-17v1xeu-0 hmAFGJ"
+                  >
+                    gitify-app/notifications-test
+                  </span>
+                </div>
               </div>
-            </div>
-          </span>
+            </span>
+            <div
+              class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+            />
+          </div>
           <div
             class="flex gap-1 items-center mb-1 truncate text-sm"
             data-testid="notification-row"
@@ -104,18 +116,33 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-padding="none"
             data-wrap="wrap"
           >
-            <img
-              alt=""
-              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-              data-component="Avatar"
+            <div
+              class="Box-sc-g0xbh4-0"
               data-testid="view-profile"
-              height="14"
-              size="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              sx="[object Object]"
               title="View profile: gitify-app"
-              width="14"
-            />
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                  data-component="Avatar"
+                  height="14"
+                  size="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  sx="[object Object]"
+                  width="14"
+                />
+              </div>
+            </div>
             <div
               class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
               data-align="stretch"
@@ -383,45 +410,57 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
       <div
         class="flex-1 truncate cursor-pointer"
       >
-        <span
-          aria-label="View repository: gitify-app/notifications-test"
-          class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
-          id=":r1:"
-          role="tooltip"
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
-          <div
-            data-testid="view-repository"
+          <span
+            aria-label="View repository: gitify-app/notifications-test"
+            class="Tooltip__TooltipBase-sc-17tf59c-0 fcVRmg tooltipped-se"
+            id=":r1:"
+            role="tooltip"
           >
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="Box-sc-g0xbh4-0 text-xs font-medium"
+              data-testid="view-repository"
             >
-              <img
-                alt=""
-                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-                data-component="Avatar"
-                height="14"
-                size="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                sx="[object Object]"
-                width="14"
-              />
-              <span
-                class="text-xs font-medium"
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
               >
-                gitify-app/notifications-test
-              </span>
-              <span
-                class="text-xxs opacity-50"
-              />
+                <img
+                  alt="gitify-app/notifications-test"
+                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                  data-component="Avatar"
+                  height="14"
+                  size="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  sx="[object Object]"
+                  width="14"
+                />
+                <span
+                  class="Text-sc-17v1xeu-0 hmAFGJ"
+                >
+                  gitify-app/notifications-test
+                </span>
+              </div>
             </div>
-          </div>
-        </span>
+          </span>
+          <div
+            class="Box-sc-g0xbh4-0 text-xxs opacity-50"
+          />
+        </div>
         <div
           class="flex gap-1 items-center mb-1 truncate text-sm"
           data-testid="notification-row"
@@ -445,18 +484,33 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
           data-padding="none"
           data-wrap="wrap"
         >
-          <img
-            alt=""
-            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-            data-component="Avatar"
+          <div
+            class="Box-sc-g0xbh4-0"
             data-testid="view-profile"
-            height="14"
-            size="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            sx="[object Object]"
             title="View profile: gitify-app"
-            width="14"
-          />
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                data-component="Avatar"
+                height="14"
+                size="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                sx="[object Object]"
+                width="14"
+              />
+            </div>
+          </div>
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
             data-align="stretch"
@@ -804,18 +858,33 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-padding="none"
             data-wrap="wrap"
           >
-            <img
-              alt=""
-              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-              data-component="Avatar"
+            <div
+              class="Box-sc-g0xbh4-0"
               data-testid="view-profile"
-              height="14"
-              size="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              sx="[object Object]"
               title="View profile: gitify-app"
-              width="14"
-            />
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                  data-component="Avatar"
+                  height="14"
+                  size="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  sx="[object Object]"
+                  width="14"
+                />
+              </div>
+            </div>
             <div
               class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
               data-align="stretch"
@@ -1106,18 +1175,33 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
           data-padding="none"
           data-wrap="wrap"
         >
-          <img
-            alt=""
-            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-            data-component="Avatar"
+          <div
+            class="Box-sc-g0xbh4-0"
             data-testid="view-profile"
-            height="14"
-            size="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            sx="[object Object]"
             title="View profile: gitify-app"
-            width="14"
-          />
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                data-component="Avatar"
+                height="14"
+                size="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                sx="[object Object]"
+                width="14"
+              />
+            </div>
+          </div>
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
             data-align="stretch"
@@ -1465,18 +1549,33 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
             data-padding="none"
             data-wrap="wrap"
           >
-            <img
-              alt=""
-              class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-              data-component="Avatar"
+            <div
+              class="Box-sc-g0xbh4-0"
               data-testid="view-profile"
-              height="14"
-              size="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              sx="[object Object]"
               title="View profile: gitify-app"
-              width="14"
-            />
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                  data-component="Avatar"
+                  height="14"
+                  size="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  sx="[object Object]"
+                  width="14"
+                />
+              </div>
+            </div>
             <div
               class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
               data-align="stretch"
@@ -1767,18 +1866,33 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
           data-padding="none"
           data-wrap="wrap"
         >
-          <img
-            alt=""
-            class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
-            data-component="Avatar"
+          <div
+            class="Box-sc-g0xbh4-0"
             data-testid="view-profile"
-            height="14"
-            size="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            sx="[object Object]"
             title="View profile: gitify-app"
-            width="14"
-          />
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="Avatar__StyledAvatar-sc-2lv0r8-0 htlvKA"
+                data-component="Avatar"
+                height="14"
+                size="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                sx="[object Object]"
+                width="14"
+              />
+            </div>
+          </div>
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 duhwY"
             data-align="stretch"
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index ab5b1a320..42c36333e 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -35,10 +35,11 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                   data-gap="condensed"
                   data-justify="start"
                   data-padding="none"
+                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
                   <img
-                    alt=""
+                    alt="gitify-app/notifications-test"
                     class="Avatar__StyledAvatar-sc-2lv0r8-0 bGlcDY"
                     data-component="Avatar"
                     height="18"
@@ -239,10 +240,11 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
                 <img
-                  alt=""
+                  alt="gitify-app/notifications-test"
                   class="Avatar__StyledAvatar-sc-2lv0r8-0 bGlcDY"
                   data-component="Avatar"
                   height="18"
@@ -500,17 +502,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   data-gap="condensed"
                   data-justify="start"
                   data-padding="none"
+                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
-                  <img
-                    alt=""
-                    class="Avatar__StyledAvatar-sc-2lv0r8-0 bGlcDY"
-                    data-component="Avatar"
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-feed-person"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
                     height="18"
-                    size="18"
-                    sx="[object Object]"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
                     width="18"
-                  />
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
                   <span
                     class="Text-sc-17v1xeu-0 hmAFGJ"
                   >
@@ -696,17 +706,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                   data-gap="condensed"
                   data-justify="start"
                   data-padding="none"
+                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
-                  <img
-                    alt=""
-                    class="Avatar__StyledAvatar-sc-2lv0r8-0 bGlcDY"
-                    data-component="Avatar"
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-feed-person"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
                     height="18"
-                    size="18"
-                    sx="[object Object]"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
                     width="18"
-                  />
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
                   <span
                     class="Text-sc-17v1xeu-0 hmAFGJ"
                   >
@@ -899,17 +917,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
-                <img
-                  alt=""
-                  class="Avatar__StyledAvatar-sc-2lv0r8-0 bGlcDY"
-                  data-component="Avatar"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-feed-person"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
                   height="18"
-                  size="18"
-                  sx="[object Object]"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
                   width="18"
-                />
+                >
+                  <path
+                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  />
+                </svg>
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
@@ -1159,17 +1185,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                   data-gap="condensed"
                   data-justify="start"
                   data-padding="none"
+                  data-testid="avatar"
                   data-wrap="nowrap"
                 >
-                  <img
-                    alt=""
-                    class="Avatar__StyledAvatar-sc-2lv0r8-0 bGlcDY"
-                    data-component="Avatar"
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-feed-person"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
                     height="18"
-                    size="18"
-                    sx="[object Object]"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
                     width="18"
-                  />
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
                   <span
                     class="Text-sc-17v1xeu-0 hmAFGJ"
                   >
@@ -1362,17 +1396,25 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
+                data-testid="avatar"
                 data-wrap="nowrap"
               >
-                <img
-                  alt=""
-                  class="Avatar__StyledAvatar-sc-2lv0r8-0 bGlcDY"
-                  data-component="Avatar"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-feed-person"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
                   height="18"
-                  size="18"
-                  sx="[object Object]"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
                   width="18"
-                />
+                >
+                  <path
+                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  />
+                </svg>
                 <span
                   class="Text-sc-17v1xeu-0 hmAFGJ"
                 >
diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx
index 9fda07abb..d7f852ab4 100644
--- a/src/renderer/routes/Accounts.tsx
+++ b/src/renderer/routes/Accounts.tsx
@@ -15,14 +15,13 @@ import {
 import {
   ActionList,
   ActionMenu,
-  Avatar,
   Button,
   IconButton,
   Stack,
-  Text,
 } from '@primer/react';
 
 import { logError } from '../../shared/logger';
+import { AvatarWithFallback } from '../components/avatars/AvatarWithFallback';
 import { Header } from '../components/primitives/Header';
 import { AppContext } from '../context/App';
 import { type Account, Size } from '../types';
@@ -103,17 +102,12 @@ export const AccountsRoute: FC = () => {
                         onClick={() => openAccountProfile(account)}
                         data-testid="account-profile"
                       >
-                        <Stack
-                          direction="horizontal"
-                          gap="condensed"
-                          align="center"
-                        >
-                          <Avatar
-                            src={account.user.avatar}
-                            size={Size.XLARGE}
-                          />
-                          <Text>@{account.user.login}</Text>
-                        </Stack>
+                        <AvatarWithFallback
+                          src={account.user.avatar}
+                          alt={account.user.login}
+                          name={`@${account.user.login}`}
+                          size={Size.XLARGE}
+                        />
                       </Button>
                     </div>
 
diff --git a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
index a039c7be4..b5396594c 100644
--- a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
@@ -132,10 +132,11 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -147,8 +148,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -496,10 +496,11 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -511,8 +512,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -860,10 +860,11 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -875,8 +876,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -1362,10 +1362,11 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -1377,8 +1378,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -1726,10 +1726,11 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -1741,8 +1742,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -2090,10 +2090,11 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -2105,8 +2106,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -2592,10 +2592,11 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -2607,8 +2608,7 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -2956,10 +2956,11 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -2971,8 +2972,7 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>
@@ -3320,10 +3320,11 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
                       data-gap="condensed"
                       data-justify="start"
                       data-padding="none"
+                      data-testid="avatar"
                       data-wrap="nowrap"
                     >
                       <img
-                        alt=""
+                        alt="octocat"
                         class="Avatar__StyledAvatar-sc-2lv0r8-0 jwAMPP"
                         data-component="Avatar"
                         height="20"
@@ -3335,8 +3336,7 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
                       <span
                         class="Text-sc-17v1xeu-0 hmAFGJ"
                       >
-                        @
-                        octocat
+                        @octocat
                       </span>
                     </div>
                   </span>