diff --git a/htdocs/js/GatewayQuiz/gateway.scss b/htdocs/js/GatewayQuiz/gateway.scss
index bb0e3fc40f..5e5078e615 100644
--- a/htdocs/js/GatewayQuiz/gateway.scss
+++ b/htdocs/js/GatewayQuiz/gateway.scss
@@ -2,15 +2,15 @@
 
 #gwTimerContainer {
 	position: sticky;
-	width: 15em;
+	width: 18em;
 	top: 2.75rem;
-	left: calc(100% - 15em - 0.75rem);
+	left: calc(100% - 18em - 0.75rem);
 	right: 0.75rem;
 	z-index: 31;
 }
 
-#gwTimer {
-	text-align: center;
+#gwAnnounceTimeBtn {
+	padding: 1px 2px;
 }
 
 .gwAlert {
diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
index 2d87362580..e85ab78974 100644
--- a/templates/ContentGenerator/GatewayQuiz.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -220,11 +220,11 @@
 	%
 	% # Print the timer if there is less than 24 hours left.
 	% if ($timeLeft < 86400) {
-		<div id="gwTimerContainer" class="d-flex flex-column gap-2 mb-2">
+		<div id="gwTimerContainer" class="alert alert-warning text-center py-1 mb-0">
 			<%= tag(
-				'div',
+				'span',
 				id            => 'gwTimer',
-				class         => 'alert alert-warning p-1 mb-0',
+				class         => 'align-middle me-2',
 				'aria-hidden' => 'true',
 				data          => {
 					server_time     => int($submitTime),
@@ -253,10 +253,27 @@
 			) =%>
 			<%= tag(
 				'button',
-				id    => 'gwAnnounceTimeBtn',
-				type  => 'button',
-				class => 'btn btn-sm btn-secondary',
-				maketext('Announce time remaining')
+				id           => 'gwAnnounceTimeBtn',
+				type         => 'button',
+				class        => 'btn btn-sm btn-secondary',
+				'aria-label' => maketext('Announce time remaining'),
+				tag(
+					'svg',
+					width   => 20,
+					height  => 20,
+					viewBox => '0 0 16 16',
+					fill    => 'currentColor',
+					xmlns   => 'http://www.w3.org/2000/svg',
+					tag(
+						'path',
+						'fill-rule' => 'evenodd',
+						d => 'M8.5 2a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-1 0v-11a.5.5 0 0 1 .5-.5m-2 2a.5.5 0 0 1 '
+							. '.5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5m4 0a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 '
+							. '0 0 1 .5-.5m-6 1.5A.5.5 0 0 1 5 6v4a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m8 0a.5.5 0 0 1 '
+							. '.5.5v4a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m-10 1A.5.5 0 0 1 3 7v2a.5.5 0 0 1-1 0V7a.5.5 '
+							. '0 0 1 .5-.5m12 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0V7a.5.5 0 0 1 .5-.5'
+					)
+				)
 			) =%>
 		</div>
 	% }