diff --git a/.changeset/avatar-inner-border.md b/.changeset/avatar-inner-border.md
new file mode 100644
index 00000000000..fe51f36d747
--- /dev/null
+++ b/.changeset/avatar-inner-border.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+Avatar: Move the border inside the image for a crisper edge
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-dark-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-dark-high-contrast-linux.png
index 94cd7cd7b53..b9e68ae68e1 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-dark-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-light-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-light-high-contrast-linux.png
index 3279a3f1791..186c81422e8 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-light-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Block-Description-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-dark-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-dark-high-contrast-linux.png
index 08cd7b483a5..5f0a6ca106f 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-dark-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-light-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-light-high-contrast-linux.png
index 74ef5844933..d3bb5575e1f 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-light-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-Old-Api-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-dark-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-dark-high-contrast-linux.png
index e24129102d8..34cd8d8eb21 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-dark-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-light-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-light-high-contrast-linux.png
index ebe68e8f867..b5aa67cec6d 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-light-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Filled-Title-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-dark-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-dark-high-contrast-linux.png
index 565a0d280a8..f4ffd59b472 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-dark-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-light-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-light-high-contrast-linux.png
index 6b3cd1b76c1..333540d3b9e 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-light-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-Old-Api-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-dark-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-dark-high-contrast-linux.png
index c143e71b8a3..f52ef2d22e6 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-dark-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-light-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-light-high-contrast-linux.png
index 8ff1ebf673c..bc83ec81f3c 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-light-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Group-With-Subtle-Title-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-dark-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-dark-high-contrast-linux.png
index fd0b66cb489..2b15c2acdcc 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-dark-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-light-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-light-high-contrast-linux.png
index d1a1b29134e..d2812f1ac19 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-light-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-Inline-Description-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-dark-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-dark-high-contrast-linux.png
index 4dfcfaab413..8667cbe36e8 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-dark-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-light-high-contrast-linux.png b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-light-high-contrast-linux.png
index 16206aa1d3a..0ff768a7dca 100644
Binary files a/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-light-high-contrast-linux.png and b/.playwright/snapshots/components/ActionList.test.ts-snapshots/ActionList-With-Avatars-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-dark-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-dark-high-contrast-linux.png
index 0907e31bbd1..b8efe64250f 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-dark-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-light-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-light-high-contrast-linux.png
index fadc41010e6..161ff5069b1 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-light-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Default-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-dark-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-dark-high-contrast-linux.png
index 114190c440f..dfdeedc48ce 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-dark-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-light-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-light-high-contrast-linux.png
index faf8c8eaec9..183ff9ac77b 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-light-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-Responsive-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-dark-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-dark-high-contrast-linux.png
index 22fc060c6e3..9be783a209a 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-dark-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-light-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-light-high-contrast-linux.png
index 4098f806510..5fa000d67cf 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-light-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Size-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-dark-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-dark-high-contrast-linux.png
index 0e3952eb41d..c8e03210aa2 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-dark-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-light-high-contrast-linux.png b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-light-high-contrast-linux.png
index a264c317e42..6dde7ed50b8 100644
Binary files a/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-light-high-contrast-linux.png and b/.playwright/snapshots/components/Avatar.test.ts-snapshots/Avatar-Square-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Header.test.ts-snapshots/Header-Default-dark-high-contrast-linux.png b/.playwright/snapshots/components/Header.test.ts-snapshots/Header-Default-dark-high-contrast-linux.png
index eb822c87c1a..5a6fdd0ae94 100644
Binary files a/.playwright/snapshots/components/Header.test.ts-snapshots/Header-Default-dark-high-contrast-linux.png and b/.playwright/snapshots/components/Header.test.ts-snapshots/Header-Default-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-dark-high-contrast-linux.png b/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-dark-high-contrast-linux.png
index f4e8aa37319..29148dac112 100644
Binary files a/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-dark-high-contrast-linux.png and b/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-light-high-contrast-linux.png b/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-light-high-contrast-linux.png
index 59926ee583a..8378104ba5c 100644
Binary files a/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-light-high-contrast-linux.png and b/.playwright/snapshots/components/Radio.test.ts-snapshots/Radio-With-Leading-Visual-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-dark-high-contrast-linux.png b/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-dark-high-contrast-linux.png
index 6cb1757ea75..6f728632a92 100644
Binary files a/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-dark-high-contrast-linux.png and b/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-light-high-contrast-linux.png b/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-light-high-contrast-linux.png
index bf54b235514..80ec106190d 100644
Binary files a/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-light-high-contrast-linux.png and b/.playwright/snapshots/components/SideNav.test.ts-snapshots/SideNav-Full-Variant-light-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-dark-high-contrast-linux.png b/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-dark-high-contrast-linux.png
index 8aadc8165c1..0d07868417c 100644
Binary files a/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-dark-high-contrast-linux.png and b/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-dark-high-contrast-linux.png differ
diff --git a/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-light-high-contrast-linux.png b/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-light-high-contrast-linux.png
index 67cf85cb9dd..d1df4902844 100644
Binary files a/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-light-high-contrast-linux.png and b/.playwright/snapshots/components/UnderlineNav.test.ts-snapshots/UnderlineNav-Profile-Page-light-high-contrast-linux.png differ
diff --git a/packages/react/src/Avatar/Avatar.module.css b/packages/react/src/Avatar/Avatar.module.css
index fc67531b9a7..25f8900e2af 100644
--- a/packages/react/src/Avatar/Avatar.module.css
+++ b/packages/react/src/Avatar/Avatar.module.css
@@ -7,8 +7,22 @@
line-height: 1;
vertical-align: middle;
border-radius: 50%;
- /* stylelint-disable-next-line primer/box-shadow */
- box-shadow: 0 0 0 1px var(--avatar-borderColor);
+
+ &:where([data-component='AvatarStack'] *) {
+ /* Preserve the outer edge for stack items that don't override it. */
+ /* stylelint-disable-next-line primer/box-shadow */
+ box-shadow: 0 0 0 var(--borderWidth-thin) var(--avatar-borderColor);
+ }
+
+ &:where(:not(:focus-visible, [data-component='AvatarStack'] *)) {
+ /* An inset shadow paints behind the image; an outline paints over it. */
+ outline: var(--borderWidth-thin) solid var(--avatar-borderColor);
+ outline-offset: calc(-1 * var(--borderWidth-thin));
+
+ @media (forced-colors: active) {
+ outline: none;
+ }
+ }
&:where([data-square]) {
/* stylelint-disable-next-line primer/borders */
diff --git a/packages/react/src/Avatar/Avatar.test.tsx b/packages/react/src/Avatar/Avatar.test.tsx
index c7d7ff4f0f9..651191b5748 100644
--- a/packages/react/src/Avatar/Avatar.test.tsx
+++ b/packages/react/src/Avatar/Avatar.test.tsx
@@ -1,6 +1,6 @@
import {describe, expect, it} from 'vitest'
import {render} from '@testing-library/react'
-import {page} from 'vitest/browser'
+import {page, userEvent} from 'vitest/browser'
import Avatar from '../Avatar'
import {implementsClassName} from '../utils/testing'
import classes from './Avatar.module.css'
@@ -24,6 +24,19 @@ describe('Avatar', () => {
await expect.element(avatar).toHaveAttribute('height', size.toString())
})
+ it('preserves the keyboard focus outline', async () => {
+ render()
+ const avatar = page.getByRole('img', {name: 'Mona'})
+ await expect.element(avatar).toHaveStyle('outline-offset: -1px')
+
+ await userEvent.tab()
+
+ await expect.element(avatar).toHaveFocus()
+ const {outlineOffset, outlineStyle} = getComputedStyle(avatar.element())
+ expect(outlineOffset).not.toBe('-1px')
+ expect(outlineStyle).not.toBe('none')
+ })
+
it('respects the size prop', async () => {
render()
const avatar = page.getByTestId('avatar')