From 78392a4e7937de30ef99535084c4726d9f047adf Mon Sep 17 00:00:00 2001
From: Jake Howell <jake@hwll.me>
Date: Tue, 25 Aug 2026 13:42:13 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20revert(site):=20remove=20bui?=
 =?UTF-8?q?lt-in=20emoji=20avatar=20inset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 site/src/components/Avatar/Avatar.stories.tsx | 20 -------------------
 site/src/components/Avatar/Avatar.tsx         | 15 +-------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/site/src/components/Avatar/Avatar.stories.tsx b/site/src/components/Avatar/Avatar.stories.tsx
index a9c51fef621..4b6b020dd8a 100644
--- a/site/src/components/Avatar/Avatar.stories.tsx
+++ b/site/src/components/Avatar/Avatar.stories.tsx
@@ -53,26 +53,6 @@ export const NonSquaredIcon: Story = {
 	},
 };
 
-export const BuiltInEmojiLgSize: Story = {
-	args: {
-		size: "lg",
-		src: "/emojis/1f64c.png",
-	},
-};
-
-export const BuiltInEmojiMdSize: Story = {
-	args: {
-		src: "/emojis/1f64c.png",
-	},
-};
-
-export const BuiltInEmojiSmSize: Story = {
-	args: {
-		size: "sm",
-		src: "/emojis/1f64c.png",
-	},
-};
-
 export const FallbackLgSize: Story = {
 	args: {
 		src: "",
diff --git a/site/src/components/Avatar/Avatar.tsx b/site/src/components/Avatar/Avatar.tsx
index 71dd67b05de..d080ebed312 100644
--- a/site/src/components/Avatar/Avatar.tsx
+++ b/site/src/components/Avatar/Avatar.tsx
@@ -73,26 +73,13 @@ export const Avatar: React.FC<AvatarProps> = ({
 	fallback,
 	alt = "",
 	children,
-	style,
 	...props
 }) => {
 	const { externalImages } = useAppearance();
 
-	const isEmoji = src?.startsWith("/emojis/");
-
 	return (
 		<AvatarPrimitive.Root
-			className={cn(
-				avatarVariants({
-					size,
-					variant: isEmoji ? "default" : variant,
-					className,
-				}),
-			)}
-			style={{
-				...style,
-				padding: isEmoji ? "20%" : style?.padding,
-			}}
+			className={cn(avatarVariants({ size, variant, className }))}
 			{...props}
 		>
 			<AvatarPrimitive.Image

From 5b8da41910923365a5d75f791a0c13e652c981fe Mon Sep 17 00:00:00 2001
From: Jake Howell <jake@hwll.me>
Date: Tue, 25 Aug 2026 06:59:51 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20chore:=20bump=20pull=20reque?=
 =?UTF-8?q?st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit