diff --git a/apps/web/src/components/__tests__/turn-navigation.test.tsx b/apps/web/src/components/__tests__/turn-navigation.test.tsx
index 92871bf..f051f41 100644
--- a/apps/web/src/components/__tests__/turn-navigation.test.tsx
+++ b/apps/web/src/components/__tests__/turn-navigation.test.tsx
@@ -54,11 +54,11 @@ describe("TurnNavigation", () => {
 			expect(container.textContent).not.toContain("—");
 		});
 
-		it("round badge and combatant name are in separate DOM elements", () => {
+		it("round badge and combatant name are siblings in the center area", () => {
 			renderNav();
 			const badge = screen.getByText("R1");
 			const name = screen.getByText("Goblin");
-			expect(badge.parentElement).not.toBe(name.parentElement);
+			expect(badge.parentElement).toBe(name.parentElement);
 		});
 
 		it("updates the round badge when round changes", () => {
diff --git a/apps/web/src/components/action-bar.tsx b/apps/web/src/components/action-bar.tsx
index 5fafa1f..1b2cdd8 100644
--- a/apps/web/src/components/action-bar.tsx
+++ b/apps/web/src/components/action-bar.tsx
@@ -437,83 +437,93 @@ export function ActionBar({
 				<Button type="submit" size="sm">
 					Add
 				</Button>
-				{onManagePlayers && (
-					<Button
-						type="button"
-						size="sm"
-						variant="ghost"
-						onClick={onManagePlayers}
-						title="Player characters"
-					>
-						<Users className="h-4 w-4" />
-					</Button>
-				)}
-				{bestiaryLoaded && onViewStatBlock && (
-					<div ref={viewerRef} className="relative">
+				<div className="flex items-center gap-0">
+					{onManagePlayers && (
 						<Button
 							type="button"
-							size="sm"
+							size="icon"
 							variant="ghost"
-							onClick={() => (viewerOpen ? closeViewer() : openViewer())}
+							className="text-muted-foreground hover:text-hover-neutral"
+							onClick={onManagePlayers}
+							title="Player characters"
+							aria-label="Player characters"
 						>
-							<Eye className="h-4 w-4" />
+							<Users className="h-5 w-5" />
 						</Button>
-						{viewerOpen && (
-							<div className="absolute bottom-full right-0 z-50 mb-1 w-64 rounded-md border border-border bg-card shadow-lg">
-								<div className="p-2">
-									<Input
-										ref={viewerInputRef}
-										type="text"
-										value={viewerQuery}
-										onChange={(e) => handleViewerQueryChange(e.target.value)}
-										onKeyDown={handleViewerKeyDown}
-										placeholder="Search stat blocks..."
-										className="w-full"
-									/>
-								</div>
-								{viewerResults.length > 0 && (
-									<ul className="max-h-48 overflow-y-auto border-t border-border py-1">
-										{viewerResults.map((result, i) => (
-											<li key={creatureKey(result)}>
-												<button
-													type="button"
-													className={`flex w-full items-center justify-between px-3 py-1.5 text-left text-sm ${
-														i === viewerIndex
-															? "bg-accent/20 text-foreground"
-															: "text-foreground hover:bg-hover-neutral-bg"
-													}`}
-													onClick={() => handleViewerSelect(result)}
-													onMouseEnter={() => setViewerIndex(i)}
-												>
-													<span>{result.name}</span>
-													<span className="text-xs text-muted-foreground">
-														{result.sourceDisplayName}
-													</span>
-												</button>
-											</li>
-										))}
-									</ul>
-								)}
-								{viewerQuery.length >= 2 && viewerResults.length === 0 && (
-									<div className="border-t border-border px-3 py-2 text-sm text-muted-foreground">
-										No creatures found
+					)}
+					{bestiaryLoaded && onViewStatBlock && (
+						<div ref={viewerRef} className="relative">
+							<Button
+								type="button"
+								size="icon"
+								variant="ghost"
+								className="text-muted-foreground hover:text-hover-neutral"
+								onClick={() => (viewerOpen ? closeViewer() : openViewer())}
+								title="Browse stat blocks"
+								aria-label="Browse stat blocks"
+							>
+								<Eye className="h-5 w-5" />
+							</Button>
+							{viewerOpen && (
+								<div className="absolute bottom-full right-0 z-50 mb-1 w-64 rounded-md border border-border bg-card shadow-lg">
+									<div className="p-2">
+										<Input
+											ref={viewerInputRef}
+											type="text"
+											value={viewerQuery}
+											onChange={(e) => handleViewerQueryChange(e.target.value)}
+											onKeyDown={handleViewerKeyDown}
+											placeholder="Search stat blocks..."
+											className="w-full"
+										/>
 									</div>
-								)}
-							</div>
-						)}
-					</div>
-				)}
-				{bestiaryLoaded && onBulkImport && (
-					<Button
-						type="button"
-						size="sm"
-						variant="ghost"
-						onClick={onBulkImport}
-						disabled={bulkImportDisabled}
-					>
-						<Import className="h-4 w-4" />
-					</Button>
-				)}
+									{viewerResults.length > 0 && (
+										<ul className="max-h-48 overflow-y-auto border-t border-border py-1">
+											{viewerResults.map((result, i) => (
+												<li key={creatureKey(result)}>
+													<button
+														type="button"
+														className={`flex w-full items-center justify-between px-3 py-1.5 text-left text-sm ${
+															i === viewerIndex
+																? "bg-accent/20 text-foreground"
+																: "text-foreground hover:bg-hover-neutral-bg"
+														}`}
+														onClick={() => handleViewerSelect(result)}
+														onMouseEnter={() => setViewerIndex(i)}
+													>
+														<span>{result.name}</span>
+														<span className="text-xs text-muted-foreground">
+															{result.sourceDisplayName}
+														</span>
+													</button>
+												</li>
+											))}
+										</ul>
+									)}
+									{viewerQuery.length >= 2 && viewerResults.length === 0 && (
+										<div className="border-t border-border px-3 py-2 text-sm text-muted-foreground">
+											No creatures found
+										</div>
+									)}
+								</div>
+							)}
+						</div>
+					)}
+					{bestiaryLoaded && onBulkImport && (
+						<Button
+							type="button"
+							size="icon"
+							variant="ghost"
+							className="text-muted-foreground hover:text-hover-neutral"
+							onClick={onBulkImport}
+							disabled={bulkImportDisabled}
+							title="Bulk import"
+							aria-label="Bulk import"
+						>
+							<Import className="h-5 w-5" />
+						</Button>
+					)}
+				</div>
 			</form>
 		</div>
 	);
diff --git a/apps/web/src/components/create-player-modal.tsx b/apps/web/src/components/create-player-modal.tsx
index 349d442..77769d3 100644
--- a/apps/web/src/components/create-player-modal.tsx
+++ b/apps/web/src/components/create-player-modal.tsx
@@ -77,8 +77,16 @@ export function CreatePlayerModal({
 	};
 
 	return (
-		<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
-			<div className="w-full max-w-md rounded-lg border border-border bg-card p-6 shadow-xl">
+		// biome-ignore lint/a11y/noStaticElementInteractions: backdrop click to close
+		<div
+			className="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
+			onMouseDown={onClose}
+		>
+			{/* biome-ignore lint/a11y/noStaticElementInteractions: prevent close when clicking modal content */}
+			<div
+				className="w-full max-w-md rounded-lg border border-border bg-card p-6 shadow-xl"
+				onMouseDown={(e) => e.stopPropagation()}
+			>
 				<div className="mb-4 flex items-center justify-between">
 					<h2 className="text-lg font-semibold text-foreground">
 						{isEdit ? "Edit Player" : "Create Player"}
diff --git a/apps/web/src/components/player-management.tsx b/apps/web/src/components/player-management.tsx
index ee59471..3c72701 100644
--- a/apps/web/src/components/player-management.tsx
+++ b/apps/web/src/components/player-management.tsx
@@ -28,8 +28,16 @@ export function PlayerManagement({
 	if (!open) return null;
 
 	return (
-		<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
-			<div className="w-full max-w-md rounded-lg border border-border bg-card p-6 shadow-xl">
+		// biome-ignore lint/a11y/noStaticElementInteractions: backdrop click to close
+		<div
+			className="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
+			onMouseDown={onClose}
+		>
+			{/* biome-ignore lint/a11y/noStaticElementInteractions: prevent close when clicking modal content */}
+			<div
+				className="w-full max-w-md rounded-lg border border-border bg-card p-6 shadow-xl"
+				onMouseDown={(e) => e.stopPropagation()}
+			>
 				<div className="mb-4 flex items-center justify-between">
 					<h2 className="text-lg font-semibold text-foreground">
 						Player Characters
diff --git a/apps/web/src/components/turn-navigation.tsx b/apps/web/src/components/turn-navigation.tsx
index 957b337..3c404ca 100644
--- a/apps/web/src/components/turn-navigation.tsx
+++ b/apps/web/src/components/turn-navigation.tsx
@@ -1,5 +1,5 @@
 import type { Encounter } from "@initiative/domain";
-import { Settings, StepBack, StepForward, Trash2 } from "lucide-react";
+import { Library, StepBack, StepForward, Trash2 } from "lucide-react";
 import { D20Icon } from "./d20-icon";
 import { Button } from "./ui/button";
 import { ConfirmButton } from "./ui/confirm-button";
@@ -27,28 +27,22 @@ export function TurnNavigation({
 
 	return (
 		<div className="flex items-center gap-3 rounded-md border border-border bg-card px-4 py-3">
-			<div className="flex flex-shrink-0 items-center gap-3">
-				<Button
-					variant="outline"
-					size="icon"
-					className="h-8 w-8 text-foreground border-foreground hover:text-hover-action hover:border-hover-action hover:bg-transparent"
-					onClick={onRetreatTurn}
-					disabled={!hasCombatants || isAtStart}
-					title="Previous turn"
-					aria-label="Previous turn"
-				>
-					<StepBack className="h-5 w-5" />
-				</Button>
-				<span className="rounded-full bg-muted text-foreground text-sm px-2 py-0.5 font-semibold">
+			<Button
+				size="icon"
+				onClick={onRetreatTurn}
+				disabled={!hasCombatants || isAtStart}
+				title="Previous turn"
+				aria-label="Previous turn"
+			>
+				<StepBack className="h-5 w-5" />
+			</Button>
+
+			<div className="min-w-0 flex-1 flex items-center justify-center gap-2 text-sm">
+				<span className="rounded-full bg-muted text-foreground text-sm px-2 py-0.5 font-semibold shrink-0">
 					R{encounter.roundNumber}
 				</span>
-			</div>
-
-			<div className="min-w-0 flex-1 text-center text-sm">
 				{activeCombatant ? (
-					<span className="truncate block font-medium">
-						{activeCombatant.name}
-					</span>
+					<span className="truncate font-medium">{activeCombatant.name}</span>
 				) : (
 					<span className="text-muted-foreground">No combatants</span>
 				)}
@@ -59,7 +53,7 @@ export function TurnNavigation({
 					<Button
 						variant="ghost"
 						size="icon"
-						className="h-8 w-8 text-muted-foreground hover:text-hover-action"
+						className="text-muted-foreground hover:text-hover-action"
 						onClick={onRollAllInitiative}
 						title="Roll all initiative"
 						aria-label="Roll all initiative"
@@ -69,25 +63,23 @@ export function TurnNavigation({
 					<Button
 						variant="ghost"
 						size="icon"
-						className="h-8 w-8 text-muted-foreground hover:text-hover-neutral"
+						className="text-muted-foreground hover:text-hover-neutral"
 						onClick={onOpenSourceManager}
 						title="Manage cached sources"
 						aria-label="Manage cached sources"
 					>
-						<Settings className="h-5 w-5" />
+						<Library className="h-5 w-5" />
 					</Button>
 					<ConfirmButton
 						icon={<Trash2 className="h-5 w-5" />}
 						label="Clear encounter"
 						onConfirm={onClearEncounter}
 						disabled={!hasCombatants}
-						className="h-8 w-8 text-muted-foreground"
+						className="text-muted-foreground"
 					/>
 				</div>
 				<Button
-					variant="outline"
 					size="icon"
-					className="h-8 w-8 text-foreground border-foreground hover:text-hover-action hover:border-hover-action hover:bg-transparent"
 					onClick={onAdvanceTurn}
 					disabled={!hasCombatants}
 					title="Next turn"