diff --git a/web/src/lib/components/ui/Textarea.svelte b/web/src/lib/components/ui/Textarea.svelte
index 4022d9d3..26f797cf 100644
--- a/web/src/lib/components/ui/Textarea.svelte
+++ b/web/src/lib/components/ui/Textarea.svelte
@@ -3,9 +3,9 @@
 
 	export const textareaField = tv({
 		slots: {
-			root: "relative flex max-h-64 items-start gap-1 rounded border bg-background-default px-2.5 py-2 transition-colors",
+			root: "relative flex min-h-64 items-start gap-1 rounded border bg-background-default transition-colors",
 			textarea:
-				"min-h-24 flex-1 bg-transparent text-sm leading-6 outline-none placeholder:text-foreground-placeholder read-only:resize-none disabled:cursor-not-allowed disabled:resize-none"
+				"min-h-24 flex-1 self-stretch bg-transparent py-2 text-sm leading-6 outline-none placeholder:text-foreground-placeholder read-only:resize-none disabled:cursor-not-allowed disabled:resize-none"
 		},
 		variants: {
 			error: {
@@ -77,12 +77,24 @@
 	}: Props = $props();
 
 	const { root, textarea } = $derived(textareaField({ error, disabled, readonly, resizeable }));
+
+	// The root no longer carries the text inset (so the scrollbar/resize handle can sit flush
+	// against the border) — the textarea itself owns its horizontal padding, collapsing to 0 on
+	// whichever side an icon (or the loading spinner) already provides the inset instead.
+	const textareaPadding = $derived(
+		[iconLeft ? "" : "pl-2.5", loading ? "pr-[1.875rem]" : iconRight ? "" : "pr-2.5"]
+			.filter(Boolean)
+			.join(" ")
+	);
 </script>
 
 <div class={root({ class: className })}>
 	{#if iconLeft}
 		{@const IconLeft = iconLeft}
-		<IconLeft class="mt-0.5 mr-1 size-4 shrink-0 text-foreground-subtle" aria-hidden="true" />
+		<IconLeft
+			class="mt-2.5 mr-1 ml-2.5 size-4 shrink-0 text-foreground-subtle"
+			aria-hidden="true"
+		/>
 	{/if}
 	<textarea
 		bind:this={element}
@@ -91,12 +103,15 @@
 		{readonly}
 		aria-invalid={error}
 		aria-busy={loading}
-		class={textarea({ class: loading ? "pr-5" : undefined })}
+		class={textarea({ class: textareaPadding })}
 		{...rest}></textarea>
 	{#if loading}
 		<Spinner class="absolute top-2 right-2.5 size-4" />
 	{:else if iconRight}
 		{@const IconRight = iconRight}
-		<IconRight class="mt-0.5 ml-1 size-4 shrink-0 text-foreground-subtle" aria-hidden="true" />
+		<IconRight
+			class="mt-2.5 mr-2.5 ml-1 size-4 shrink-0 text-foreground-subtle"
+			aria-hidden="true"
+		/>
 	{/if}
 </div>