diff --git a/src/app/(site)/friends/page.tsx b/src/app/(site)/friends/page.tsx
index 2c6c5293..85a56018 100644
--- a/src/app/(site)/friends/page.tsx
+++ b/src/app/(site)/friends/page.tsx
@@ -5,9 +5,9 @@ import { getTranslations } from "next-intl/server";
 import type { CSSProperties } from "react";
 import { removeFriendship } from "@/actions/messenger";
 import { ContentCard, EmptyState, OnlineBadge } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { auth } from "@/lib/auth";
 import { db, MessengerFriendships, User } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 
 export const metadata = { title: "Friends" };
 
@@ -118,10 +118,6 @@ export default async function FriendsPage({
 				) : (
 					<div className="card-grid sm-2 lg-3" style={{ padding: "1rem" }}>
 						{friends.map((friend) => {
-							const avatar = avatarImageUrl(friend.look, {
-								size: "s",
-								headOnly: true,
-							});
 							const isOnline = friend.online === "1";
 							return (
 								<div
@@ -133,13 +129,9 @@ export default async function FriendsPage({
 										alignItems: "center",
 									}}
 								>
-									{/* eslint-disable-next-line @next/next/no-img-element */}
-									<img
-										className="avatar"
-										src={avatar}
+									<UserAvatarThumbnail
+										figure={friend.look}
 										alt={`${friend.username} avatar`}
-										width={50}
-										height={50}
 									/>
 									<div style={{ minWidth: 0, flex: 1 }}>
 										<h3 style={{ margin: "0 0 0.3rem", fontSize: "1rem" }}>
diff --git a/src/app/(site)/guilds/[id]/page.tsx b/src/app/(site)/guilds/[id]/page.tsx
index 2436d1e1..df6056e9 100644
--- a/src/app/(site)/guilds/[id]/page.tsx
+++ b/src/app/(site)/guilds/[id]/page.tsx
@@ -3,8 +3,8 @@ import Link from "next/link";
 import { notFound } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState, StatBlock } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { db, Guilds, GuildsMembers, User } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 import { formatDate } from "@/lib/format-date";
 
 type GuildView = {
@@ -202,14 +202,9 @@ export default async function GuildPage({
 									alignItems: "center",
 								}}
 							>
-								{/* eslint-disable-next-line @next/next/no-img-element */}
-								<img
-									className="avatar"
-									src={avatarImageUrl(m.look)}
+								<UserAvatarThumbnail
+									figure={m.look}
 									alt={`${m.username} avatar`}
-									width={50}
-									height={75}
-									style={{ flex: "0 0 auto" }}
 								/>
 								<div style={{ minWidth: 0 }}>
 									<h3 style={{ margin: "0 0 0.2rem", fontSize: "1rem" }}>
diff --git a/src/app/(site)/leaderboard/page.tsx b/src/app/(site)/leaderboard/page.tsx
index c477a6f5..165a5c2f 100644
--- a/src/app/(site)/leaderboard/page.tsx
+++ b/src/app/(site)/leaderboard/page.tsx
@@ -2,8 +2,8 @@ import { desc, eq, inArray } from "drizzle-orm";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState, RankBadge } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { db, User, UsersCurrency, UsersSettings } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 
 export const metadata = { title: "Leaderboard" };
 
@@ -206,23 +206,15 @@ export default async function LeaderboardPage({
 						</thead>
 						<tbody>
 							{rows.map((row, i) => {
-								const avatar = avatarImageUrl(row.look, {
-									size: "s",
-									headOnly: true,
-								});
 								return (
 									<tr key={row.username}>
 										<td>
 											<RankBadge position={i + 1} />
 										</td>
 										<td>
-											{/* eslint-disable-next-line @next/next/no-img-element */}
-											<img
-												className="avatar"
-												src={avatar}
+											<UserAvatarThumbnail
+												figure={row.look}
 												alt={`${row.username} avatar`}
-												width={40}
-												height={40}
 											/>
 										</td>
 										<td>
diff --git a/src/app/(site)/login/page.tsx b/src/app/(site)/login/page.tsx
index ef15e431..daa549d0 100644
--- a/src/app/(site)/login/page.tsx
+++ b/src/app/(site)/login/page.tsx
@@ -7,10 +7,10 @@ import { LoginForm } from "@/components/auth/login-form";
 import { Clock } from "@/components/clock";
 import { LanguageSwitcher } from "@/components/language-switcher";
 import { Reveal } from "@/components/motion-reveal";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { ThemeSwitcher } from "@/components/theme-switcher";
 import { cached } from "@/lib/cache";
 import { db, User } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 import { resolveHotelName } from "@/lib/hotel-name";
 import { captchaConfig } from "@/lib/services/captcha";
 import { siteSettings } from "@/lib/services/site-settings";
@@ -227,17 +227,11 @@ export default async function LoginPage() {
 														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
 												}}
 											>
-												<Image
-													src={avatarImageUrl(u.look, {
-														headOnly: true,
-														direction: 2,
-														size: "s",
-													})}
+												<UserAvatarThumbnail
+													figure={u.look}
 													alt=""
-													width={26}
-													height={32}
+													options={{ direction: 2 }}
 													className="rounded-md"
-													unoptimized
 												/>
 												<span
 													className="text-[8px] font-bold truncate w-full text-center leading-tight"
@@ -298,17 +292,11 @@ export default async function LoginPage() {
 														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
 												}}
 											>
-												<Image
-													src={avatarImageUrl(u.look, {
-														headOnly: true,
-														direction: 2,
-														size: "s",
-													})}
+												<UserAvatarThumbnail
+													figure={u.look}
 													alt=""
-													width={26}
-													height={32}
+													options={{ direction: 2 }}
 													className="rounded-md"
-													unoptimized
 												/>
 												<span
 													className="text-[8px] font-bold truncate w-full text-center leading-tight"
diff --git a/src/app/(site)/me/page.tsx b/src/app/(site)/me/page.tsx
index c40a2cfa..3cb47987 100644
--- a/src/app/(site)/me/page.tsx
+++ b/src/app/(site)/me/page.tsx
@@ -6,6 +6,7 @@ import type { CSSProperties, ReactNode } from "react";
 import { claimReferral } from "@/actions/referral";
 
 import { Reveal } from "@/components/motion-reveal";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { auth } from "@/lib/auth";
 import {
 	db,
@@ -496,16 +497,10 @@ export default async function MePage({
 											textDecoration: "none",
 										}}
 									>
-										<Image
-											src={avatarImageUrl(friend.look, {
-												size: "s",
-												headOnly: true,
-											})}
+										<UserAvatarThumbnail
+											figure={friend.look}
 											alt=""
-											width={40}
-											height={50}
 											className="rounded-lg shrink-0"
-											unoptimized
 										/>
 										<div className="min-w-0">
 											<p
diff --git a/src/app/(site)/messages/page.tsx b/src/app/(site)/messages/page.tsx
index 059289e8..d315967f 100644
--- a/src/app/(site)/messages/page.tsx
+++ b/src/app/(site)/messages/page.tsx
@@ -9,6 +9,7 @@ import {
 	sendOfflineMessage,
 } from "@/actions/messenger";
 import { ContentCard, EmptyState } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { auth } from "@/lib/auth";
 import {
 	db,
@@ -17,7 +18,6 @@ import {
 	MessengerOffline,
 	User,
 } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 import { formatDate } from "@/lib/format-date";
 
 type SearchParams = Promise<{
@@ -270,10 +270,6 @@ export default async function MessagesPage({
 					<div className="grid" style={{ padding: "1rem", gap: "0.75rem" }}>
 						{requests.map((req) => {
 							const from = userById.get(req.userFromId);
-							const avatar = avatarImageUrl(from?.look ?? "", {
-								size: "s",
-								headOnly: true,
-							});
 							return (
 								<div
 									key={req.id}
@@ -284,13 +280,9 @@ export default async function MessagesPage({
 										alignItems: "center",
 									}}
 								>
-									{/* eslint-disable-next-line @next/next/no-img-element */}
-									<img
-										className="avatar"
-										src={avatar}
+									<UserAvatarThumbnail
+										figure={from?.look ?? ""}
 										alt={`${from?.username ?? "User"} avatar`}
-										width={50}
-										height={50}
 									/>
 									<div style={{ minWidth: 0, flex: 1 }}>
 										<p style={{ margin: 0 }}>
@@ -360,10 +352,6 @@ export default async function MessagesPage({
 					<div className="grid" style={{ padding: "1rem", gap: "0.75rem" }}>
 						{messages.map((msg) => {
 							const from = userById.get(msg.userFromId);
-							const avatar = avatarImageUrl(from?.look ?? "", {
-								size: "s",
-								headOnly: true,
-							});
 							const when = formatDate(new Date(msg.sendedOn * 1000));
 							return (
 								<article
@@ -375,13 +363,9 @@ export default async function MessagesPage({
 										alignItems: "flex-start",
 									}}
 								>
-									{/* eslint-disable-next-line @next/next/no-img-element */}
-									<img
-										className="avatar"
-										src={avatar}
+									<UserAvatarThumbnail
+										figure={from?.look ?? ""}
 										alt={`${from?.username ?? "User"} avatar`}
-										width={50}
-										height={50}
 									/>
 									<div style={{ minWidth: 0, flex: 1 }}>
 										<p
diff --git a/src/app/(site)/page.tsx b/src/app/(site)/page.tsx
index c1ce808b..7c346036 100644
--- a/src/app/(site)/page.tsx
+++ b/src/app/(site)/page.tsx
@@ -10,12 +10,12 @@ import { HomeLoginForm } from "@/components/auth/home-login-form";
 import { Clock } from "@/components/clock";
 import { LanguageSwitcher } from "@/components/language-switcher";
 import { Reveal } from "@/components/motion-reveal";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { ThemeSwitcher } from "@/components/theme-switcher";
 import { TypewriterText } from "@/components/typewriter-text";
 import { auth } from "@/lib/auth";
 import { cached } from "@/lib/cache";
 import { CameraWeb, db, Rooms, User, WebsiteArticles } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 import { formatDate } from "@/lib/format-date";
 import { resolveHotelName } from "@/lib/hotel-name";
 import { captchaConfig } from "@/lib/services/captcha";
@@ -478,16 +478,10 @@ export default async function Home() {
 										className="flex flex-col items-center gap-1"
 									>
 										<div className="relative overflow-visible">
-											<Image
-												src={avatarImageUrl(u.look, {
-													headOnly: true,
-													direction: 3,
-												})}
+											<UserAvatarThumbnail
+												figure={u.look}
 												alt={u.username}
-												width={64}
-												height={78}
-												style={{ marginTop: "-8px" }}
-												unoptimized
+												options={{ direction: 3 }}
 											/>
 										</div>
 										<span
@@ -656,17 +650,11 @@ export default async function Home() {
 												"color-mix(in srgb, var(--color-primary) 5%, transparent)",
 										}}
 									>
-										<Image
-											src={avatarImageUrl(u.look, {
-												headOnly: true,
-												direction: 2,
-												size: "s",
-											})}
+										<UserAvatarThumbnail
+											figure={u.look}
 											alt={u.username}
-											width={30}
-											height={36}
+											options={{ direction: 2 }}
 											className="rounded-md"
-											unoptimized
 										/>
 										<span
 											className="text-[9px] font-bold truncate max-w-[50px] text-center leading-tight"
diff --git a/src/app/(site)/radio/leaderboard/page.tsx b/src/app/(site)/radio/leaderboard/page.tsx
index fa34ee7f..2aca125c 100644
--- a/src/app/(site)/radio/leaderboard/page.tsx
+++ b/src/app/(site)/radio/leaderboard/page.tsx
@@ -2,8 +2,8 @@ import { sql } from "drizzle-orm";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState, RankBadge } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { db } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 
 type LeaderRow = {
 	username: string;
@@ -56,23 +56,15 @@ export default async function RadioLeaderboardPage() {
 						</thead>
 						<tbody>
 							{rows.map((row, i) => {
-								const avatar = avatarImageUrl(row.look, {
-									size: "s",
-									headOnly: true,
-								});
 								return (
 									<tr key={row.username}>
 										<td>
 											<RankBadge position={i + 1} />
 										</td>
 										<td>
-											{/* eslint-disable-next-line @next/next/no-img-element */}
-											<img
-												className="avatar"
-												src={avatar}
+											<UserAvatarThumbnail
+												figure={row.look}
 												alt={`${row.username} avatar`}
-												width={40}
-												height={40}
 											/>
 										</td>
 										<td>
diff --git a/src/app/(site)/radio/shouts/page.tsx b/src/app/(site)/radio/shouts/page.tsx
index 882a30b1..d4c74309 100644
--- a/src/app/(site)/radio/shouts/page.tsx
+++ b/src/app/(site)/radio/shouts/page.tsx
@@ -3,9 +3,9 @@ import { getTranslations } from "next-intl/server";
 import type { CSSProperties } from "react";
 import { postShout } from "@/actions/radio-shouts";
 import { ContentCard, EmptyState } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { auth } from "@/lib/auth";
 import { db, RadioShouts, User } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 import { formatDate } from "@/lib/format-date";
 
 type SearchParams = Promise<{ posted?: string; error?: string }>;
@@ -135,12 +135,6 @@ export default async function RadioShoutsPage({
 					<div className="card-grid">
 						{shouts.map((s) => {
 							const author = authorById.get(Number(s.userId));
-							const authorAvatar = author
-								? avatarImageUrl(author.look, {
-										size: "s",
-										headOnly: true,
-									})
-								: null;
 							return (
 								<div
 									key={String(s.id)}
@@ -151,14 +145,10 @@ export default async function RadioShoutsPage({
 										alignItems: "flex-start",
 									}}
 								>
-									{authorAvatar ? (
-										/* eslint-disable-next-line @next/next/no-img-element */
-										<img
-											className="avatar"
-											src={authorAvatar}
+									{author ? (
+										<UserAvatarThumbnail
+											figure={author.look}
 											alt={author?.username ?? "author"}
-											width={40}
-											height={40}
 										/>
 									) : null}
 									<div style={{ flex: 1, minWidth: 0 }}>
diff --git a/src/app/(site)/rankings/page.tsx b/src/app/(site)/rankings/page.tsx
index d1b6eccf..71056cb5 100644
--- a/src/app/(site)/rankings/page.tsx
+++ b/src/app/(site)/rankings/page.tsx
@@ -1,5 +1,4 @@
 import { desc } from "drizzle-orm";
-import Image from "next/image";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import {
@@ -8,8 +7,8 @@ import {
 	OnlineBadge,
 	RankBadge,
 } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { db, User } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 
 export const metadata = { title: "Rankings" };
 
@@ -50,9 +49,6 @@ export default async function RankingsPage() {
 				) : (
 					<div className="card-grid sm-2 lg-3" style={{ padding: "1rem" }}>
 						{users.map((u, i) => {
-							const avatar = avatarImageUrl(u.look, {
-								size: "m",
-							});
 							return (
 								<div
 									key={u.username}
@@ -64,13 +60,9 @@ export default async function RankingsPage() {
 									}}
 								>
 									<RankBadge position={i + 1} />
-									<Image
-										className="avatar"
-										src={avatar}
+									<UserAvatarThumbnail
+										figure={u.look}
 										alt={`${u.username} avatar`}
-										width={50}
-										height={90}
-										unoptimized
 									/>
 									<div style={{ minWidth: 0, flex: 1 }}>
 										<h3 style={{ margin: "0 0 0.25rem", fontSize: "1rem" }}>
diff --git a/src/app/(site)/register/page.tsx b/src/app/(site)/register/page.tsx
index 5249f642..bb5bdc3f 100644
--- a/src/app/(site)/register/page.tsx
+++ b/src/app/(site)/register/page.tsx
@@ -7,10 +7,10 @@ import { RegisterForm } from "@/components/auth/register-form";
 import { Clock } from "@/components/clock";
 import { LanguageSwitcher } from "@/components/language-switcher";
 import { Reveal } from "@/components/motion-reveal";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { ThemeSwitcher } from "@/components/theme-switcher";
 import { cached } from "@/lib/cache";
 import { db, User } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 import { resolveHotelName } from "@/lib/hotel-name";
 import { captchaConfig } from "@/lib/services/captcha";
 import { siteSettings } from "@/lib/services/site-settings";
@@ -224,17 +224,11 @@ export default async function RegisterPage() {
 														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
 												}}
 											>
-												<Image
-													src={avatarImageUrl(u.look, {
-														headOnly: true,
-														direction: 2,
-														size: "s",
-													})}
+												<UserAvatarThumbnail
+													figure={u.look}
 													alt=""
-													width={26}
-													height={32}
+													options={{ direction: 2 }}
 													className="rounded-md"
-													unoptimized
 												/>
 												<span
 													className="text-[8px] font-bold truncate w-full text-center leading-tight"
@@ -295,16 +289,11 @@ export default async function RegisterPage() {
 														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
 												}}
 											>
-												<Image
-													src={avatarImageUrl(u.look, {
-														headOnly: true,
-														direction: 2,
-													})}
+												<UserAvatarThumbnail
+													figure={u.look}
 													alt=""
-													width={52}
-													height={64}
+													options={{ direction: 2 }}
 													className="rounded-md"
-													unoptimized
 												/>
 												<span
 													className="text-[10px] font-bold truncate w-full text-center leading-tight"
diff --git a/src/app/(site)/search/page.tsx b/src/app/(site)/search/page.tsx
index 7020a543..26414707 100644
--- a/src/app/(site)/search/page.tsx
+++ b/src/app/(site)/search/page.tsx
@@ -1,9 +1,8 @@
 import { and, eq, like } from "drizzle-orm";
 import type { Metadata } from "next";
-import Image from "next/image";
 import Link from "next/link";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { db, Rooms, User } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 
 export const metadata: Metadata = { title: "Search" };
 
@@ -134,15 +133,10 @@ export default async function SearchPage({
 										"color-mix(in srgb, var(--color-primary) 4%, transparent)",
 								}}
 							>
-								<Image
-									src={avatarImageUrl(u.look, {
-										headOnly: true,
-										direction: 2,
-									})}
+								<UserAvatarThumbnail
+									figure={u.look}
 									alt={u.username}
-									width={40}
-									height={48}
-									unoptimized
+									options={{ direction: 2 }}
 									className="rounded-lg"
 								/>
 								<span
diff --git a/src/app/(site)/u/[username]/page.tsx b/src/app/(site)/u/[username]/page.tsx
index 61629123..9aba8573 100644
--- a/src/app/(site)/u/[username]/page.tsx
+++ b/src/app/(site)/u/[username]/page.tsx
@@ -12,6 +12,7 @@ import {
 	OnlineBadge,
 	StatBlock,
 } from "@/components/public/ui";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { auth } from "@/lib/auth";
 import {
 	CameraWeb,
@@ -477,17 +478,7 @@ export default async function ProfilePage({
 									textAlign: "center",
 								}}
 							>
-								{/* eslint-disable-next-line @next/next/no-img-element */}
-								<img
-									src={avatarImageUrl(f.look, {
-										size: "m",
-										headOnly: true,
-									})}
-									alt={f.username}
-									width={48}
-									height={48}
-									style={{ display: "block" }}
-								/>
+								<UserAvatarThumbnail figure={f.look} alt={f.username} />
 								<span
 									style={{
 										fontSize: "0.8rem",
@@ -680,12 +671,6 @@ export default async function ProfilePage({
 					<div className="grid" style={{ gap: "0.75rem" }}>
 						{guestbook.map((g) => {
 							const author = authorById.get(g.userId);
-							const authorAvatar = author
-								? avatarImageUrl(author.look, {
-										size: "s",
-										headOnly: true,
-									})
-								: null;
 							return (
 								<div
 									key={String(g.id)}
@@ -696,14 +681,10 @@ export default async function ProfilePage({
 										alignItems: "flex-start",
 									}}
 								>
-									{authorAvatar ? (
-										/* eslint-disable-next-line @next/next/no-img-element */
-										<img
-											className="avatar"
-											src={authorAvatar}
+									{author ? (
+										<UserAvatarThumbnail
+											figure={author.look}
 											alt={author?.username ?? "author"}
-											width={40}
-											height={40}
 										/>
 									) : null}
 									<div style={{ flex: 1 }}>
diff --git a/src/components/shared/public-avatar-contract.test.ts b/src/components/shared/public-avatar-contract.test.ts
new file mode 100644
index 00000000..8d2563ed
--- /dev/null
+++ b/src/components/shared/public-avatar-contract.test.ts
@@ -0,0 +1,46 @@
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { describe, expect, it } from "vitest";
+
+const compactCallSites = new Map<string, number>([
+	["src/components/top-header.tsx", 2],
+	["src/app/(site)/friends/page.tsx", 1],
+	["src/app/(site)/guilds/[id]/page.tsx", 1],
+	["src/app/(site)/leaderboard/page.tsx", 1],
+	["src/app/(site)/login/page.tsx", 2],
+	["src/app/(site)/me/page.tsx", 1],
+	["src/app/(site)/messages/page.tsx", 2],
+	["src/app/(site)/page.tsx", 2],
+	["src/app/(site)/radio/leaderboard/page.tsx", 1],
+	["src/app/(site)/radio/shouts/page.tsx", 1],
+	["src/app/(site)/rankings/page.tsx", 1],
+	["src/app/(site)/register/page.tsx", 2],
+	["src/app/(site)/search/page.tsx", 1],
+	["src/app/(site)/u/[username]/page.tsx", 2],
+]);
+
+function source(path: string): string {
+	return readFileSync(resolve(process.cwd(), path), "utf8");
+}
+
+describe("public avatar presentation contract", () => {
+	it.each([...compactCallSites])(
+		"uses the shared thumbnail in %s",
+		(path, expectedCount) => {
+			const matches = source(path).match(/<UserAvatarThumbnail\b/g) ?? [];
+			expect(matches).toHaveLength(expectedCount);
+		},
+	);
+
+	it("preserves explicit full-avatar previews", () => {
+		expect(source("src/app/(site)/me/page.tsx")).toContain(
+			"avatarImageUrl(user.look",
+		);
+		expect(source("src/app/(site)/settings/page.tsx")).toContain(
+			"avatarImageUrl(user.look",
+		);
+		expect(source("src/app/(site)/u/[username]/page.tsx")).toContain(
+			"avatarImageUrl(user.look",
+		);
+	});
+});
diff --git a/src/components/top-header.tsx b/src/components/top-header.tsx
index 569e9bd2..f8df6397 100644
--- a/src/components/top-header.tsx
+++ b/src/components/top-header.tsx
@@ -4,6 +4,7 @@ import Link from "next/link";
 import type { Session } from "next-auth";
 import { getTranslations } from "next-intl/server";
 import { RoomQuickEntry } from "@/components/room-quick-entry";
+import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
 import { signOut } from "@/lib/auth";
 import { cached } from "@/lib/cache";
 import {
@@ -13,7 +14,6 @@ import {
 	User,
 	UsersCurrency,
 } from "@/lib/db";
-import { avatarImageUrl } from "@/lib/format";
 import { resolveHotelName } from "@/lib/hotel-name";
 import { canAccess, getApiAdminContext, PERMS } from "@/lib/permissions";
 
@@ -77,7 +77,6 @@ export async function TopHeader({ session }: { session: Session | null }) {
 		}
 	} catch {}
 
-	const avatar = avatarImageUrl(look, { headOnly: true, direction: 2 });
 	let showAdmin = false;
 	let showMod = false;
 	const ctx = await getApiAdminContext();
@@ -318,16 +317,13 @@ export async function TopHeader({ session }: { session: Session | null }) {
 							aria-label="User menu"
 							className="list-none cursor-pointer flex items-center [&::-webkit-details-marker]:hidden"
 						>
-							<Image
-								className="bg-no-repeat bg-center"
-								src={avatar}
+							<UserAvatarThumbnail
+								figure={look}
 								alt=""
-								width={54}
-								height={62}
-								unoptimized
+								options={{ direction: 2 }}
 							/>
 							<span
-								className="hidden sm:inline -ml-2 font-semibold"
+								className="hidden sm:inline font-semibold"
 								style={{ color: textColor }}
 							>
 								{session.user.name}
@@ -387,16 +383,10 @@ export async function TopHeader({ session }: { session: Session | null }) {
 												href="/messages"
 												className="flex items-center gap-2 rounded-lg px-2 py-1 text-xs transition-colors hover:bg-white/10"
 											>
-												<Image
-													src={avatarImageUrl(u.look, {
-														headOnly: true,
-														direction: 2,
-														size: "s",
-													})}
+												<UserAvatarThumbnail
+													figure={u.look}
 													alt=""
-													width={20}
-													height={24}
-													unoptimized
+													options={{ direction: 2 }}
 												/>
 												<span style={{ color: textColor }}>{u.username}</span>
 											</Link>