diff --git a/frontend/src/lib/components/schema/SchemaPickerRow.svelte b/frontend/src/lib/components/schema/SchemaPickerRow.svelte
index 00ac82fee9d59..bf287f6bdd557 100644
--- a/frontend/src/lib/components/schema/SchemaPickerRow.svelte
+++ b/frontend/src/lib/components/schema/SchemaPickerRow.svelte
@@ -54,6 +54,8 @@
 			day: 'numeric'
 		}).format(date)
 	}
+
+	$: hovering ? dispatch('hover', true) : dispatch('hover', false)
 </script>
 
 <Row
diff --git a/frontend/src/lib/components/triggers/CaptureSection.svelte b/frontend/src/lib/components/triggers/CaptureSection.svelte
index ebd2fb916c0a9..c0c806603391a 100644
--- a/frontend/src/lib/components/triggers/CaptureSection.svelte
+++ b/frontend/src/lib/components/triggers/CaptureSection.svelte
@@ -59,12 +59,14 @@
 						color="light"
 						btnClasses={captureInfo.active ? 'text-blue-500 hover:text-blue-500' : ''}
 					>
-						{#if captureInfo.active}
-							<CircleStop />
-						{:else}
-							<CaptureIcon variant="redDot" />
-						{/if}
-						{captureInfo.active ? 'Stop' : 'Start capturing'}
+						<div class="flex flex-row items-center gap-1 w-28 justify-center">
+							{#if captureInfo.active}
+								<CircleStop size={14} />
+							{:else}
+								<CaptureIcon variant="redDot" size={14} />
+							{/if}
+							{captureInfo.active ? 'Stop' : 'Start capturing'}
+						</div>
 					</Button>
 				</AnimatedButton>
 
diff --git a/frontend/src/lib/components/triggers/CaptureTable.svelte b/frontend/src/lib/components/triggers/CaptureTable.svelte
index db030bd03a48c..45c671f160045 100644
--- a/frontend/src/lib/components/triggers/CaptureTable.svelte
+++ b/frontend/src/lib/components/triggers/CaptureTable.svelte
@@ -31,8 +31,10 @@
 	export let hideCapturesWhenEmpty = false
 	export let canEdit = false
 	export let captureActive = false
+
 	let captures: Capture[] = []
 	let selected: number | undefined = undefined
+	let hovered: number | undefined = undefined
 	let testKind: 'preprocessor' | 'main' = 'main'
 	let hasMore = false
 	let page = 1
@@ -74,6 +76,7 @@
 
 	let hasAlreadyFailed = false
 	export async function loadCaptures(refresh?: boolean) {
+		console.log('dbg: loadCaptures', refresh)
 		hasMore = false
 
 		try {
@@ -94,6 +97,7 @@
 			} else {
 				if (refresh) {
 					captures = newCaptures
+					page = 1
 				} else {
 					captures = [...captures, ...newCaptures]
 				}
@@ -215,16 +219,16 @@
 											...payload,
 											...triggerExtra
 									  }
-									: payload}
+									: { ...payload }}
 							{@const captureIcon = captureKindToIcon[capture.trigger_kind]}
 							<SchemaPickerRow
 								date={capture.created_at}
 								{payloadData}
 								on:updateSchema
-								on:applyArgs
 								on:addPreprocessor
 								on:select={() => handleSelect(capture)}
 								selected={selected === capture.id}
+								on:hover={(e) => (hovered = e.detail ? capture.id : undefined)}
 							>
 								<svelte:fragment slot="start">
 									<div class="center-center">
@@ -268,7 +272,9 @@
 											{:else}
 												<Button
 													size="xs2"
-													color="dark"
+													color={hovered === capture.id || selected === capture.id
+														? 'dark'
+														: 'light'}
 													dropdownItems={[
 														{
 															label: 'Use as input schema',
@@ -286,6 +292,7 @@
 														if (isFlow && testKind === 'main') {
 															dispatch('testWithArgs', payloadData)
 														} else {
+															console.log('dbg: applyArgs from table', payloadData)
 															dispatch('applyArgs', {
 																kind: testKind,
 																args: payloadData