diff --git a/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx b/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx
index 76780483a..8a9fc8cfa 100644
--- a/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx
+++ b/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx
@@ -46,37 +46,42 @@ export default function TournamentFinalizePage() {
 			onCloseTo={bracketUrl}
 			heading={t("tournament:actions.finalize")}
 		>
-			<FinalizeForm
-				error={badgesError}
-				isAssigningBadges={!isAssignLaterSelected && tournamentHasBadges}
-			>
-				{tournamentHasBadges ? (
-					<>
-						<SendouSwitch
-							isSelected={isAssignLaterSelected}
-							onChange={setIsAssignLaterSelected}
-							data-testid="assign-badges-later-switch"
-						>
-							{t("tournament:actions.finalize.assignBadgesLater")}
-						</SendouSwitch>
-						{!isAssignLaterSelected ? (
-							<>
-								<input
-									type="hidden"
-									name="badgeReceivers"
-									value={JSON.stringify(badgeReceivers)}
-								/>
-								<NewBadgeReceiversSelector
-									badges={data.badges}
-									standings={data.standings}
-									badgeReceivers={badgeReceivers}
-									setBadgeReceivers={setBadgeReceivers}
-								/>
-							</>
-						) : null}
-					</>
-				) : null}
-			</FinalizeForm>
+			<div className="stack md">
+				<FormMessage type="info">
+					{t("tournament:actions.finalize.notice")}
+				</FormMessage>
+				<FinalizeForm
+					error={badgesError}
+					isAssigningBadges={!isAssignLaterSelected && tournamentHasBadges}
+				>
+					{tournamentHasBadges ? (
+						<>
+							<SendouSwitch
+								isSelected={isAssignLaterSelected}
+								onChange={setIsAssignLaterSelected}
+								data-testid="assign-badges-later-switch"
+							>
+								{t("tournament:actions.finalize.assignBadgesLater")}
+							</SendouSwitch>
+							{!isAssignLaterSelected ? (
+								<>
+									<input
+										type="hidden"
+										name="badgeReceivers"
+										value={JSON.stringify(badgeReceivers)}
+									/>
+									<NewBadgeReceiversSelector
+										badges={data.badges}
+										standings={data.standings}
+										badgeReceivers={badgeReceivers}
+										setBadgeReceivers={setBadgeReceivers}
+									/>
+								</>
+							) : null}
+						</>
+					) : null}
+				</FinalizeForm>
+			</div>
 		</SendouDialog>
 	);
 }
diff --git a/app/features/tournament-bracket/routes/to.$id.brackets.tsx b/app/features/tournament-bracket/routes/to.$id.brackets.tsx
index 50a4aa2f5..b237d1b60 100644
--- a/app/features/tournament-bracket/routes/to.$id.brackets.tsx
+++ b/app/features/tournament-bracket/routes/to.$id.brackets.tsx
@@ -1,5 +1,5 @@
 import { sub } from "date-fns";
-import { Check, Eye, EyeOff, Map as MapIcon } from "lucide-react";
+import { Check, Eye, EyeOff, Map as MapIcon, Stamp } from "lucide-react";
 import * as React from "react";
 import { ErrorBoundary } from "react-error-boundary";
 import { useTranslation } from "react-i18next";
