diff --git a/src/lib/assets/icon.svg b/src/lib/assets/icon.svg
index fbc58c6..4936657 100644
--- a/src/lib/assets/icon.svg
+++ b/src/lib/assets/icon.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-<g transform="translate(0,512) scale(0.01,-0.01)" fill="#FF6B35" stroke="none">
+<g transform="translate(0,512) scale(0.01,-0.01)" fill="currentColor" stroke="none">
 <path d="M28100 51040 c-1050 -220 -1860 -680 -2710 -1530 -840 -840 -1280 -1610 -1540 -2720 -440 -1890 140 -3880 1550 -5290 1110 -1110 2330 -1600 4000 -1600 1610 0 2790 500 3960 1660 1730 1710 2140 4270 1070 6520 -350 740 -1690 2100 -2410 2460 -1200 610 -2610 790 -3920 500z"/>
 <path d="M22910 39350 c-1430 -400 -2850 -1590 -3580 -3010 -670 -1300 -1580 -4350 -1970 -6660 -500 -2890 -360 -7860 280 -9690 680 -1970 1960 -3000 4090 -3280 470 -70 2980 -110 6280 -110 3020 0 5490 -30 5490 -70 0 -570 1350 -12920 1450 -13290 410 -1470 2100 -2480 3580 -2150 810 180 1550 670 1990 1310 710 1020 710 660 -210 9650 -590 5700 -880 8200 -1020 8690 -170 590 -290 780 -770 1260 -980 970 -720 940 -6960 980l-5390 30 70 1120c40 620 130 1590 200 2170 100 790 110 1090 20 1220 -60 90 -1180 1430 -2490 2970 -1300 1540 -2470 2970 -2600 3180 -180 310 -220 530 -220 1190 0 720 30 860 300 1290 430 690 1070 1060 1960 1130 830 60 1370 -120 1890 -610 190 -190 1500 -1700 2890 -3360 1400 -1660 2590 -3000 2650 -2970 60 20 1800 750 3860 1610 2060 860 3940 1590 4170 1620 230 30 550 10 710 -50 270 -90 330 -70 600 210 160 180 350 430 420 570 180 340 170 1290 -20 1650 -480 910 -1560 1360 -2480 1030 -180 -60 -1050 -650 -1930 -1300 -880 -660 -2280 -1710 -3130 -2330l-1530 -1140 -2480 3350c-2370 3200 -2500 3360 -3030 3620 -470 230 -700 270 -1550 290 -660 20 -1180 -20 -1540 -120z"/>
 <path d="M23300 36810 c-1020 -210 -1700 -1020 -1700 -2010 0 -620 200 -980 1170 -2110 490 -570 1990 -2340 3330 -3940 1340 -1590 2510 -2960 2590 -3030 370 -290 740 -430 1240 -440 460 -10 1030 200 5320 1980 3260 1350 4910 2090 5140 2290 420 370 710 970 710 1500 0 1160 -1190 2200 -2290 2000 -200 -40 -2130 -810 -4300 -1710 -2170 -910 -3950 -1630 -3960 -1620 -170 260 -5030 5980 -5390 6360 -370 390 -640 570 -1000 670 -270 80 -500 140 -500 140 -10 -10 -170 -40 -360 -80z"/>
