diff --git a/web/src/lib/components/repo/CommitLogView.svelte b/web/src/lib/components/repo/CommitLogView.svelte
index 710d3b55b..95e1c9cb7 100644
--- a/web/src/lib/components/repo/CommitLogView.svelte
+++ b/web/src/lib/components/repo/CommitLogView.svelte
@@ -2,7 +2,6 @@
 	import { resolve } from "$app/paths";
 	import Ellipsis from "$icon/ellipsis";
 	import FolderCode from "$icon/folder-code";
-	import Avatar from "$lib/components/ui/Avatar.svelte";
 	import CopyButton from "$lib/components/ui/CopyButton.svelte";
 	import Pagination from "$lib/components/ui/Pagination.svelte";
 	import Pending from "$lib/components/ui/Pending.svelte";
@@ -45,15 +44,16 @@
 {#snippet authorCell(commit: CommitSummary)}
 	<span class="flex items-center gap-1">
 		{#if commit.authorHandle}
-			<User did={commit.authorDid} handle={commit.authorHandle} size="small" link />
+			<User did={commit.authorDid} handle={commit.authorHandle} link />
 		{:else if commit.authorName && commit.authorEmail && !commit.authorDid}
-			<Avatar size="large" />
-			<a href="mailto:{commit.authorEmail}" class="no-underline hover:underline">
-				{commit.authorName}
+			<a
+				href="mailto:{commit.authorEmail}"
+				class="inline-flex items-center text-inherit hover:underline"
+			>
+				<User handle={commit.authorName} />
 			</a>
 		{:else}
-			<Avatar size="large" />
-			<span>{commit.authorName}</span>
+			<User did={commit.authorDid} handle={commit.authorName} />
 		{/if}
 	</span>
 {/snippet}
diff --git a/web/src/lib/components/repo/FileHistoryView.svelte b/web/src/lib/components/repo/FileHistoryView.svelte
index de03fc0e7..4c6266aeb 100644
--- a/web/src/lib/components/repo/FileHistoryView.svelte
+++ b/web/src/lib/components/repo/FileHistoryView.svelte
@@ -3,7 +3,6 @@
 	import Ellipsis from "$icon/ellipsis";
 	import FolderCode from "$icon/folder-code";
 	import History from "$icon/history";
-	import Avatar from "$lib/components/ui/Avatar.svelte";
 	import Button from "$lib/components/ui/Button.svelte";
 	import CopyButton from "$lib/components/ui/CopyButton.svelte";
 	import Pagination from "$lib/components/ui/Pagination.svelte";
@@ -57,15 +56,16 @@
 {#snippet author(commit: CommitSummary)}
 	<span class="flex min-w-0 items-center gap-1">
 		{#if commit.authorHandle}
-			<User did={commit.authorDid} handle={commit.authorHandle} size="small" link />
+			<User did={commit.authorDid} handle={commit.authorHandle} class="min-w-0" link />
 		{:else if commit.authorName && commit.authorEmail && !commit.authorDid}
-			<Avatar size="large" />
-			<a href="mailto:{commit.authorEmail}" class="truncate no-underline hover:underline">
-				{commit.authorName}
+			<a
+				href="mailto:{commit.authorEmail}"
+				class="inline-flex min-w-0 items-center text-inherit hover:underline"
+			>
+				<User handle={commit.authorName} class="min-w-0" />
 			</a>
 		{:else}
-			<Avatar size="large" />
-			<span class="truncate">{commit.authorName}</span>
+			<User did={commit.authorDid} handle={commit.authorName} class="min-w-0" />
 		{/if}
 	</span>
 {/snippet}