diff --git a/app/components/Avatar.module.css b/app/components/Avatar.module.css
index 9f13fa552..3c3d66b2b 100644
--- a/app/components/Avatar.module.css
+++ b/app/components/Avatar.module.css
@@ -8,10 +8,17 @@
 }
 
 .avatarWrapper {
+	display: inline-flex;
 	flex-shrink: 0;
 	width: fit-content;
 	height: fit-content;
 	background-color: var(--color-bg-higher);
+	border-radius: 50%;
 	overflow: hidden;
+	line-height: 0;
+}
+
+.avatarWrapper img {
+	display: block;
 	border-radius: 50%;
 }
diff --git a/app/components/Avatar.tsx b/app/components/Avatar.tsx
index f93f53039..3d015e0c3 100644
--- a/app/components/Avatar.tsx
+++ b/app/components/Avatar.tsx
@@ -18,13 +18,15 @@ const dimensions = {
 export function Avatar({
 	user,
 	url,
+	identiconInput,
 	size = "sm",
 	className,
 	alt = "",
 	...rest
 }: {
 	user?: Pick<Tables["User"], "discordId" | "discordAvatar">;
-	url?: string;
+	url?: string | null;
+	identiconInput?: string;
 	className?: string;
 	alt?: string;
 	size: keyof typeof dimensions;
@@ -111,7 +113,14 @@ export function Avatar({
 		return canvas.toDataURL();
 	}
 
-	const isIdenticon = !url && (!user?.discordAvatar || isErrored);
+	const isIdenticon =
+		!url && (!user?.discordAvatar || isErrored || identiconInput);
+
+	const identiconSource = () => {
+		if (identiconInput) return identiconInput;
+		if (user) return user.discordId;
+		return "unknown";
+	};
 
 	const src = url
 		? url
@@ -122,17 +131,13 @@ export function Avatar({
 					size: size === "lg" ? "lg" : "sm",
 				})
 			: isClient
-				? generateIdenticon(
-						user ? user.discordId : "unknown",
-						dimensions[size],
-						7,
-					)
+				? generateIdenticon(identiconSource(), dimensions[size], 7)
 				: BLANK_IMAGE_URL;
 
 	return (
-		<div className={styles.avatarWrapper}>
+		<div className={clsx(styles.avatarWrapper, className)}>
 			<img
-				className={clsx(className, {
+				className={clsx({
 					[styles.identicon]: isIdenticon,
 					[styles.loaded]: loaded,
 				})}
diff --git a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Avatar-chromium-darwin.png b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Avatar-chromium-darwin.png
index 2c987f474..ff451c2d9 100644
Binary files a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Avatar-chromium-darwin.png and b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Avatar-chromium-darwin.png differ
diff --git a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Components-Showcase-visual-regression-Avatar-section-1.png b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Components-Showcase-visual-regression-Avatar-section-1.png
new file mode 100644
index 000000000..28d874aba
Binary files /dev/null and b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Components-Showcase-visual-regression-Avatar-section-1.png differ
diff --git a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Components-Showcase-visual-regression-Miscellaneous-section-1.png b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Components-Showcase-visual-regression-Miscellaneous-section-1.png
new file mode 100644
index 000000000..730bafaee
Binary files /dev/null and b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Components-Showcase-visual-regression-Miscellaneous-section-1.png differ
diff --git a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Flags-chromium-darwin.png b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Flags-chromium-darwin.png
index fa310d4f8..cfe15c48d 100644
Binary files a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Flags-chromium-darwin.png and b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Flags-chromium-darwin.png differ
diff --git a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Miscellaneous-chromium-darwin.png b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Miscellaneous-chromium-darwin.png
index f3900d57a..8c0f967fb 100644
Binary files a/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Miscellaneous-chromium-darwin.png and b/app/features/components-showcase/__screenshots__/ComponentsShowcase.browser.test.tsx/Miscellaneous-chromium-darwin.png differ
diff --git a/app/features/tournament-bracket/components/Bracket/Match.tsx b/app/features/tournament-bracket/components/Bracket/Match.tsx
index a72dc960b..682d01a33 100644
--- a/app/features/tournament-bracket/components/Bracket/Match.tsx
+++ b/app/features/tournament-bracket/components/Bracket/Match.tsx
@@ -229,8 +229,8 @@ function MatchRow({
 
 	const ownTeam = tournament.teamMemberOfByUser(user);
 
-	const logoSrc =
-		!simulated && team ? tournament.tournamentTeamLogoSrc(team) : null;
+	const logoSrc = team ? tournament.tournamentTeamLogoSrc(team) : null;
+	const showAvatar = !simulated && team;
 
 	const isBigSeedNumber = team?.seed && team.seed > 99;
 
@@ -248,7 +248,14 @@ function MatchRow({
 			>
 				{team?.seed}
 			</div>
-			{logoSrc ? <Avatar size="xxxs" url={logoSrc} className="mr-1" /> : null}
+			{showAvatar ? (
+				<Avatar
+					size="xxxs"
+					url={logoSrc}
+					identiconInput={team.name}
+					className="mr-1"
+				/>
+			) : null}
 			<div
 				className={clsx(styles.matchTeamName, {
 					"text-theme-secondary":
@@ -256,9 +263,9 @@ function MatchRow({
 					"text-lighter italic opaque": simulated,
 					[styles.matchTeamNameNarrow]:
 						// either but not both
-						(logoSrc || isBigSeedNumber) && !(logoSrc && isBigSeedNumber),
+						(showAvatar || isBigSeedNumber) && !(showAvatar && isBigSeedNumber),
 					// both
-					[styles.matchTeamNameNarrowest]: logoSrc && isBigSeedNumber,
+					[styles.matchTeamNameNarrowest]: showAvatar && isBigSeedNumber,
 					invisible: !team,
 				})}
 			>
diff --git a/app/features/tournament-bracket/components/MatchRosters.tsx b/app/features/tournament-bracket/components/MatchRosters.tsx
index 50a732d83..ca3c887a8 100644
--- a/app/features/tournament-bracket/components/MatchRosters.tsx
+++ b/app/features/tournament-bracket/components/MatchRosters.tsx
@@ -47,7 +47,7 @@ export function MatchRosters({
 				<h2
 					className={clsx("text-sm", {
 						"text-lighter": !teamOne,
-						[styles.rostersSpacedHeader]: teamOneLogoSrc || teamTwoLogoSrc,
+						[styles.rostersSpacedHeader]: teamOne || teamTwo,
 					})}
 				>
 					{teamOne ? (
@@ -58,9 +58,11 @@ export function MatchRosters({
 							})}
 							className="text-main-forced font-bold stack horizontal xs items-center"
 						>
-							{teamOneLogoSrc ? (
-								<Avatar url={teamOneLogoSrc} size="sm" />
-							) : null}
+							<Avatar
+								url={teamOneLogoSrc}
+								identiconInput={teamOne.name}
+								size="sm"
+							/>
 							{teamOne.name}
 						</Link>
 					) : (
@@ -105,7 +107,7 @@ export function MatchRosters({
 				<h2
 					className={clsx("text-sm", {
 						"text-lighter": !teamTwo,
-						[styles.rostersSpacedHeader]: teamOneLogoSrc || teamTwoLogoSrc,
+						[styles.rostersSpacedHeader]: teamOne || teamTwo,
 					})}
 				>
 					{teamTwo ? (
@@ -116,9 +118,11 @@ export function MatchRosters({
 							})}
 							className="text-main-forced font-bold stack horizontal xs items-center"
 						>
-							{teamTwoLogoSrc ? (
-								<Avatar url={teamTwoLogoSrc} size="sm" />
-							) : null}
+							<Avatar
+								url={teamTwoLogoSrc}
+								identiconInput={teamTwo.name}
+								size="sm"
+							/>
 							{teamTwo.name}
 						</Link>
 					) : (
diff --git a/app/features/tournament/components/TeamWithRoster.tsx b/app/features/tournament/components/TeamWithRoster.tsx
index 760905c51..f94712ea5 100644
--- a/app/features/tournament/components/TeamWithRoster.tsx
+++ b/app/features/tournament/components/TeamWithRoster.tsx
@@ -35,7 +35,7 @@ export function TeamWithRoster({
 			<div className={styles.teamWithRoster}>
 				<div className={styles.teamWithRosterName}>
 					<div className="stack horizontal sm justify-end items-end">
-						{teamLogoSrc ? <Avatar size="xxs" url={teamLogoSrc} /> : null}
+						<Avatar size="xxs" url={teamLogoSrc} identiconInput={team.name} />
 						{seed ? (
 							<div className={styles.teamWithRosterSeed}>#{seed}</div>
 						) : null}
diff --git a/app/features/tournament/routes/to.$id.results.tsx b/app/features/tournament/routes/to.$id.results.tsx
index bb56ce235..9386aafe3 100644
--- a/app/features/tournament/routes/to.$id.results.tsx
+++ b/app/features/tournament/routes/to.$id.results.tsx
@@ -139,7 +139,11 @@ function ResultsTable({ standings }: { standings: Standing[] }) {
 									className={styles.standingsTeamName}
 									data-testid="result-team-name"
 								>
-									{teamLogoSrc ? <Avatar size="xs" url={teamLogoSrc} /> : null}{" "}
+									<Avatar
+										size="xs"
+										url={teamLogoSrc}
+										identiconInput={standing.team.name}
+									/>{" "}
 									{standing.team.name}
 								</Link>
 							</td>
diff --git a/app/features/tournament/routes/to.$id.seeds.tsx b/app/features/tournament/routes/to.$id.seeds.tsx
index 5e89059aa..e2cc105ee 100644
--- a/app/features/tournament/routes/to.$id.seeds.tsx
+++ b/app/features/tournament/routes/to.$id.seeds.tsx
@@ -381,7 +381,9 @@ function RowContents({
 	return (
 		<>
 			<div>{seed}</div>
-			<div>{logoUrl ? <Avatar url={logoUrl} size="xxs" /> : null}</div>
+			<div>
+				<Avatar url={logoUrl} identiconInput={team.name} size="xxs" />
+			</div>
 			<div className={styles.seedsTeamName}>
 				{team.checkIns.length > 0 ? "✅ " : "❌ "} {team.name}
 			</div>