diff --git a/src/lib/components/ActionSidebar.svelte b/src/lib/components/ActionSidebar.svelte
index 97be29a..0db02fe 100644
--- a/src/lib/components/ActionSidebar.svelte
+++ b/src/lib/components/ActionSidebar.svelte
@@ -167,7 +167,7 @@
 	.action-sidebar {
 		position: absolute;
 		right: var(--space-lg);
-		bottom: calc(148px + env(safe-area-inset-bottom));
+		bottom: calc(var(--bottom-nav-height, 64px) + 68px);
 		display: flex;
 		flex-direction: column;
 		align-items: center;
diff --git a/src/lib/components/MusicDisc.svelte b/src/lib/components/MusicDisc.svelte
index 1dc5591..75cccac 100644
--- a/src/lib/components/MusicDisc.svelte
+++ b/src/lib/components/MusicDisc.svelte
@@ -84,7 +84,7 @@
 	.music-disc-area {
 		position: absolute;
 		right: var(--space-lg);
-		bottom: calc(90px + env(safe-area-inset-bottom));
+		bottom: calc(var(--bottom-nav-height, 64px) + 10px);
 		display: flex;
 		align-items: center;
 		gap: var(--space-sm);
diff --git a/src/lib/components/ProgressBar.svelte b/src/lib/components/ProgressBar.svelte
index 54298e9..4bec6b4 100644
--- a/src/lib/components/ProgressBar.svelte
+++ b/src/lib/components/ProgressBar.svelte
@@ -108,7 +108,7 @@
 <style>
 	.progress-bar {
 		position: absolute;
-		bottom: calc(52px + env(safe-area-inset-bottom));
+		bottom: calc(var(--bottom-nav-height, 64px) - 8px);
 		left: 0;
 		right: 0;
 		z-index: 6;
diff --git a/src/lib/components/ReelOverlay.svelte b/src/lib/components/ReelOverlay.svelte
index d592f78..9b5c903 100644
--- a/src/lib/components/ReelOverlay.svelte
+++ b/src/lib/components/ReelOverlay.svelte
@@ -105,7 +105,7 @@
 <style>
 	.reel-overlay {
 		position: absolute;
-		bottom: calc(94px + env(safe-area-inset-bottom));
+		bottom: calc(var(--bottom-nav-height, 64px) + 14px);
 		left: var(--space-lg);
 		right: var(--space-lg);
 		z-index: 5;
diff --git a/src/lib/components/SkeletonReel.svelte b/src/lib/components/SkeletonReel.svelte
index a5b55e8..8d5c486 100644
--- a/src/lib/components/SkeletonReel.svelte
+++ b/src/lib/components/SkeletonReel.svelte
@@ -50,7 +50,7 @@
 	.sidebar-bones {
 		position: absolute;
 		right: var(--space-md);
-		bottom: calc(90px + env(safe-area-inset-bottom));
+		bottom: calc(var(--bottom-nav-height, 64px) + 10px);
 		display: flex;
 		flex-direction: column;
 		gap: var(--space-lg);
@@ -66,7 +66,7 @@
 
 	.overlay-bones {
 		position: absolute;
-		bottom: calc(80px + env(safe-area-inset-bottom));
+		bottom: var(--bottom-nav-height, 64px);
 		left: var(--space-lg);
 		display: flex;
 		flex-direction: column;
diff --git a/src/lib/components/ToastStack.svelte b/src/lib/components/ToastStack.svelte
index 03db870..79efc99 100644
--- a/src/lib/components/ToastStack.svelte
+++ b/src/lib/components/ToastStack.svelte
@@ -161,7 +161,7 @@
 <style>
 	.toast-stack {
 		position: fixed;
-		bottom: calc(80px + env(safe-area-inset-bottom));
+		bottom: var(--bottom-nav-height, 64px);
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 300;
diff --git a/src/lib/components/settings/ClipsManager.svelte b/src/lib/components/settings/ClipsManager.svelte
index 1fc19c0..02564ee 100644
--- a/src/lib/components/settings/ClipsManager.svelte
+++ b/src/lib/components/settings/ClipsManager.svelte
@@ -408,7 +408,7 @@
 	/* Selection bar */
 	.selection-bar {
 		position: fixed;
-		bottom: calc(72px + env(safe-area-inset-bottom, 0px));
+		bottom: calc(var(--bottom-nav-height, 64px) + 8px);
 		left: 50%;
 		transform: translateX(-50%);
 		display: flex;
diff --git a/src/lib/components/settings/NotificationSettings.svelte b/src/lib/components/settings/NotificationSettings.svelte
index 9dfd5e1..86de3ef 100644
--- a/src/lib/components/settings/NotificationSettings.svelte
+++ b/src/lib/components/settings/NotificationSettings.svelte
@@ -1,6 +1,10 @@
 <script lang="ts">
+	import { onMount } from 'svelte';
 	import type { NotificationPrefs } from '$lib/settingsApi';
 
+	const STORAGE_KEY = 'scrolly:push-test-sent-at';
+	const TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;
+
 	let {
 		pushSupported,
 		pushEnabled,
@@ -18,6 +22,72 @@
 		onTogglePush: () => void;
 		onUpdatePref: (key: keyof NotificationPrefs, value: boolean) => void;
 	} = $props();
+
+	let testState = $state<'idle' | 'counting' | 'sent'>('idle');
+	let countdown = $state(10);
+	let lastTestedAt = $state<number | null>(null);
+	let countdownTimer = $state<ReturnType<typeof setInterval> | null>(null);
+
+	const lastTestedLabel = $derived.by(() => {
+		if (!lastTestedAt) return null;
+		if (Date.now() - lastTestedAt > TWENTY_FOUR_HOURS) return null;
+		const d = new Date(lastTestedAt);
+		const h = d.getHours();
+		const m = d.getMinutes().toString().padStart(2, '0');
+		const s = d.getSeconds().toString().padStart(2, '0');
+		const ampm = h >= 12 ? 'PM' : 'AM';
+		const h12 = h % 12 || 12;
+		return `Last tested at ${h12}:${m}:${s} ${ampm}`;
+	});
+
+	onMount(() => {
+		const stored = localStorage.getItem(STORAGE_KEY);
+		if (stored) {
+			const ts = parseInt(stored, 10);
+			if (!isNaN(ts) && Date.now() - ts <= TWENTY_FOUR_HOURS) {
+				lastTestedAt = ts;
+			} else {
+				localStorage.removeItem(STORAGE_KEY);
+			}
+		}
+
+		return () => {
+			if (countdownTimer) clearInterval(countdownTimer);
+		};
+	});
+
+	async function sendTestNotification() {
+		testState = 'counting';
+		countdown = 10;
+
+		countdownTimer = setInterval(() => {
+			countdown--;
+			if (countdown <= 0 && countdownTimer) {
+				clearInterval(countdownTimer);
+				countdownTimer = null;
+			}
+		}, 1000);
+
+		try {
+			const res = await fetch('/api/push/test', { method: 'POST' });
+			if (res.ok) {
+				const data = await res.json();
+				const sentAt = data.sentAt ?? Date.now();
+				lastTestedAt = sentAt;
+				localStorage.setItem(STORAGE_KEY, String(sentAt));
+				testState = 'sent';
+			} else {
+				testState = 'idle';
+			}
+		} catch {
+			testState = 'idle';
+		} finally {
+			if (countdownTimer) {
+				clearInterval(countdownTimer);
+				countdownTimer = null;
+			}
+		}
+	}
 </script>
 
 {#if !pushSupported}
@@ -39,6 +109,23 @@
 		</button>
 	</div>
 
+	{#if pushEnabled}
+		<div class="test-row">
+			{#if testState === 'idle'}
+				<button class="test-btn" onclick={sendTestNotification}> Send test notification </button>
+				{#if lastTestedLabel}
+					<span class="last-tested">{lastTestedLabel}</span>
+				{/if}
+			{:else if testState === 'counting'}
+				<button class="test-btn counting" disabled>
+					Sending in {countdown}s...
+				</button>
+			{:else if testState === 'sent'}
+				<span class="sent-label">Sent to device!</span>
+			{/if}
+		</div>
+	{/if}
+
 	<div class="divider"></div>
 	<h4 class="sub-heading">Notify me about</h4>
 
@@ -216,4 +303,47 @@
 	.toggle.active .toggle-thumb {
 		transform: translateX(18px);
 	}
+
+	.test-row {
+		display: flex;
+		align-items: center;
+		gap: var(--space-md);
+		padding: var(--space-md) 0 0;
+	}
+
+	.test-btn {
+		border: none;
+		background: var(--bg-surface);
+		color: var(--accent-primary);
+		font-family: var(--font-body);
+		font-size: 0.8125rem;
+		font-weight: 600;
+		padding: var(--space-sm) var(--space-lg);
+		border-radius: var(--radius-full);
+		cursor: pointer;
+		transition: all 0.2s ease;
+	}
+	.test-btn:active {
+		transform: scale(0.97);
+	}
+	.test-btn.counting {
+		color: var(--text-secondary);
+		cursor: default;
+	}
+	.test-btn:disabled {
+		opacity: 0.7;
+	}
+
+	.sent-label {
+		font-family: var(--font-body);
+		font-size: 0.8125rem;
+		font-weight: 600;
+		color: var(--success);
+	}
+
+	.last-tested {
+		font-family: var(--font-body);
+		font-size: 0.75rem;
+		color: var(--text-muted);
+	}
 </style>
diff --git a/src/lib/components/settings/ShortcutManager.svelte b/src/lib/components/settings/ShortcutManager.svelte
index 891107e..64a9697 100644
--- a/src/lib/components/settings/ShortcutManager.svelte
+++ b/src/lib/components/settings/ShortcutManager.svelte
@@ -1,16 +1,9 @@
 <script lang="ts">
-	import { resolve } from '$app/paths';
-	import { toast } from '$lib/stores/toasts';
-	import { confirm } from '$lib/stores/confirm';
-	import BaseSheet from '$lib/components/BaseSheet.svelte';
-	import QuestionIcon from 'phosphor-svelte/lib/QuestionIcon';
-	import CaretRightIcon from 'phosphor-svelte/lib/CaretRightIcon';
-	import ArrowsClockwiseIcon from 'phosphor-svelte/lib/ArrowsClockwiseIcon';
 	import AppleLogoIcon from 'phosphor-svelte/lib/AppleLogoIcon';
 	import AndroidLogoIcon from 'phosphor-svelte/lib/AndroidLogoIcon';
 	import CheckCircleIcon from 'phosphor-svelte/lib/CheckCircleIcon';
-
-	const ICLOUD_SHORTCUT_RE = /^https:\/\/www\.icloud\.com\/shortcuts\/[a-f0-9]{32}\/?$/;
+	import CaretRightIcon from 'phosphor-svelte/lib/CaretRightIcon';
+	import ShortcutSheet from './ShortcutSheet.svelte';
 
 	let {
 		shortcutUrl: propUrl,
@@ -20,120 +13,9 @@
 		shortcutToken: string | null;
 	} = $props();
 
-	let savedUrl = $state(propUrl ?? '');
-	let shortcutUrl = $state(propUrl ?? '');
-	let saving = $state(false);
-	let validationError = $state('');
-	let token = $state(propToken);
-	let rotating = $state(false);
 	let showSheet = $state(false);
 
-	const isConfigured = $derived(savedUrl.length > 0);
-	const isDirty = $derived(shortcutUrl.trim() !== savedUrl);
-	const canSave = $derived(isDirty && !saving);
-
-	async function saveShortcutUrl() {
-		const trimmed = shortcutUrl.trim();
-		if (trimmed === savedUrl) {
-			validationError = '';
-			return;
-		}
-
-		// Allow clearing the field
-		if (!trimmed) {
-			validationError = '';
-			saving = true;
-			try {
-				const res = await fetch('/api/group/shortcut', {
-					method: 'PATCH',
-					headers: { 'Content-Type': 'application/json' },
-					body: JSON.stringify({ shortcutUrl: null })
-				});
-				if (res.ok) {
-					shortcutUrl = '';
-					savedUrl = '';
-					toast.success('Shortcut link removed');
-				} else {
-					const data = await res.json();
-					toast.error(data.error || 'Failed to save');
-				}
-			} catch {
-				toast.error('Failed to save');
-			} finally {
-				saving = false;
-			}
-			return;
-		}
-
-		// Validate format
-		if (!ICLOUD_SHORTCUT_RE.test(trimmed)) {
-			validationError =
-				'Must be a valid iCloud shortcut link (https://www.icloud.com/shortcuts/...)';
-			return;
-		}
-
-		validationError = '';
-		saving = true;
-		try {
-			const res = await fetch('/api/group/shortcut', {
-				method: 'PATCH',
-				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify({ shortcutUrl: trimmed })
-			});
-			if (res.ok) {
-				const data = await res.json();
-				shortcutUrl = data.shortcutUrl ?? '';
-				savedUrl = data.shortcutUrl ?? '';
-				toast.success('Shortcut link saved');
-			} else {
-				const data = await res.json();
-				toast.error(data.error || 'Failed to save');
-			}
-		} catch {
-			toast.error('Failed to save');
-		} finally {
-			saving = false;
-		}
-	}
-
-	function handleKeydown(e: KeyboardEvent) {
-		if (e.key === 'Enter') {
-			e.preventDefault();
-			if (canSave) saveShortcutUrl();
-		}
-	}
-
-	function handleInput() {
-		if (validationError) validationError = '';
-	}
-
-	async function rotateToken() {
-		const confirmed = await confirm({
-			title: 'Rotate group token?',
-			message:
-				'This will invalidate the current token and break all iOS Shortcuts that are already configured with it. Every group member will need to re-install the shortcut with the new token.',
-			confirmLabel: 'Rotate Token',
-			destructive: true
-		});
-		if (!confirmed) return;
-
-		rotating = true;
-		try {
-			const res = await fetch('/api/group/shortcut/regenerate-token', { method: 'POST' });
-			if (res.ok) {
-				const data = await res.json();
-				token = data.shortcutToken;
-				toast.success('Token rotated — update your shortcuts');
-			} else {
-				const data = await res.json();
-				toast.error(data.error || 'Failed to rotate token');
-			}
-		} catch {
-			toast.error('Failed to rotate token');
-		} finally {
-			rotating = false;
-		}
-	}
+	const isConfigured = $derived((propUrl ?? '').length > 0);
 </script>
 
 <div class="shortcut-manager">
@@ -172,70 +54,11 @@
 </div>
 
 {#if showSheet}
-	<BaseSheet title="iOS Shortcut" sheetId="ios-shortcut" ondismiss={() => (showSheet = false)}>
-		<div class="sheet-content">
-			<a href={resolve('/share/setup')} class="setup-link">
-				<QuestionIcon size={20} />
-				<div class="setup-link-text">
-					<span class="setup-link-title">Set up the iOS Shortcut</span>
-					<span class="setup-link-desc"
-						>Download the template, customize, and share with your group</span
-					>
-				</div>
-				<CaretRightIcon size={16} class="setup-link-chevron" />
-			</a>
-
-			<div class="subsection">
-				<div class="subsection-label">iCloud Shortcut Link</div>
-				<p class="subsection-desc">
-					Paste the iCloud link so iOS members see a "Get Shortcut" button.
-				</p>
-				<div class="url-row">
-					<input
-						type="url"
-						class="icloud-input"
-						class:invalid={validationError}
-						bind:value={shortcutUrl}
-						onkeydown={handleKeydown}
-						oninput={handleInput}
-						placeholder="https://www.icloud.com/shortcuts/..."
-						disabled={saving}
-					/>
-					<button
-						class="save-btn"
-						class:saved={!isDirty && isConfigured}
-						onclick={saveShortcutUrl}
-						disabled={!canSave}
-					>
-						{#if saving}
-							Saving…
-						{:else if !isDirty && isConfigured}
-							Saved
-						{:else}
-							Save
-						{/if}
-					</button>
-				</div>
-				{#if validationError}
-					<p class="input-error">{validationError}</p>
-				{/if}
-			</div>
-
-			{#if token}
-				<div class="subsection">
-					<div class="subsection-label">Shortcut Token</div>
-					<p class="subsection-desc">Authenticates shortcut requests. Rotate if compromised.</p>
-					<div class="token-row">
-						<code class="token-value">{token.slice(0, 8)}…{token.slice(-4)}</code>
-						<button class="rotate-btn" onclick={rotateToken} disabled={rotating}>
-							<ArrowsClockwiseIcon size={16} />
-							{rotating ? 'Rotating…' : 'Rotate'}
-						</button>
-					</div>
-				</div>
-			{/if}
-		</div>
-	</BaseSheet>
+	<ShortcutSheet
+		shortcutUrl={propUrl}
+		shortcutToken={propToken}
+		ondismiss={() => (showSheet = false)}
+	/>
 {/if}
 
 <style>
@@ -244,32 +67,27 @@
 		flex-direction: column;
 		gap: var(--space-md);
 	}
-
 	.intro-desc {
 		font-size: 0.8125rem;
 		color: var(--text-secondary);
 		margin: 0;
 		line-height: 1.4;
 	}
-
 	.platform-list {
 		display: flex;
 		flex-direction: column;
 		gap: var(--space-xs);
 	}
-
 	.platform-row {
 		display: flex;
 		align-items: center;
 		gap: var(--space-md);
 		padding: var(--space-sm) 0;
 	}
-
 	.platform-row > :global(svg:first-child) {
 		flex-shrink: 0;
 		color: var(--text-secondary);
 	}
-
 	.platform-info {
 		display: flex;
 		flex-direction: column;
@@ -277,13 +95,11 @@
 		flex: 1;
 		min-width: 0;
 	}
-
 	.platform-title {
 		font-size: 0.8125rem;
 		font-weight: 600;
 		color: var(--text-primary);
 	}
-
 	.platform-desc {
 		font-size: 0.75rem;
 		color: var(--text-muted);
@@ -305,196 +121,11 @@
 		padding: var(--space-sm);
 		transition: background 0.15s ease;
 	}
-
 	.ios-row:active {
 		background: var(--bg-surface);
 	}
-
 	.ios-row :global(.row-chevron) {
 		flex-shrink: 0;
 		color: var(--text-muted);
 	}
-
-	/* Sheet content */
-	.sheet-content {
-		display: flex;
-		flex-direction: column;
-		gap: var(--space-lg);
-		padding: var(--space-sm) var(--space-lg) var(--space-xl);
-		padding-bottom: calc(var(--space-xl) + env(safe-area-inset-bottom, 0px));
-		max-height: 70dvh;
-		overflow-y: auto;
-		-webkit-overflow-scrolling: touch;
-	}
-
-	.setup-link {
-		display: flex;
-		align-items: center;
-		gap: var(--space-md);
-		padding: var(--space-md);
-		background: color-mix(in srgb, var(--accent-primary) 8%, transparent);
-		border: 1px solid color-mix(in srgb, var(--accent-primary) 20%, transparent);
-		border-radius: var(--radius-sm);
-		text-decoration: none;
-		transition: transform 0.1s ease;
-	}
-
-	.setup-link:active {
-		transform: scale(0.98);
-	}
-	.setup-link > :global(svg:first-child) {
-		width: 20px;
-		height: 20px;
-		flex-shrink: 0;
-		color: var(--accent-primary);
-	}
-	.setup-link-text {
-		display: flex;
-		flex-direction: column;
-		gap: 1px;
-		flex: 1;
-		min-width: 0;
-	}
-	.setup-link-title {
-		font-size: 0.8125rem;
-		font-weight: 600;
-		color: var(--text-primary);
-	}
-	.setup-link-desc {
-		font-size: 0.6875rem;
-		color: var(--text-muted);
-	}
-	.setup-link :global(.setup-link-chevron) {
-		width: 16px;
-		height: 16px;
-		flex-shrink: 0;
-		color: var(--text-muted);
-	}
-
-	.subsection {
-		display: flex;
-		flex-direction: column;
-		gap: var(--space-sm);
-	}
-
-	.subsection-label {
-		font-size: 0.8125rem;
-		font-weight: 600;
-		color: var(--text-primary);
-	}
-	.subsection-desc {
-		font-size: 0.75rem;
-		color: var(--text-muted);
-		margin: 0;
-		line-height: 1.4;
-	}
-
-	.url-row {
-		display: flex;
-		gap: var(--space-sm);
-		align-items: stretch;
-	}
-
-	.icloud-input {
-		flex: 1;
-		min-width: 0;
-		padding: var(--space-sm) var(--space-md);
-		background: var(--bg-elevated);
-		border: 1px solid var(--border);
-		border-radius: var(--radius-sm);
-		color: var(--text-primary);
-		font-size: 0.8125rem;
-		outline: none;
-		transition: border-color 0.2s ease;
-		box-sizing: border-box;
-	}
-
-	.icloud-input::placeholder {
-		color: var(--text-muted);
-	}
-	.icloud-input:focus {
-		border-color: var(--accent-primary);
-	}
-	.icloud-input.invalid:not(:focus) {
-		border-color: var(--error);
-	}
-	.icloud-input:disabled {
-		opacity: 0.5;
-	}
-
-	.save-btn {
-		flex-shrink: 0;
-		padding: var(--space-sm) var(--space-md);
-		background: var(--accent-primary);
-		color: var(--bg-primary);
-		border: none;
-		border-radius: var(--radius-sm);
-		font-size: 0.8125rem;
-		font-weight: 600;
-		cursor: pointer;
-		white-space: nowrap;
-		transition: all 0.2s ease;
-	}
-
-	.save-btn:active:not(:disabled) {
-		transform: scale(0.97);
-	}
-	.save-btn:disabled {
-		cursor: default;
-	}
-	.save-btn.saved {
-		background: var(--bg-surface);
-		color: var(--text-muted);
-	}
-	.save-btn:disabled:not(.saved) {
-		opacity: 0.5;
-	}
-	.input-error {
-		font-size: 0.8125rem;
-		color: var(--error);
-		margin: 0;
-	}
-
-	.token-row {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		gap: var(--space-md);
-		padding: var(--space-sm) var(--space-md);
-		background: var(--bg-elevated);
-		border-radius: var(--radius-sm);
-	}
-
-	.token-value {
-		font-size: 0.8125rem;
-		color: var(--text-secondary);
-		font-family: monospace;
-		min-width: 0;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.rotate-btn {
-		display: flex;
-		align-items: center;
-		gap: var(--space-xs);
-		padding: var(--space-xs) var(--space-sm);
-		background: transparent;
-		border: 1px solid var(--border);
-		border-radius: var(--radius-sm);
-		color: var(--text-secondary);
-		font-size: 0.75rem;
-		font-weight: 600;
-		cursor: pointer;
-		white-space: nowrap;
-		transition: all 0.2s ease;
-	}
-
-	.rotate-btn:active:not(:disabled) {
-		transform: scale(0.97);
-	}
-	.rotate-btn:disabled {
-		opacity: 0.5;
-		cursor: not-allowed;
-	}
 </style>
diff --git a/src/lib/components/settings/ShortcutSheet.svelte b/src/lib/components/settings/ShortcutSheet.svelte
new file mode 100644
index 0000000..47830ae
--- /dev/null
+++ b/src/lib/components/settings/ShortcutSheet.svelte
@@ -0,0 +1,416 @@
+<script lang="ts">
+	import { resolve } from '$app/paths';
+	import { toast } from '$lib/stores/toasts';
+	import { confirm } from '$lib/stores/confirm';
+	import BaseSheet from '$lib/components/BaseSheet.svelte';
+	import QuestionIcon from 'phosphor-svelte/lib/QuestionIcon';
+	import CaretRightIcon from 'phosphor-svelte/lib/CaretRightIcon';
+	import ArrowsClockwiseIcon from 'phosphor-svelte/lib/ArrowsClockwiseIcon';
+	import ValidationResults from './ValidationResults.svelte';
+
+	const ICLOUD_SHORTCUT_RE = /^https:\/\/www\.icloud\.com\/shortcuts\/[a-f0-9]{32}\/?$/;
+	const SOFT_CODES = ['bad_name', 'localhost_url'];
+	const UNREACHABLE_CODES = ['fetch_failed'];
+
+	let {
+		shortcutUrl: propUrl,
+		shortcutToken: propToken,
+		ondismiss
+	}: {
+		shortcutUrl: string | null;
+		shortcutToken: string | null;
+		ondismiss: () => void;
+	} = $props();
+
+	let savedUrl = $state(propUrl ?? '');
+	let shortcutUrl = $state(propUrl ?? '');
+	let saving = $state(false);
+	let validating = $state(false);
+	let validationError = $state('');
+	let validationWarnings = $state<{ code: string; message: string }[]>([]);
+	let validated = $state(false);
+	let token = $state(propToken);
+	let rotating = $state(false);
+
+	const isConfigured = $derived(savedUrl.length > 0);
+	const isDirty = $derived(shortcutUrl.trim() !== savedUrl);
+	const canSave = $derived(isDirty && !saving && !validating);
+
+	const blockers = $derived(
+		validationWarnings.filter(
+			(w) => !SOFT_CODES.includes(w.code) && !UNREACHABLE_CODES.includes(w.code)
+		)
+	);
+	const softWarnings = $derived(validationWarnings.filter((w) => SOFT_CODES.includes(w.code)));
+	const isUnreachable = $derived(
+		validationWarnings.some((w) => UNREACHABLE_CODES.includes(w.code))
+	);
+	const hasBlockers = $derived(blockers.length > 0);
+	const hasSoftOnly = $derived(softWarnings.length > 0 && !hasBlockers && !isUnreachable);
+
+	async function doSave(trimmed: string | null) {
+		saving = true;
+		try {
+			const res = await fetch('/api/group/shortcut', {
+				method: 'PATCH',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({ shortcutUrl: trimmed })
+			});
+			if (res.ok) {
+				const data = await res.json();
+				shortcutUrl = data.shortcutUrl ?? '';
+				savedUrl = data.shortcutUrl ?? '';
+				validationWarnings = [];
+				validated = false;
+				toast.success(trimmed ? 'Shortcut link saved' : 'Shortcut link removed');
+			} else {
+				const data = await res.json();
+				toast.error(data.error || 'Failed to save');
+			}
+		} catch {
+			toast.error('Failed to save');
+		} finally {
+			saving = false;
+		}
+	}
+
+	async function validateAndSave() {
+		const trimmed = shortcutUrl.trim();
+		if (trimmed === savedUrl) {
+			validationError = '';
+			return;
+		}
+		if (!trimmed) {
+			validationError = '';
+			await doSave(null);
+			return;
+		}
+		if (!ICLOUD_SHORTCUT_RE.test(trimmed)) {
+			validationError =
+				'Must be a valid iCloud shortcut link (https://www.icloud.com/shortcuts/...)';
+			return;
+		}
+
+		validationError = '';
+		validating = true;
+		validated = false;
+		validationWarnings = [];
+		try {
+			const res = await fetch('/api/group/shortcut/validate', {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({ shortcutUrl: trimmed })
+			});
+			if (res.ok) {
+				const data = await res.json();
+				validationWarnings = data.warnings ?? [];
+				validated = true;
+				if (validationWarnings.length === 0) {
+					await doSave(trimmed);
+				}
+			} else {
+				const data = await res.json();
+				toast.error(data.error || 'Validation failed');
+			}
+		} catch {
+			toast.error('Could not validate shortcut');
+		} finally {
+			validating = false;
+		}
+	}
+
+	function handleKeydown(e: KeyboardEvent) {
+		if (e.key === 'Enter') {
+			e.preventDefault();
+			if (canSave) validateAndSave();
+		}
+	}
+
+	function handleInput() {
+		if (validationError) validationError = '';
+		if (validated) {
+			validated = false;
+			validationWarnings = [];
+		}
+	}
+
+	async function rotateToken() {
+		const confirmed = await confirm({
+			title: 'Rotate group token?',
+			message:
+				'This will invalidate the current token and break all iOS Shortcuts that are already configured with it. Every group member will need to re-install the shortcut with the new token.',
+			confirmLabel: 'Rotate Token',
+			destructive: true
+		});
+		if (!confirmed) return;
+
+		rotating = true;
+		try {
+			const res = await fetch('/api/group/shortcut/regenerate-token', { method: 'POST' });
+			if (res.ok) {
+				const data = await res.json();
+				token = data.shortcutToken;
+				toast.success('Token rotated — update your shortcuts');
+			} else {
+				const data = await res.json();
+				toast.error(data.error || 'Failed to rotate token');
+			}
+		} catch {
+			toast.error('Failed to rotate token');
+		} finally {
+			rotating = false;
+		}
+	}
+</script>
+
+<BaseSheet title="iOS Shortcut" sheetId="ios-shortcut" {ondismiss}>
+	<div class="sheet-content">
+		<a href={resolve('/share/setup')} class="setup-link">
+			<QuestionIcon size={20} />
+			<div class="setup-link-text">
+				<span class="setup-link-title">Set up the iOS Shortcut</span>
+				<span class="setup-link-desc"
+					>Download the template, customize, and share with your group</span
+				>
+			</div>
+			<CaretRightIcon size={16} class="setup-link-chevron" />
+		</a>
+
+		<div class="subsection">
+			<div class="subsection-label">iCloud Shortcut Link</div>
+			<p class="subsection-desc">
+				Paste the iCloud link so iOS members see a "Get Shortcut" button.
+			</p>
+			<div class="url-row">
+				<input
+					type="url"
+					class="icloud-input"
+					class:invalid={validationError}
+					bind:value={shortcutUrl}
+					onkeydown={handleKeydown}
+					oninput={handleInput}
+					placeholder="https://www.icloud.com/shortcuts/..."
+					disabled={saving || validating}
+				/>
+				<button
+					class="save-btn"
+					class:saved={!isDirty && isConfigured}
+					onclick={validateAndSave}
+					disabled={!canSave}
+				>
+					{#if validating}
+						Checking…
+					{:else if saving}
+						Saving…
+					{:else if !isDirty && isConfigured}
+						Saved
+					{:else}
+						Save
+					{/if}
+				</button>
+			</div>
+			{#if validationError}
+				<p class="input-error">{validationError}</p>
+			{/if}
+
+			{#if validated && validationWarnings.length > 0}
+				<ValidationResults
+					{blockers}
+					{softWarnings}
+					{isUnreachable}
+					{hasBlockers}
+					{hasSoftOnly}
+					{validating}
+					{saving}
+					onRevalidate={validateAndSave}
+					onSaveAnyway={() => doSave(shortcutUrl.trim())}
+				/>
+			{/if}
+		</div>
+
+		{#if token}
+			<div class="subsection">
+				<div class="subsection-label">Shortcut Token</div>
+				<p class="subsection-desc">Authenticates shortcut requests. Rotate if compromised.</p>
+				<div class="token-row">
+					<code class="token-value">{token.slice(0, 8)}…{token.slice(-4)}</code>
+					<button class="rotate-btn" onclick={rotateToken} disabled={rotating}>
+						<ArrowsClockwiseIcon size={16} />
+						{rotating ? 'Rotating…' : 'Rotate'}
+					</button>
+				</div>
+			</div>
+		{/if}
+	</div>
+</BaseSheet>
+
+<style>
+	.sheet-content {
+		display: flex;
+		flex-direction: column;
+		gap: var(--space-lg);
+		padding: var(--space-sm) var(--space-lg) var(--space-xl);
+		padding-bottom: calc(var(--space-xl) + env(safe-area-inset-bottom, 0px));
+		max-height: 70dvh;
+		overflow-y: auto;
+		-webkit-overflow-scrolling: touch;
+	}
+	.setup-link {
+		display: flex;
+		align-items: center;
+		gap: var(--space-md);
+		padding: var(--space-md);
+		background: color-mix(in srgb, var(--accent-primary) 8%, transparent);
+		border: 1px solid color-mix(in srgb, var(--accent-primary) 20%, transparent);
+		border-radius: var(--radius-sm);
+		text-decoration: none;
+		transition: transform 0.1s ease;
+	}
+	.setup-link:active {
+		transform: scale(0.98);
+	}
+	.setup-link > :global(svg:first-child) {
+		width: 20px;
+		height: 20px;
+		flex-shrink: 0;
+		color: var(--accent-primary);
+	}
+	.setup-link-text {
+		display: flex;
+		flex-direction: column;
+		gap: 1px;
+		flex: 1;
+		min-width: 0;
+	}
+	.setup-link-title {
+		font-size: 0.8125rem;
+		font-weight: 600;
+		color: var(--text-primary);
+	}
+	.setup-link-desc {
+		font-size: 0.6875rem;
+		color: var(--text-muted);
+	}
+	.setup-link :global(.setup-link-chevron) {
+		width: 16px;
+		height: 16px;
+		flex-shrink: 0;
+		color: var(--text-muted);
+	}
+	.subsection {
+		display: flex;
+		flex-direction: column;
+		gap: var(--space-sm);
+	}
+	.subsection-label {
+		font-size: 0.8125rem;
+		font-weight: 600;
+		color: var(--text-primary);
+	}
+	.subsection-desc {
+		font-size: 0.75rem;
+		color: var(--text-muted);
+		margin: 0;
+		line-height: 1.4;
+	}
+	.url-row {
+		display: flex;
+		gap: var(--space-sm);
+		align-items: stretch;
+	}
+	.icloud-input {
+		flex: 1;
+		min-width: 0;
+		padding: var(--space-sm) var(--space-md);
+		background: var(--bg-elevated);
+		border: 1px solid var(--border);
+		border-radius: var(--radius-sm);
+		color: var(--text-primary);
+		font-size: 0.8125rem;
+		outline: none;
+		transition: border-color 0.2s ease;
+		box-sizing: border-box;
+	}
+	.icloud-input::placeholder {
+		color: var(--text-muted);
+	}
+	.icloud-input:focus {
+		border-color: var(--accent-primary);
+	}
+	.icloud-input.invalid:not(:focus) {
+		border-color: var(--error);
+	}
+	.icloud-input:disabled {
+		opacity: 0.5;
+	}
+	.save-btn {
+		flex-shrink: 0;
+		padding: var(--space-sm) var(--space-md);
+		background: var(--accent-primary);
+		color: var(--bg-primary);
+		border: none;
+		border-radius: var(--radius-sm);
+		font-size: 0.8125rem;
+		font-weight: 600;
+		cursor: pointer;
+		white-space: nowrap;
+		transition: all 0.2s ease;
+	}
+	.save-btn:active:not(:disabled) {
+		transform: scale(0.97);
+	}
+	.save-btn:disabled {
+		cursor: default;
+	}
+	.save-btn.saved {
+		background: var(--bg-surface);
+		color: var(--text-muted);
+	}
+	.save-btn:disabled:not(.saved) {
+		opacity: 0.5;
+	}
+	.input-error {
+		font-size: 0.8125rem;
+		color: var(--error);
+		margin: 0;
+	}
+	.token-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: var(--space-md);
+		padding: var(--space-sm) var(--space-md);
+		background: var(--bg-elevated);
+		border-radius: var(--radius-sm);
+	}
+	.token-value {
+		font-size: 0.8125rem;
+		color: var(--text-secondary);
+		font-family: monospace;
+		min-width: 0;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.rotate-btn {
+		display: flex;
+		align-items: center;
+		gap: var(--space-xs);
+		padding: var(--space-xs) var(--space-sm);
+		background: transparent;
+		border: 1px solid var(--border);
+		border-radius: var(--radius-sm);
+		color: var(--text-secondary);
+		font-size: 0.75rem;
+		font-weight: 600;
+		cursor: pointer;
+		white-space: nowrap;
+		transition: all 0.2s ease;
+	}
+	.rotate-btn:active:not(:disabled) {
+		transform: scale(0.97);
+	}
+	.rotate-btn:disabled {
+		opacity: 0.5;
+		cursor: not-allowed;
+	}
+</style>
diff --git a/src/lib/components/settings/ValidationResults.svelte b/src/lib/components/settings/ValidationResults.svelte
new file mode 100644
index 0000000..880aebf
--- /dev/null
+++ b/src/lib/components/settings/ValidationResults.svelte
@@ -0,0 +1,154 @@
+<script lang="ts">
+	import WarningIcon from 'phosphor-svelte/lib/WarningIcon';
+
+	type Warning = { code: string; message: string };
+
+	let {
+		blockers,
+		softWarnings,
+		isUnreachable,
+		hasBlockers,
+		hasSoftOnly,
+		validating,
+		saving,
+		onRevalidate,
+		onSaveAnyway
+	}: {
+		blockers: Warning[];
+		softWarnings: Warning[];
+		isUnreachable: boolean;
+		hasBlockers: boolean;
+		hasSoftOnly: boolean;
+		validating: boolean;
+		saving: boolean;
+		onRevalidate: () => void;
+		onSaveAnyway: () => void;
+	} = $props();
+</script>
+
+<div class="validation-results">
+	{#if isUnreachable}
+		<div class="validation-warning">
+			<WarningIcon size={14} weight="fill" />
+			<span>Could not reach iCloud to validate. You can save without checking.</span>
+		</div>
+		<div class="validation-actions">
+			<button class="action-btn revalidate" onclick={onRevalidate} disabled={validating}>
+				{validating ? 'Checking…' : 'Retry'}
+			</button>
+			<button class="action-btn save-anyway" onclick={onSaveAnyway} disabled={saving}>
+				{saving ? 'Saving…' : 'Save Without Validating'}
+			</button>
+		</div>
+	{:else if hasBlockers}
+		{#each blockers as warning (warning.code + warning.message)}
+			<div class="validation-blocker">
+				<WarningIcon size={14} weight="fill" />
+				<!-- eslint-disable-next-line svelte/no-at-html-tags -- server-generated, no user input -->
+				<span>{@html warning.message}</span>
+			</div>
+		{/each}
+		<div class="validation-actions">
+			<button class="action-btn revalidate" onclick={onRevalidate} disabled={validating}>
+				{validating ? 'Checking…' : 'Re-validate'}
+			</button>
+		</div>
+	{:else if hasSoftOnly}
+		{#each softWarnings as warning (warning.code + warning.message)}
+			<div class="validation-warning">
+				<WarningIcon size={14} weight="fill" />
+				<!-- eslint-disable-next-line svelte/no-at-html-tags -- server-generated, no user input -->
+				<span>{@html warning.message}</span>
+			</div>
+		{/each}
+		<div class="validation-actions">
+			<button class="action-btn save-anyway" onclick={onSaveAnyway} disabled={saving}>
+				{saving ? 'Saving…' : 'Save Anyway'}
+			</button>
+		</div>
+	{/if}
+</div>
+
+<style>
+	.validation-results {
+		display: flex;
+		flex-direction: column;
+		gap: var(--space-sm);
+	}
+	.validation-blocker {
+		display: flex;
+		align-items: flex-start;
+		gap: var(--space-sm);
+		padding: var(--space-sm) var(--space-md);
+		background: color-mix(in srgb, var(--error) 8%, transparent);
+		border: 1px solid color-mix(in srgb, var(--error) 20%, transparent);
+		border-radius: var(--radius-sm);
+	}
+	.validation-blocker :global(svg) {
+		flex-shrink: 0;
+		color: var(--error);
+		margin-top: 2px;
+	}
+	.validation-blocker span {
+		font-size: 0.8125rem;
+		color: var(--text-secondary);
+		line-height: 1.4;
+	}
+	.validation-blocker span :global(b) {
+		color: var(--text-primary);
+		font-weight: 600;
+	}
+	.validation-warning {
+		display: flex;
+		align-items: flex-start;
+		gap: var(--space-sm);
+		padding: var(--space-sm) var(--space-md);
+		background: color-mix(in srgb, var(--warning) 8%, transparent);
+		border: 1px solid color-mix(in srgb, var(--warning) 20%, transparent);
+		border-radius: var(--radius-sm);
+	}
+	.validation-warning :global(svg) {
+		flex-shrink: 0;
+		color: var(--warning);
+		margin-top: 2px;
+	}
+	.validation-warning span {
+		font-size: 0.8125rem;
+		color: var(--text-secondary);
+		line-height: 1.4;
+	}
+	.validation-warning span :global(b) {
+		color: var(--text-primary);
+		font-weight: 600;
+	}
+	.validation-actions {
+		display: flex;
+		gap: var(--space-sm);
+	}
+	.action-btn {
+		flex: 1;
+		padding: var(--space-sm) var(--space-md);
+		border: none;
+		border-radius: var(--radius-sm);
+		font-size: 0.8125rem;
+		font-weight: 600;
+		cursor: pointer;
+		transition: transform 0.1s ease;
+	}
+	.action-btn:active:not(:disabled) {
+		transform: scale(0.97);
+	}
+	.action-btn:disabled {
+		opacity: 0.5;
+		cursor: not-allowed;
+	}
+	.action-btn.revalidate {
+		background: var(--accent-primary);
+		color: var(--bg-primary);
+	}
+	.action-btn.save-anyway {
+		background: var(--bg-surface);
+		color: var(--text-primary);
+		border: 1px solid var(--border);
+	}
+</style>
diff --git a/src/lib/feed.ts b/src/lib/feed.ts
index 92d39f6..4a3f2ad 100644
--- a/src/lib/feed.ts
+++ b/src/lib/feed.ts
@@ -2,14 +2,17 @@ import type { FeedClip } from '$lib/types';
 import { fetchUnwatchedCount } from '$lib/stores/notifications';
 
 export type FeedFilter = 'all' | 'unwatched' | 'watched' | 'favorites';
+export type FeedSort = 'oldest' | 'round-robin';
 
 export function buildClipParams(
 	filter: FeedFilter,
 	offset: number,
-	pageSize: number
+	pageSize: number,
+	sort?: FeedSort
 ): URLSearchParams {
 	const params = new URLSearchParams();
 	if (filter !== 'all') params.set('filter', filter);
+	if (sort && sort !== 'oldest') params.set('sort', sort);
 	params.set('limit', String(pageSize));
 	params.set('offset', String(offset));
 	return params;
@@ -17,10 +20,11 @@ export function buildClipParams(
 
 export async function fetchClips(
 	filter: FeedFilter,
-	pageSize: number
+	pageSize: number,
+	sort?: FeedSort
 ): Promise<{ clips: FeedClip[]; hasMore: boolean } | null> {
 	try {
-		const params = buildClipParams(filter, 0, pageSize);
+		const params = buildClipParams(filter, 0, pageSize, sort);
 		const res = await fetch(`/api/clips?${params}`);
 		if (res.ok) return res.json();
 		return null;
@@ -33,10 +37,11 @@ export async function fetchClips(
 export async function fetchMoreClips(
 	filter: FeedFilter,
 	offset: number,
-	pageSize: number
+	pageSize: number,
+	sort?: FeedSort
 ): Promise<{ clips: FeedClip[]; hasMore: boolean } | null> {
 	try {
-		const params = buildClipParams(filter, offset, pageSize);
+		const params = buildClipParams(filter, offset, pageSize, sort);
 		const res = await fetch(`/api/clips?${params}`);
 		if (res.ok) return res.json();
 		return null;
diff --git a/src/lib/server/db/migrations/0021_flaky_stature.sql b/src/lib/server/db/migrations/0021_flaky_stature.sql
new file mode 100644
index 0000000..f0933d1
--- /dev/null
+++ b/src/lib/server/db/migrations/0021_flaky_stature.sql
@@ -0,0 +1 @@
+ALTER TABLE `users` ADD `feed_sort_order` text DEFAULT 'oldest' NOT NULL;
\ No newline at end of file
diff --git a/src/lib/server/db/migrations/meta/0021_snapshot.json b/src/lib/server/db/migrations/meta/0021_snapshot.json
new file mode 100644
index 0000000..569497a
--- /dev/null
+++ b/src/lib/server/db/migrations/meta/0021_snapshot.json
@@ -0,0 +1,1219 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "ad304cb3-15cb-4a07-8380-0390f33d1389",
+  "prevId": "9beecb53-a092-49a5-b7bf-caddbb66474c",
+  "tables": {
+    "clips": {
+      "name": "clips",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "added_by": {
+          "name": "added_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "original_url": {
+          "name": "original_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "video_path": {
+          "name": "video_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "thumbnail_path": {
+          "name": "thumbnail_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "duration_seconds": {
+          "name": "duration_seconds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "platform": {
+          "name": "platform",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'downloading'"
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'video'"
+        },
+        "audio_path": {
+          "name": "audio_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "artist": {
+          "name": "artist",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "album_art": {
+          "name": "album_art",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "spotify_url": {
+          "name": "spotify_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "apple_music_url": {
+          "name": "apple_music_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "youtube_music_url": {
+          "name": "youtube_music_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "file_size_bytes": {
+          "name": "file_size_bytes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "clips_group_url": {
+          "name": "clips_group_url",
+          "columns": [
+            "group_id",
+            "original_url"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "clips_group_id_groups_id_fk": {
+          "name": "clips_group_id_groups_id_fk",
+          "tableFrom": "clips",
+          "tableTo": "groups",
+          "columnsFrom": [
+            "group_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "clips_added_by_users_id_fk": {
+          "name": "clips_added_by_users_id_fk",
+          "tableFrom": "clips",
+          "tableTo": "users",
+          "columnsFrom": [
+            "added_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "comment_hearts": {
+      "name": "comment_hearts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "comment_id": {
+          "name": "comment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_hearts_unique": {
+          "name": "comment_hearts_unique",
+          "columns": [
+            "comment_id",
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_hearts_comment_id_comments_id_fk": {
+          "name": "comment_hearts_comment_id_comments_id_fk",
+          "tableFrom": "comment_hearts",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "comment_hearts_user_id_users_id_fk": {
+          "name": "comment_hearts_user_id_users_id_fk",
+          "tableFrom": "comment_hearts",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "comment_views": {
+      "name": "comment_views",
+      "columns": {
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "viewed_at": {
+          "name": "viewed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_views_unique": {
+          "name": "comment_views_unique",
+          "columns": [
+            "clip_id",
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_views_clip_id_clips_id_fk": {
+          "name": "comment_views_clip_id_clips_id_fk",
+          "tableFrom": "comment_views",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "comment_views_user_id_users_id_fk": {
+          "name": "comment_views_user_id_users_id_fk",
+          "tableFrom": "comment_views",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "comments": {
+      "name": "comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "gif_url": {
+          "name": "gif_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "comments_clip_id_clips_id_fk": {
+          "name": "comments_clip_id_clips_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "comments_user_id_users_id_fk": {
+          "name": "comments_user_id_users_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "favorites": {
+      "name": "favorites",
+      "columns": {
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "favorites_clip_id_clips_id_fk": {
+          "name": "favorites_clip_id_clips_id_fk",
+          "tableFrom": "favorites",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "favorites_user_id_users_id_fk": {
+          "name": "favorites_user_id_users_id_fk",
+          "tableFrom": "favorites",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "groups": {
+      "name": "groups",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "invite_code": {
+          "name": "invite_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "retention_days": {
+          "name": "retention_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "max_storage_mb": {
+          "name": "max_storage_mb",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "max_file_size_mb": {
+          "name": "max_file_size_mb",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": 500
+        },
+        "accent_color": {
+          "name": "accent_color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'coral'"
+        },
+        "download_provider": {
+          "name": "download_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "platform_filter_mode": {
+          "name": "platform_filter_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'all'"
+        },
+        "platform_filter_list": {
+          "name": "platform_filter_list",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shortcut_token": {
+          "name": "shortcut_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shortcut_url": {
+          "name": "shortcut_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "groups_invite_code_unique": {
+          "name": "groups_invite_code_unique",
+          "columns": [
+            "invite_code"
+          ],
+          "isUnique": true
+        },
+        "groups_shortcut_token_unique": {
+          "name": "groups_shortcut_token_unique",
+          "columns": [
+            "shortcut_token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "notification_preferences": {
+      "name": "notification_preferences",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "new_adds": {
+          "name": "new_adds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reactions": {
+          "name": "reactions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "comments": {
+          "name": "comments",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "mentions": {
+          "name": "mentions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "daily_reminder": {
+          "name": "daily_reminder",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "notification_preferences_user_id_users_id_fk": {
+          "name": "notification_preferences_user_id_users_id_fk",
+          "tableFrom": "notification_preferences",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "notifications": {
+      "name": "notifications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "actor_id": {
+          "name": "actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emoji": {
+          "name": "emoji",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "comment_preview": {
+          "name": "comment_preview",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "read_at": {
+          "name": "read_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "notifications_user_created": {
+          "name": "notifications_user_created",
+          "columns": [
+            "user_id",
+            "created_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "notifications_user_id_users_id_fk": {
+          "name": "notifications_user_id_users_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "notifications_clip_id_clips_id_fk": {
+          "name": "notifications_clip_id_clips_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "notifications_actor_id_users_id_fk": {
+          "name": "notifications_actor_id_users_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "actor_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "push_subscriptions": {
+      "name": "push_subscriptions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "endpoint": {
+          "name": "endpoint",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "keys_p256dh": {
+          "name": "keys_p256dh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "keys_auth": {
+          "name": "keys_auth",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "push_subscriptions_user_id_users_id_fk": {
+          "name": "push_subscriptions_user_id_users_id_fk",
+          "tableFrom": "push_subscriptions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "reactions": {
+      "name": "reactions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emoji": {
+          "name": "emoji",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "reactions_unique": {
+          "name": "reactions_unique",
+          "columns": [
+            "clip_id",
+            "user_id",
+            "emoji"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "reactions_clip_id_clips_id_fk": {
+          "name": "reactions_clip_id_clips_id_fk",
+          "tableFrom": "reactions",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "reactions_user_id_users_id_fk": {
+          "name": "reactions_user_id_users_id_fk",
+          "tableFrom": "reactions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "phone": {
+          "name": "phone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "theme_preference": {
+          "name": "theme_preference",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'system'"
+        },
+        "auto_scroll": {
+          "name": "auto_scroll",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "muted_by_default": {
+          "name": "muted_by_default",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "feed_sort_order": {
+          "name": "feed_sort_order",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'oldest'"
+        },
+        "avatar_path": {
+          "name": "avatar_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "removed_at": {
+          "name": "removed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "users_phone_unique": {
+          "name": "users_phone_unique",
+          "columns": [
+            "phone"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "users_group_id_groups_id_fk": {
+          "name": "users_group_id_groups_id_fk",
+          "tableFrom": "users",
+          "tableTo": "groups",
+          "columnsFrom": [
+            "group_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "verification_codes": {
+      "name": "verification_codes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "phone": {
+          "name": "phone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "verified_at": {
+          "name": "verified_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "verification_codes_user_id_users_id_fk": {
+          "name": "verification_codes_user_id_users_id_fk",
+          "tableFrom": "verification_codes",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "watched": {
+      "name": "watched",
+      "columns": {
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "watch_percent": {
+          "name": "watch_percent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "watched_at": {
+          "name": "watched_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "watched_clip_user": {
+          "name": "watched_clip_user",
+          "columns": [
+            "clip_id",
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "watched_clip_id_clips_id_fk": {
+          "name": "watched_clip_id_clips_id_fk",
+          "tableFrom": "watched",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "watched_user_id_users_id_fk": {
+          "name": "watched_user_id_users_id_fk",
+          "tableFrom": "watched",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/src/lib/server/db/migrations/meta/_journal.json b/src/lib/server/db/migrations/meta/_journal.json
index ed74af1..2d36c23 100644
--- a/src/lib/server/db/migrations/meta/_journal.json
+++ b/src/lib/server/db/migrations/meta/_journal.json
@@ -148,6 +148,13 @@
       "when": 1772347099686,
       "tag": "0020_concerned_toad_men",
       "breakpoints": true
+    },
+    {
+      "idx": 21,
+      "version": "6",
+      "when": 1772404817972,
+      "tag": "0021_flaky_stature",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts
index 1cbfe98..67013ad 100644
--- a/src/lib/server/db/schema.ts
+++ b/src/lib/server/db/schema.ts
@@ -27,6 +27,7 @@ export const users = sqliteTable('users', {
 	themePreference: text('theme_preference').notNull().default('system'),
 	autoScroll: integer('auto_scroll', { mode: 'boolean' }).notNull().default(false),
 	mutedByDefault: integer('muted_by_default', { mode: 'boolean' }).notNull().default(true),
+	feedSortOrder: text('feed_sort_order').notNull().default('oldest'),
 	avatarPath: text('avatar_path'),
 	removedAt: integer('removed_at', { mode: 'timestamp' }),
 	createdAt: integer('created_at', { mode: 'timestamp' }).notNull()
diff --git a/src/lib/settingsApi.ts b/src/lib/settingsApi.ts
index bcc57ce..1353c0f 100644
--- a/src/lib/settingsApi.ts
+++ b/src/lib/settingsApi.ts
@@ -64,6 +64,12 @@ export async function saveMutedByDefault(value: boolean): Promise<void> {
 	await savePreference({ mutedByDefault: value });
 }
 
+// --- Feed sort ---
+
+export async function saveFeedSortOrder(value: 'oldest' | 'round-robin'): Promise<void> {
+	await savePreference({ feedSortOrder: value });
+}
+
 // --- Accent color ---
 
 export function applyAccentColor(key: AccentColorKey): void {
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 72d05d9..b1f26ba 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -17,6 +17,7 @@
 	import GearSixIcon from 'phosphor-svelte/lib/GearSixIcon';
 	const { children }: { children: Snippet } = $props();
 
+	let bottomTabsEl: HTMLElement | undefined = $state();
 	const isFeed = $derived(page.url.pathname === '/');
 	const isSettings = $derived(page.url.pathname === '/settings');
 
@@ -29,8 +30,21 @@
 		startPolling();
 		fetchGroupMembers();
 
-		// Tell fixed-position components (e.g. InstallBanner) about the bottom nav height
-		document.documentElement.style.setProperty('--bottom-nav-height', '80px');
+		// Measure actual bottom nav height and expose as CSS variable.
+		// This adapts to the real safe-area insets on each device instead of
+		// hardcoding 80px + env(safe-area-inset-bottom) everywhere.
+		const updateNavHeight = () => {
+			if (bottomTabsEl) {
+				const h = bottomTabsEl.offsetHeight;
+				document.documentElement.style.setProperty('--bottom-nav-height', `${h}px`);
+			}
+		};
+		const navObserver = new ResizeObserver(updateNavHeight);
+		if (bottomTabsEl) {
+			navObserver.observe(bottomTabsEl);
+			updateNavHeight();
+		}
+
 		// Initialize mute state from user preference
 		const user = page.data?.user;
 		if (user) {
@@ -57,6 +71,7 @@
 
 		return () => {
 			stopPolling();
+			navObserver.disconnect();
 			themeObserver.disconnect();
 			darkMq.removeEventListener('change', syncThemeColor);
 			document.documentElement.style.removeProperty('--bottom-nav-height');
@@ -110,7 +125,12 @@
 	<main class:immersive={isFeed}>
 		{@render children()}
 	</main>
-	<nav class="bottom-tabs" class:overlay-mode={isFeed} class:ui-hidden={isFeed && $feedUiHidden}>
+	<nav
+		class="bottom-tabs"
+		class:overlay-mode={isFeed}
+		class:ui-hidden={isFeed && $feedUiHidden}
+		bind:this={bottomTabsEl}
+	>
 		{#if isFeed}
 			<button class="tab active" onclick={() => homeTapSignal.update((n) => n + 1)}>
 				<HouseIcon size={24} weight="fill" />
@@ -253,7 +273,7 @@
 	main {
 		flex: 1;
 		padding: var(--space-lg) var(--space-sm);
-		padding-bottom: calc(80px + env(safe-area-inset-bottom));
+		padding-bottom: var(--bottom-nav-height, 64px);
 	}
 
 	main.immersive {
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 6cd0c5f..d66237f 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -21,7 +21,7 @@
 	import { onMount, onDestroy } from 'svelte';
 	import { page } from '$app/state';
 	import type { FeedClip } from '$lib/types';
-	import type { FeedFilter } from '$lib/feed';
+	import type { FeedFilter, FeedSort } from '$lib/feed';
 	import {
 		fetchClips,
 		fetchMoreClips,
@@ -37,6 +37,7 @@
 
 	let clips = $state<FeedClip[]>([]);
 	let filter = $state<FeedFilter>('unwatched');
+	let sort = $state<FeedSort>((page.data.user?.feedSortOrder as FeedSort) || 'oldest');
 	let loading = $state(true);
 	let activeIndex = $state(0);
 	let scrollContainer: HTMLDivElement | null = $state(null);
@@ -96,7 +97,7 @@
 		loading = true;
 		currentOffset = 0;
 		hasMore = true;
-		const data = await fetchClips(filter, PAGE_SIZE);
+		const data = await fetchClips(filter, PAGE_SIZE, sort);
 		if (data) {
 			clips = data.clips;
 			hasMore = data.hasMore;
@@ -110,7 +111,7 @@
 	async function loadMore() {
 		if (loadingMore || !hasMore || loading) return;
 		loadingMore = true;
-		const data = await fetchMoreClips(filter, currentOffset, PAGE_SIZE);
+		const data = await fetchMoreClips(filter, currentOffset, PAGE_SIZE, sort);
 		if (data) {
 			const existingIds = new Set(clips.map((c) => c.id));
 			const newClips = data.clips.filter((c) => !existingIds.has(c.id));
@@ -372,7 +373,7 @@
 	async function refresh() {
 		isRefreshing = true;
 		const previousIds = new Set(clips.map((c) => c.id));
-		const data = await fetchClips(filter, PAGE_SIZE);
+		const data = await fetchClips(filter, PAGE_SIZE, sort);
 		if (data) {
 			clips = data.clips;
 			hasMore = data.hasMore;
@@ -397,6 +398,40 @@
 		fetchUnwatchedCount();
 	}
 
+	// Intercept wheel events on the scroll container to enforce one-reel-at-a-time scrolling.
+	// Trackpad inertia generates a long stream of wheel events — we scroll once on the first
+	// event, then swallow everything until the events fully stop (200ms gap = gesture over).
+	$effect(() => {
+		if (!scrollContainer) return;
+		const el = scrollContainer;
+		let scrollLocked = false;
+		let idleTimer: ReturnType<typeof setTimeout> | null = null;
+
+		function handleWheel(e: WheelEvent) {
+			e.preventDefault();
+			if (clips.length === 0) return;
+
+			// Reset the idle timer on every event — unlock only after events stop
+			if (idleTimer) clearTimeout(idleTimer);
+			idleTimer = setTimeout(() => {
+				scrollLocked = false;
+			}, 200);
+
+			if (scrollLocked) return;
+			scrollLocked = true;
+			const direction = e.deltaY > 0 ? 1 : -1;
+			const target = activeIndex + direction;
+			if (target < 0 || target >= clips.length) return;
+			scrollToIndex(target);
+		}
+
+		el.addEventListener('wheel', handleWheel, { passive: false });
+		return () => {
+			el.removeEventListener('wheel', handleWheel);
+			if (idleTimer) clearTimeout(idleTimer);
+		};
+	});
+
 	$effect(() => {
 		if (!scrollContainer) return;
 		// eslint-disable-next-line sonarjs/void-use -- triggers $effect re-run when clips change
@@ -480,12 +515,25 @@
 		if (!targetClipId) return;
 		viewClipSignal.set(null);
 		(async () => {
-			filter = 'all' as FeedFilter;
+			// Fetch the target clip to determine its watched status
+			const targetClip = await fetchSingleClip(targetClipId);
+			const targetFilter: FeedFilter = targetClip?.watched ? 'watched' : 'unwatched';
+
+			filter = targetFilter;
 			currentOffset = 0;
 			hasMore = true;
-			const data = await fetchClips('all', PAGE_SIZE);
+			const data = await fetchClips(targetFilter, PAGE_SIZE, sort);
 			if (data) {
-				clips = data.clips;
+				// Ensure target clip is in the list (it may be beyond the first page)
+				const inPage = data.clips.some((c) => c.id === targetClipId);
+				if (inPage) {
+					clips = data.clips;
+				} else if (targetClip) {
+					// Prepend target clip and de-dupe from the rest
+					clips = [targetClip, ...data.clips.filter((c) => c.id !== targetClipId)];
+				} else {
+					clips = data.clips;
+				}
 				hasMore = data.hasMore;
 				currentOffset = data.clips.length;
 			}
@@ -773,15 +821,20 @@
 	}
 	.reel-scroll {
 		height: 100dvh;
-		overflow-y: scroll;
+		overflow-y: auto;
 		scroll-snap-type: y mandatory;
 		-webkit-overflow-scrolling: touch;
 		overscroll-behavior-y: none;
+		scrollbar-width: none;
+	}
+	.reel-scroll::-webkit-scrollbar {
+		display: none;
 	}
 	.reel-slot {
 		height: 100dvh;
 		width: 100%;
 		scroll-snap-align: start;
+		scroll-snap-stop: always;
 		position: relative;
 		overflow: hidden;
 	}
diff --git a/src/routes/(app)/settings/+page.svelte b/src/routes/(app)/settings/+page.svelte
index 5234390..ef994ae 100644
--- a/src/routes/(app)/settings/+page.svelte
+++ b/src/routes/(app)/settings/+page.svelte
@@ -11,12 +11,15 @@
 	import { type AccentColorKey } from '$lib/colors';
 	import { globalMuted } from '$lib/stores/mute';
 	import CameraIcon from 'phosphor-svelte/lib/CameraIcon';
+	import SortAscendingIcon from 'phosphor-svelte/lib/SortAscendingIcon';
+	import ShuffleIcon from 'phosphor-svelte/lib/ShuffleIcon';
 
 	import {
 		applyTheme,
 		saveThemePreference,
 		saveAutoScroll,
 		saveMutedByDefault,
+		saveFeedSortOrder,
 		applyAccentColor,
 		saveAccentColor,
 		fetchNotificationPrefs,
@@ -86,6 +89,7 @@
 	let themeOverride = $state<'system' | 'light' | 'dark' | null>(null);
 	let autoScrollOverride = $state<boolean | null>(null);
 	let mutedByDefaultOverride = $state<boolean | null>(null);
+	let feedSortOverride = $state<'oldest' | 'round-robin' | null>(null);
 	let currentAccentOverride = $state<AccentColorKey | null>(null);
 
 	const theme = $derived(
@@ -93,6 +97,10 @@
 	);
 	const autoScroll = $derived(autoScrollOverride ?? user?.autoScroll ?? false);
 	const mutedByDefault = $derived(mutedByDefaultOverride ?? user?.mutedByDefault ?? true);
+	const feedSort = $derived(
+		feedSortOverride ?? (user?.feedSortOrder as 'oldest' | 'round-robin') ?? 'oldest'
+	);
+	const feedSortIndex = $derived(feedSort === 'oldest' ? 0 : 1);
 	const currentAccent = $derived(
 		currentAccentOverride ?? (group?.accentColor as AccentColorKey) ?? 'coral'
 	);
@@ -150,6 +158,11 @@
 		saveMutedByDefault(newValue);
 	}
 
+	function handleFeedSortChange(value: 'oldest' | 'round-robin') {
+		feedSortOverride = value;
+		saveFeedSortOrder(value);
+	}
+
 	async function togglePush() {
 		pushLoading = true;
 		try {
@@ -292,6 +305,32 @@
 				</div>
 			</div>
 
+			<div class="settings-section">
+				<h3 class="section-title">Feed Order</h3>
+				<div class="card">
+					<div class="setting-row">
+						<div class="setting-label">
+							<span class="setting-desc">Choose how clips are sorted in your feed</span>
+						</div>
+					</div>
+					<div class="theme-toggle feed-sort-toggle">
+						<div class="theme-bg" style="transform: translateX({feedSortIndex * 100}%)"></div>
+						<button
+							class="theme-option"
+							class:active={feedSort === 'oldest'}
+							onclick={() => handleFeedSortChange('oldest')}
+							><SortAscendingIcon size={15} weight="bold" /> Oldest First</button
+						>
+						<button
+							class="theme-option"
+							class:active={feedSort === 'round-robin'}
+							onclick={() => handleFeedSortChange('round-robin')}
+							><ShuffleIcon size={15} weight="bold" /> Mix Members</button
+						>
+					</div>
+				</div>
+			</div>
+
 			<div class="settings-section">
 				<h3 class="section-title">Notifications</h3>
 				<div class="card">
@@ -439,7 +478,7 @@
 	.settings-page {
 		max-width: 520px;
 		margin: 0 auto;
-		padding-bottom: calc(80px + env(safe-area-inset-bottom, 0px));
+		padding-bottom: var(--bottom-nav-height, 64px);
 	}
 
 	.tab-bar {
@@ -616,6 +655,17 @@
 		z-index: 0;
 	}
 
+	.feed-sort-toggle .theme-bg {
+		width: calc(50% - 3px);
+	}
+
+	.feed-sort-toggle .theme-option {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 5px;
+	}
+
 	.theme-option {
 		flex: 1;
 		padding: var(--space-sm) var(--space-md);
diff --git a/src/routes/api/__tests__/clips.test.ts b/src/routes/api/__tests__/clips.test.ts
index 7ec4505..a90ab2c 100644
--- a/src/routes/api/__tests__/clips.test.ts
+++ b/src/routes/api/__tests__/clips.test.ts
@@ -52,7 +52,7 @@ describe('GET /api/clips', () => {
 		expect(body.error).toBeDefined();
 	});
 
-	it('returns clips for the user group', async () => {
+	it('returns ready clips for the user group', async () => {
 		const event = createMockEvent({
 			method: 'GET',
 			path: '/api/clips',
@@ -64,9 +64,9 @@ describe('GET /api/clips', () => {
 		const body = await res.json();
 		expect(body.clips).toBeInstanceOf(Array);
 		expect(body.clips.length).toBeGreaterThanOrEqual(2);
-		// Both seed clips belong to the same group
 		const ids = body.clips.map((c: any) => c.id);
-		expect(ids).toContain(data.clip.id);
+		// Only ready clips appear in the feed (downloading clips are excluded)
+		expect(ids).not.toContain(data.clip.id);
 		expect(ids).toContain(data.readyClip.id);
 	});
 
@@ -286,6 +286,11 @@ describe('POST /api/clips', () => {
 		expect(res.status).toBe(201);
 		const body = await res.json();
 
+		// Simulate download completion — feed only returns ready clips
+		const { clips } = await import('$lib/server/db/schema');
+		const { eq } = await import('drizzle-orm');
+		db.update(clips).set({ status: 'ready' }).where(eq(clips.id, body.clip.id)).run();
+
 		// Verify the clip shows as watched when fetching clips for this user
 		const getEvent = createMockEvent({
 			method: 'GET',
diff --git a/src/routes/api/clips/+server.ts b/src/routes/api/clips/+server.ts
index 6a5c5d3..101fb2d 100644
--- a/src/routes/api/clips/+server.ts
+++ b/src/routes/api/clips/+server.ts
@@ -9,7 +9,7 @@ import {
 	reactions,
 	comments
 } from '$lib/server/db/schema';
-import { eq, desc, and, inArray } from 'drizzle-orm';
+import { eq, asc, and, inArray } from 'drizzle-orm';
 import {
 	isSupportedUrl,
 	detectPlatform,
@@ -37,6 +37,7 @@ import { createLogger } from '$lib/server/logger';
 const log = createLogger('clips');
 
 const VALID_FILTERS = ['unwatched', 'watched', 'favorites'] as const;
+const VALID_SORTS = ['oldest', 'round-robin'] as const;
 
 function countByClipId(items: { clipId: string }[], clipIds: Set<string>): Map<string, number> {
 	const counts = new Map<string, number>();
@@ -64,11 +65,56 @@ function countUnreadComments(
 	return counts;
 }
 
+type ClipRow = Awaited<ReturnType<typeof db.query.clips.findMany>>[number];
+
+function applySortOrder(
+	clipList: ClipRow[],
+	sort: string,
+	filter: string | null,
+	watchedRows: { clipId: string; watchedAt: Date }[]
+): ClipRow[] {
+	if (filter === 'watched') {
+		// Watched tab: always sort by most-recently-watched
+		const watchedAtMap = new Map(watchedRows.map((w) => [w.clipId, w.watchedAt.getTime()]));
+		return [...clipList].sort(
+			(a, b) => (watchedAtMap.get(b.id) ?? 0) - (watchedAtMap.get(a.id) ?? 0)
+		);
+	}
+	if (sort === 'round-robin') {
+		// Group clips by member, each group already in createdAt asc order
+		const byMember = new Map<string, ClipRow[]>();
+		for (const clip of clipList) {
+			const list = byMember.get(clip.addedBy) || [];
+			list.push(clip);
+			byMember.set(clip.addedBy, list);
+		}
+		// Interleave: pick oldest from each member in rotation
+		const queues = [...byMember.values()].map((list) => ({ items: list, idx: 0 }));
+		const interleaved: ClipRow[] = [];
+		let remaining = clipList.length;
+		while (remaining > 0) {
+			for (const q of queues) {
+				if (q.idx < q.items.length) {
+					interleaved.push(q.items[q.idx++]);
+					remaining--;
+				}
+			}
+		}
+		return interleaved;
+	}
+	// 'oldest': already sorted by createdAt asc from the DB query
+	return clipList;
+}
+
 export const GET: RequestHandler = withAuth(async ({ url }, { user }) => {
 	const filter = url.searchParams.get('filter');
 	if (filter && !(VALID_FILTERS as readonly string[]).includes(filter)) {
 		return badRequest('Invalid filter. Must be unwatched, watched, or favorites');
 	}
+	const sort = url.searchParams.get('sort') || 'oldest';
+	if (!(VALID_SORTS as readonly string[]).includes(sort)) {
+		return badRequest('Invalid sort. Must be oldest or round-robin');
+	}
 	const limit = safeInt(url.searchParams.get('limit'), 20, 50);
 	const offset = safeInt(url.searchParams.get('offset'), 0);
 	const groupId = user.groupId;
@@ -76,8 +122,8 @@ export const GET: RequestHandler = withAuth(async ({ url }, { user }) => {
 
 	// Get all clips for the group
 	let allClips = await db.query.clips.findMany({
-		where: eq(clips.groupId, groupId),
-		orderBy: [desc(clips.createdAt)]
+		where: and(eq(clips.groupId, groupId), eq(clips.status, 'ready')),
+		orderBy: [asc(clips.createdAt)]
 	});
 
 	// Get watched and favorited clip IDs for this user
@@ -100,6 +146,8 @@ export const GET: RequestHandler = withAuth(async ({ url }, { user }) => {
 		allClips = allClips.filter((c) => favIds.has(c.id));
 	}
 
+	allClips = applySortOrder(allClips, sort, filter, watchedRows);
+
 	const total = allClips.length;
 	const paginatedClips = allClips.slice(offset, offset + limit);
 	const clipIds = paginatedClips.map((c) => c.id);
diff --git a/src/routes/api/profile/preferences/+server.ts b/src/routes/api/profile/preferences/+server.ts
index 99f6f54..cd83356 100644
--- a/src/routes/api/profile/preferences/+server.ts
+++ b/src/routes/api/profile/preferences/+server.ts
@@ -12,6 +12,7 @@ function validateUsername(body: Record<string, unknown>): { value: string } | {
 }
 
 const VALID_THEMES = ['system', 'light', 'dark'];
+const VALID_SORT_ORDERS = ['oldest', 'round-robin'];
 
 export const POST: RequestHandler = withAuth(async ({ request }, { user }) => {
 	const body = await parseBody<Record<string, unknown>>(request);
@@ -40,6 +41,13 @@ export const POST: RequestHandler = withAuth(async ({ request }, { user }) => {
 		updates.mutedByDefault = body.mutedByDefault;
 	}
 
+	if ('feedSortOrder' in body) {
+		if (!VALID_SORT_ORDERS.includes(body.feedSortOrder as string)) {
+			return json({ error: 'Invalid feed sort order' }, { status: 400 });
+		}
+		updates.feedSortOrder = body.feedSortOrder;
+	}
+
 	if (Object.keys(updates).length === 0) {
 		return json({ error: 'No valid preferences provided' }, { status: 400 });
 	}
diff --git a/src/routes/api/push/test/+server.ts b/src/routes/api/push/test/+server.ts
new file mode 100644
index 0000000..b30b676
--- /dev/null
+++ b/src/routes/api/push/test/+server.ts
@@ -0,0 +1,30 @@
+import { json } from '@sveltejs/kit';
+import type { RequestHandler } from './$types';
+import { withAuth } from '$lib/server/api-utils';
+import { sendNotification } from '$lib/server/push';
+import { db } from '$lib/server/db';
+import { pushSubscriptions } from '$lib/server/db/schema';
+import { eq } from 'drizzle-orm';
+
+export const POST: RequestHandler = withAuth(async (_event, { user }) => {
+	const subs = await db.query.pushSubscriptions.findMany({
+		where: eq(pushSubscriptions.userId, user.id)
+	});
+
+	if (subs.length === 0) {
+		return json({ error: 'No push subscriptions found' }, { status: 400 });
+	}
+
+	// Wait 10 seconds server-side so the notification arrives even if the user
+	// locks their phone or navigates away
+	await new Promise((resolve) => setTimeout(resolve, 10_000));
+
+	await sendNotification(user.id, {
+		title: 'Test notification',
+		body: 'Push notifications are working!',
+		tag: 'test-notification',
+		url: '/settings'
+	});
+
+	return json({ sent: true, sentAt: Date.now() });
+});
diff --git a/src/routes/join/+page.svelte b/src/routes/join/+page.svelte
index d3bc5ec..29fc981 100644
--- a/src/routes/join/+page.svelte
+++ b/src/routes/join/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	/* eslint-disable max-lines */
 	import { env } from '$env/dynamic/public';
-	import iconUrl from '$lib/assets/icon.svg?url';
+	import iconSvg from '$lib/assets/icon.svg?raw';
 	import InlineError from '$lib/components/InlineError.svelte';
 	import ArrowRightIcon from 'phosphor-svelte/lib/ArrowRightIcon';
 	import { rawDigits, formatPhone, toE164 } from '$lib/phone';
@@ -152,7 +152,8 @@
 
 	<div class="content">
 		<div class="brand">
-			<img src={iconUrl} alt="scrolly" class="brand-logo" />
+			<!-- eslint-disable-next-line svelte/no-at-html-tags -- trusted local SVG asset -->
+			<div class="brand-logo" aria-label="scrolly">{@html iconSvg}</div>
 			<h1>scrolly</h1>
 			<p class="tagline">your crew's <span class="tagline-accent">private</span> feed</p>
 		</div>
@@ -343,6 +344,12 @@
 		width: 72px;
 		height: 72px;
 		margin-bottom: var(--space-lg);
+		color: var(--accent-primary);
+	}
+
+	.brand-logo :global(svg) {
+		width: 100%;
+		height: 100%;
 	}
 
 	h1 {
diff --git a/src/routes/share/setup/+page.svelte b/src/routes/share/setup/+page.svelte
index 653400b..7e604d6 100644
--- a/src/routes/share/setup/+page.svelte
+++ b/src/routes/share/setup/+page.svelte
@@ -54,6 +54,8 @@
 	const isUnreachable = $derived(
 		validationWarnings.some((w) => UNREACHABLE_CODES.includes(w.code))
 	);
+	const softWarnings = $derived(validationWarnings.filter((w) => SOFT_CODES.includes(w.code)));
+	const hasSoftOnly = $derived(softWarnings.length > 0 && blockers.length === 0 && !isUnreachable);
 	const hasBlockers = $derived(blockers.length > 0);
 	const hasExtraPrompts = $derived(blockers.some((w) => w.code === 'extra_prompts'));
 	const hasTrailingSlash = $derived(blockers.some((w) => w.code === 'trailing_slash'));
@@ -113,11 +115,8 @@
 				shortcutName = data.name ?? null;
 				validated = true;
 
-				// Auto-save when clean or only soft warnings (bad_name) — name is not critical
-				if (
-					validationWarnings.length === 0 ||
-					validationWarnings.every((w: { code: string }) => SOFT_CODES.includes(w.code))
-				) {
+				// Auto-save only when fully clean — soft warnings are shown but don't block
+				if (validationWarnings.length === 0) {
 					await doSave(url);
 				}
 			} else {
@@ -441,8 +440,21 @@
 								{validating ? 'Validating…' : 'Re-validate'}
 							</button>
 						</div>
-					{:else}
-						<!-- Only soft warnings (e.g. bad name) — already auto-saved -->
+					{:else if hasSoftOnly}
+						{#each softWarnings as warning (warning.code + warning.message)}
+							<div class="validation-soft">
+								<WarningIcon size={16} weight="fill" />
+								<!-- eslint-disable-next-line svelte/no-at-html-tags -- server-generated, no user input -->
+								<span>{@html warning.message}</span>
+							</div>
+						{/each}
+						<button
+							class="save-link-btn"
+							onclick={() => doSave(icloudLink.trim())}
+							disabled={savingLink}
+						>
+							{savingLink ? 'Saving…' : 'Save Anyway'}
+						</button>
 					{/if}
 				</div>
 			{/if}
@@ -786,6 +798,29 @@
 		color: var(--text-primary);
 		font-weight: 600;
 	}
+	.validation-soft {
+		display: flex;
+		align-items: flex-start;
+		gap: var(--space-sm);
+		padding: var(--space-sm) var(--space-md);
+		background: color-mix(in srgb, var(--warning) 8%, transparent);
+		border: 1px solid color-mix(in srgb, var(--warning) 20%, transparent);
+		border-radius: var(--radius-sm);
+	}
+	.validation-soft :global(svg) {
+		flex-shrink: 0;
+		color: var(--warning);
+		margin-top: 2px;
+	}
+	.validation-soft span {
+		font-size: 0.9375rem;
+		color: var(--text-secondary);
+		line-height: 1.5;
+	}
+	.validation-soft span :global(b) {
+		color: var(--text-primary);
+		font-weight: 600;
+	}
 	.blocker-link {
 		display: inline;
 		background: none;
diff --git a/src/service-worker.ts b/src/service-worker.ts
index ace8ab8..572eec2 100644
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -88,8 +88,8 @@ sw.addEventListener('push', (event) => {
 
 	const notificationOptions: NotificationOptions & { image?: string } = {
 		body: body || '',
-		icon: icon || '/icons/icon-192.png',
-		badge: '/icons/badge-72.png',
+		icon: icon || '/icon/icon-192.svg',
+		badge: '/icon/badge-72.svg',
 		tag: tag || undefined,
 		data: { url: url || '/' }
 	};
diff --git a/tests/helpers/seed.ts b/tests/helpers/seed.ts
index bbe3bdf..b0e8878 100644
--- a/tests/helpers/seed.ts
+++ b/tests/helpers/seed.ts
@@ -20,6 +20,7 @@ export async function seed(db: TestDb): Promise<SeedResult> {
 	const otherUserId = uuid();
 	const clipId = uuid();
 	const readyClipId = uuid();
+	const readyClip2Id = uuid();
 	const now = new Date();
 
 	db.insert(schema.groups)
@@ -98,6 +99,20 @@ export async function seed(db: TestDb): Promise<SeedResult> {
 				title: 'Test Video',
 				durationSeconds: 30,
 				createdAt: new Date(now.getTime() - 60000)
+			},
+			{
+				id: readyClip2Id,
+				groupId,
+				addedBy: memberId,
+				originalUrl: 'https://www.youtube.com/shorts/789',
+				platform: 'youtube',
+				contentType: 'video',
+				status: 'ready',
+				videoPath: 'videos/test-video-2.mp4',
+				thumbnailPath: 'videos/test-thumb-2.jpg',
+				title: 'Another Video',
+				durationSeconds: 15,
+				createdAt: new Date(now.getTime() - 30000)
 			}
 		])
 		.run();