diff --git a/web/src/app.css b/web/src/app.css
index d8235634f..7bf8583e6 100644
--- a/web/src/app.css
+++ b/web/src/app.css
@@ -164,17 +164,17 @@ html {
 	--color-lime-900: oklch(40.5% 0.121 140.063);
 	--color-lime-950: oklch(27.4% 0.09 141.109);
 
-	--color-green-50: oklch(98.2% 0.082 171.826);
-	--color-green-100: oklch(96.2% 0.168 172.743);
-	--color-green-200: oklch(92.5% 0.296 171.995);
-	--color-green-300: oklch(87.1% 0.376 170.449);
-	--color-green-400: oklch(79.2% 0.398 167.711);
-	--color-green-500: oklch(72.3% 0.399 165.579);
-	--color-green-600: oklch(62.7% 0.394 165.214);
-	--color-green-700: oklch(52.7% 0.371 166.069);
-	--color-green-800: oklch(44.8% 0.347 167.328);
-	--color-green-900: oklch(39.3% 0.316 168.535);
-	--color-green-950: oklch(26.6% 0.254 168.934);
+	--color-green-50: oklch(98.2% 0.03 155.826);
+	--color-green-100: oklch(96.2% 0.065 156.743);
+	--color-green-200: oklch(92.5% 0.137 155.995);
+	--color-green-300: oklch(87.1% 0.263 154.449);
+	--color-green-400: oklch(79.2% 0.291 151.711);
+	--color-green-500: oklch(72.3% 0.28 149.579);
+	--color-green-600: oklch(62.7% 0.245 149.214);
+	--color-green-700: oklch(52.7% 0.202 150.069);
+	--color-green-800: oklch(44.8% 0.166 151.328);
+	--color-green-900: oklch(39.3% 0.142 152.535);
+	--color-green-950: oklch(26.6% 0.095 152.934);
 
 	--color-emerald-50: oklch(97.9% 0.022 166.113);
 	--color-emerald-100: oklch(95% 0.055 163.051);
diff --git a/web/src/lib/components/repo/DiffCodeView.svelte b/web/src/lib/components/repo/DiffCodeView.svelte
index d7b6600b1..2c8970364 100644
--- a/web/src/lib/components/repo/DiffCodeView.svelte
+++ b/web/src/lib/components/repo/DiffCodeView.svelte
@@ -58,7 +58,8 @@
 		onScrollExtent
 	}: Props = $props();
 
-	const HEADER_HEIGHT = 43;
+	const HEADER_HEIGHT = 38;
+	const DIFF_BOTTOM_BORDER = 1;
 	const LOOKAHEAD_ITEMS = 8;
 
 	let root: HTMLElement | undefined = $state();
@@ -110,7 +111,11 @@
 		disableFileHeader: false,
 		// Presence of renderCustomHeader activates custom-header slot in Pierre's renderer.
 		renderCustomHeader: () => undefined,
-		itemMetrics: { ...PIERRE_ITEM_METRICS, diffHeaderHeight: HEADER_HEIGHT },
+		itemMetrics: {
+			...PIERRE_ITEM_METRICS,
+			diffHeaderHeight: HEADER_HEIGHT,
+			paddingBottom: DIFF_BOTTOM_BORDER
+		},
 		stickyHeaders: true,
 		__devOnlyValidateItemHeights: PIERRE_VALIDATE_ITEM_HEIGHTS,
 		layout: { paddingTop: 0, paddingBottom: 8, gap: 8 }
diff --git a/web/src/lib/components/repo/DiffView.svelte b/web/src/lib/components/repo/DiffView.svelte
index df69fa183..2f94c8f4a 100644
--- a/web/src/lib/components/repo/DiffView.svelte
+++ b/web/src/lib/components/repo/DiffView.svelte
@@ -245,13 +245,17 @@
 						{/if}
 					</div>
 					<div class="flex items-center gap-xs">
-						<Toggle
-							bind:checked={wrap}
+						<Button
+							icon={allOpen ? FoldVertical : UnfoldVertical}
+							title={allOpen ? "Collapse lines" : "Expand lines"}
+							onclick={() => setAllOpen(!allOpen)}
+							variant="ghost"
 							size="small"
-							class="px-xs text-foreground-muted"
 						>
-							Wrap
-						</Toggle>
+							<span class="hidden @min-[42rem]/toolbar:inline"
+								>{allOpen ? "Collapse" : "Expand"}</span
+							>
+						</Button>
 						{#if downloadUrls}
 							<Dropdown
 								variant="button"
@@ -282,17 +286,13 @@
 								>
 							</Dropdown>
 						{/if}
-						<Button
-							icon={allOpen ? FoldVertical : UnfoldVertical}
-							title={allOpen ? "Collapse lines" : "Expand lines"}
-							onclick={() => setAllOpen(!allOpen)}
-							variant="ghost"
+						<Toggle
+							bind:checked={wrap}
 							size="small"
+							class="px-xs text-foreground-muted"
 						>
-							<span class="hidden @min-[42rem]/toolbar:inline"
-								>{allOpen ? "Collapse" : "Expand"}</span
-							>
-						</Button>
+							Wrap
+						</Toggle>
 						<ButtonGroup>
 							{#each ["unified", "split"] as const as style (style)}
 								<Button
diff --git a/web/src/lib/components/repo/pierre.ts b/web/src/lib/components/repo/pierre.ts
index a45f831e0..a70c9d5fb 100644
--- a/web/src/lib/components/repo/pierre.ts
+++ b/web/src/lib/components/repo/pierre.ts
@@ -115,7 +115,7 @@ if (browser) void getSharedHighlighter({ themes: [SYNTAX_THEME_NAME], langs: []
 export const PIERRE_VALIDATE_ITEM_HEIGHTS =
 	import.meta.env.DEV && browser && new URLSearchParams(location.search).has("diffmetrics");
 
-export const PIERRE_LINE_HEIGHT = 21;
+export const PIERRE_LINE_HEIGHT = 20;
 export const PIERRE_HUNK_LINE_COUNT = 50;
 
 export const PIERRE_ITEM_METRICS: Partial<VirtualFileMetrics> = {