diff --git a/frontend/src/lib/components/OcrTrainingCard.svelte b/frontend/src/lib/components/OcrTrainingCard.svelte
index eb48d3ec..28036fba 100644
--- a/frontend/src/lib/components/OcrTrainingCard.svelte
+++ b/frontend/src/lib/components/OcrTrainingCard.svelte
@@ -82,7 +82,7 @@ async function startTraining() {
 			{successMessage}
 			<button
 				type="button"
-				class="underline hover:no-underline"
+				class="ml-1 inline-flex h-6 w-6 items-center justify-center rounded-sm underline hover:no-underline focus-visible:ring-2 focus-visible:ring-brand-navy focus-visible:outline-none"
 				onclick={() => (successMessage = null)}
 				aria-label={m.comp_dismiss()}>×</button
 			>
diff --git a/frontend/src/lib/components/TrainingHistory.svelte b/frontend/src/lib/components/TrainingHistory.svelte
index 744e6841..5d5cabed 100644
--- a/frontend/src/lib/components/TrainingHistory.svelte
+++ b/frontend/src/lib/components/TrainingHistory.svelte
@@ -146,7 +146,7 @@ function formatCer(cer: number | undefined | null): string {
 			type="button"
 			aria-expanded={expanded}
 			aria-controls="training-history-rows"
-			class="text-xs font-medium text-ink-3 transition-colors hover:text-ink"
+			class="rounded-sm py-2 text-xs font-medium text-ink-3 transition-colors hover:text-ink focus-visible:ring-2 focus-visible:ring-brand-navy focus-visible:ring-offset-1 focus-visible:outline-none"
 			onclick={() => (expanded = !expanded)}
 		>
 			{expanded ? m.comp_expandable_show_less() : m.comp_expandable_show_more()}
diff --git a/frontend/src/lib/components/TrainingHistory.svelte.spec.ts b/frontend/src/lib/components/TrainingHistory.svelte.spec.ts
index aa212393..d75bb124 100644
--- a/frontend/src/lib/components/TrainingHistory.svelte.spec.ts
+++ b/frontend/src/lib/components/TrainingHistory.svelte.spec.ts
@@ -51,6 +51,15 @@ describe('TrainingHistory — expand/collapse', () => {
 	});
 });
 
+describe('TrainingHistory — status badges', () => {
+	it('shows amber QUEUED badge for queued runs', async () => {
+		const run = { ...makeRun(0), status: 'QUEUED' as const };
+		render(TrainingHistory, { runs: [run] });
+
+		await expect.element(page.getByText(/Warteschlange/i)).toBeInTheDocument();
+	});
+});
+
 describe('TrainingHistory — type and person columns', () => {
 	it('shows "Basis" for runs without personId', async () => {
 		render(TrainingHistory, { runs: [makeRun(0)] });