@@ -168,17 +168,6 @@ export default function TournamentBracketsPage() {
 	return (
 		<div>
 			<Outlet context={ctx} />
-			{tournament.canFinalize(user) ? (
-				<div className={styles.finalize}>
-					<LinkButton
-						variant="minimal"
-						testId="finalize-tournament-button"
-						to="finalize"
-					>
-						{t("tournament:actions.finalize.question")}
-					</LinkButton>
-				</div>
-			) : null}
 			{bracket.preview &&
 			bracket.enoughTeams &&
 			tournament.isOrganizer(user) &&
@@ -223,6 +212,15 @@ export default function TournamentBracketsPage() {
 				{bracket.type !== "round_robin" && !bracket.preview ? (
 					<CompactifyButton />
 				) : null}
+				{tournament.canFinalize(user) ? (
+					<LinkButton
+						to="finalize"
+						testId="finalize-tournament-button"
+						icon={<Stamp />}
+					>
+						{t("tournament:actions.finalize.button")}
+					</LinkButton>
+				) : null}
 				{showPrepareMapsButton ? (
 					// Error Boundary because preparing maps is optional, so no need to make the whole page inaccessible if it fails
 					<ErrorBoundary fallback={null}>
diff --git a/app/features/tournament-bracket/tournament-bracket.module.css b/app/features/tournament-bracket/tournament-bracket.module.css
index 30922cc30..ae25d6968 100644
--- a/app/features/tournament-bracket/tournament-bracket.module.css
+++ b/app/features/tournament-bracket/tournament-bracket.module.css
@@ -1,12 +1,3 @@
-.finalize {
-	font-size: var(--font-sm);
-	margin-block-end: var(--s-4);
-	display: flex;
-	gap: var(--s-1);
-	flex-wrap: wrap;
-	justify-content: center;
-}
-
 .miniAlert {
 	background-color: var(--color-info-low);
 	font-size: var(--font-2xs);
diff --git a/locales/da/tournament.json b/locales/da/tournament.json
index b9368a8d0..42e20044c 100644
--- a/locales/da/tournament.json
+++ b/locales/da/tournament.json
@@ -78,7 +78,8 @@
 	"actions.sub.prompt_other": "Du kan stadigvæk tilføje {{count}} Suppleanter til din holdliste",
 	"actions.sub.prompt_zero": "Din holdliste er fuld, så du kan ikke tilføje flere Suppleanter",
 	"actions.finalize": "",
-	"actions.finalize.question": "Når du har undersøgt, om de indrapporterede resultater er korrekte, så tryk her for at afslutte turneringen og bearbejd resultaterne.",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Afslut",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/de/tournament.json b/locales/de/tournament.json
index e4f3cae9f..02cc4e9e0 100644
--- a/locales/de/tournament.json
+++ b/locales/de/tournament.json
@@ -78,7 +78,8 @@
 	"actions.sub.prompt_other": "Du kannst noch {{count}} Ersatzspieler zu deinem Roster hinzufügen",
 	"actions.sub.prompt_zero": "Dein Roster ist voll und keine weiteren Ersatzspieler können hinzugefügt werden",
 	"actions.finalize": "",
-	"actions.finalize.question": "Sobald du überprüft hast, dass die gemeldeten Ergebnisse korrekt sind, klicke hier, um das Turnier zu finalisieren und die Endergebnisse zu verarbeiten",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Finalisieren",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/en/tournament.json b/locales/en/tournament.json
index 7f056f285..98d33363c 100644
--- a/locales/en/tournament.json
+++ b/locales/en/tournament.json
@@ -78,7 +78,8 @@
 	"actions.sub.prompt_one": "You can still add {{count}} sub to your roster",
 	"actions.sub.prompt_zero": "Your roster is full and more subs can't be added",
 	"actions.finalize": "Finalizing tournament",
-	"actions.finalize.question": "When you have checked that reported scores are correct click here to finalize the tournament and process results",
+	"actions.finalize.button": "Finalize tournament",
+	"actions.finalize.notice": "Check that all scores are correct. After tournament is finalized they can no longer be changed.",
 	"actions.finalize.action": "Finalize",
 	"actions.finalize.action.withBadges": "Finalize & assign badges",
 	"actions.finalize.info": "This action can't be undone. Please ensure that all reported matches are correct before proceeding.",
diff --git a/locales/es-ES/tournament.json b/locales/es-ES/tournament.json
index d33287a90..b4594d5ae 100644
--- a/locales/es-ES/tournament.json
+++ b/locales/es-ES/tournament.json
@@ -80,7 +80,8 @@
 	"actions.sub.prompt_other": "Aún puedes añadir {{count}} subs a tu equipo",
 	"actions.sub.prompt_zero": "Tu equipo está lleno y no puedes añadir más subs",
 	"actions.finalize": "Finalizando torneo",
-	"actions.finalize.question": "Al verificar que los resultados presentados son correctos, haz click aquí para finalizar el torneo y procesar los resultados",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Finalizar",
 	"actions.finalize.action.withBadges": "Finalizar y asignar insignias",
 	"actions.finalize.info": "Esta acción no se puede deshacer. Asegúrate de que todos los resultados reportados son correctos antes de continuar.",
diff --git a/locales/es-US/tournament.json b/locales/es-US/tournament.json
index b635e67fb..86df49960 100644
--- a/locales/es-US/tournament.json
+++ b/locales/es-US/tournament.json
@@ -80,7 +80,8 @@
 	"actions.sub.prompt_other": "Aún puedes añadir {{count}} subs a tu equipo",
 	"actions.sub.prompt_zero": "Tu equipo está lleno y no puedes añadir más subs",
 	"actions.finalize": "",
-	"actions.finalize.question": "Al verificar que los resultados presentados son correctos, haz click aquí para finalizar el torneo y procesar los resultados",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Finalizar",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/fr-CA/tournament.json b/locales/fr-CA/tournament.json
index 8bddfb9b0..e6fc2f0f2 100644
--- a/locales/fr-CA/tournament.json
+++ b/locales/fr-CA/tournament.json
@@ -80,7 +80,8 @@
 	"actions.sub.prompt_other": "Vous pouvez encore ajouter {{count}} remplaçants à votre liste",
 	"actions.sub.prompt_zero": "Votre liste est pleine, des remplaçant supplémentaires ne peuvent être ajoutés",
 	"actions.finalize": "",
-	"actions.finalize.question": "Lorsque vous avez vérifié que les scores indiqués sont corrects, cliquez ici pour finaliser le tournoi et traiter les résultats",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Finaliser",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/fr-EU/tournament.json b/locales/fr-EU/tournament.json
index 508c7e09f..beac51f93 100644
--- a/locales/fr-EU/tournament.json
+++ b/locales/fr-EU/tournament.json
@@ -80,7 +80,8 @@
 	"actions.sub.prompt_other": "Vous pouvez encore ajouter {{count}} remplaçants à votre liste",
 	"actions.sub.prompt_zero": "Votre liste est pleine, des remplaçant supplémentaires ne peuvent être ajoutés",
 	"actions.finalize": "",
-	"actions.finalize.question": "Lorsque vous avez vérifié que les scores indiqués sont corrects, cliquez ici pour finaliser le tournoi et traiter les résultats",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Finaliser",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/he/tournament.json b/locales/he/tournament.json
index b02d130ae..ee747f56e 100644
--- a/locales/he/tournament.json
+++ b/locales/he/tournament.json
@@ -80,7 +80,8 @@
 	"actions.sub.prompt_other": "אתם עדיין יכולים להוסיף {{count}} ממלאי מקום לצוות שלכם",
 	"actions.sub.prompt_zero": "הצוות שלכם מלא ולא ניתן להוסיף עוד ממלאי מקום",
 	"actions.finalize": "",
-	"actions.finalize.question": "לאחר שבדקתם שהתוצאות נכונות, לחצו כאן כדי לסיים את הטורניר ולנתח את התוצאות",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "סיימו",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/it/tournament.json b/locales/it/tournament.json
index a96e7f5cd..f5fea2afd 100644
--- a/locales/it/tournament.json
+++ b/locales/it/tournament.json
@@ -80,7 +80,8 @@
 	"actions.sub.prompt_other": "Puoi ancora aggiungere {{count}} sub al tuo roster",
 	"actions.sub.prompt_zero": "Il tuo roster è completo e non è possibile aggiungere altri sub",
 	"actions.finalize": "",
-	"actions.finalize.question": "Quando hai verificato che i punteggi riportati sono corretti, clicca qui per finalizzare il torneo e processare i risultati",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Finalizza",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/ja/tournament.json b/locales/ja/tournament.json
index fdee31ba3..6ec91d683 100644
--- a/locales/ja/tournament.json
+++ b/locales/ja/tournament.json
@@ -74,7 +74,8 @@
 	"actions.shareLink": "メンバー招待リンクをシェアする: {{inviteLink}}",
 	"actions.sub.prompt_zero": "メンバーが上限に達しているので、これ以上サブを追加することができません",
 	"actions.finalize": "",
-	"actions.finalize.question": "報告されたスコアが正しいかどうかをチェックしたら、ここをクリックしてトーナメント内容を確定・結果処理をおこないます",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "トーナメント結果確定",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/ko/tournament.json b/locales/ko/tournament.json
index e515476e5..1edda52a1 100644
--- a/locales/ko/tournament.json
+++ b/locales/ko/tournament.json
@@ -74,7 +74,8 @@
 	"actions.shareLink": "",
 	"actions.sub.prompt_zero": "",
 	"actions.finalize": "",
-	"actions.finalize.question": "",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/nl/tournament.json b/locales/nl/tournament.json
index f4100dcc2..0f8607a0c 100644
--- a/locales/nl/tournament.json
+++ b/locales/nl/tournament.json
@@ -78,7 +78,8 @@
 	"actions.sub.prompt_other": "",
 	"actions.sub.prompt_zero": "",
 	"actions.finalize": "",
-	"actions.finalize.question": "",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/pl/tournament.json b/locales/pl/tournament.json
index d51b15db7..686d52697 100644
--- a/locales/pl/tournament.json
+++ b/locales/pl/tournament.json
@@ -82,7 +82,8 @@
 	"actions.sub.prompt_other": "",
 	"actions.sub.prompt_zero": "",
 	"actions.finalize": "",
-	"actions.finalize.question": "",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/pt-BR/tournament.json b/locales/pt-BR/tournament.json
index 7c7f2e65b..34f9f53f8 100644
--- a/locales/pt-BR/tournament.json
+++ b/locales/pt-BR/tournament.json
@@ -80,7 +80,8 @@
 	"actions.sub.prompt_other": "Você ainda pode adicionar {{count}} substitutos(as) à sua lista",
 	"actions.sub.prompt_zero": "Sua lista está cheia e mais nenhum(a) substituto(a) pode ser adicionado(a)",
 	"actions.finalize": "",
-	"actions.finalize.question": "Quando você verificar que as pontuações e resultados declarados estão corretos, clique aqui para finalizar o torneio e processar os resultados",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Finalizar Torneio",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/ru/tournament.json b/locales/ru/tournament.json
index e748f4327..d20df8075 100644
--- a/locales/ru/tournament.json
+++ b/locales/ru/tournament.json
@@ -82,7 +82,8 @@
 	"actions.sub.prompt_other": "Вы ещё можете добавить {{count}} запасных",
 	"actions.sub.prompt_zero": "Состав заполнен, больше нельзя добавить запасных",
 	"actions.finalize": "",
-	"actions.finalize.question": "Как только вы убедитесь, что заявлённые счёты достоверны, нажмите здесь для завершения турнира и обработки результатов",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "Завершить",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",
diff --git a/locales/zh/tournament.json b/locales/zh/tournament.json
index 773f8682c..4091cd8b2 100644
--- a/locales/zh/tournament.json
+++ b/locales/zh/tournament.json
@@ -74,7 +74,8 @@
 	"actions.shareLink": "分享您的邀请链接以添加成员: {{inviteLink}}",
 	"actions.sub.prompt_zero": "您的阵容已满，无法再添加替补",
 	"actions.finalize": "",
-	"actions.finalize.question": "在您确认报告的比分无误后，点击这里结束比赛并生成结果",
+	"actions.finalize.button": "",
+	"actions.finalize.notice": "",
 	"actions.finalize.action": "结束",
 	"actions.finalize.action.withBadges": "",
 	"actions.finalize.info": "",