diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
index df682f2..cfe931b 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
@@ -4476,14 +4476,14 @@ function _initMapWhenReady() {
   const loadingEl = document.getElementById("map-loading");
   if (window.trx.map && typeof L !== "undefined") {
     if (_mapInitTimer) { clearInterval(_mapInitTimer); _mapInitTimer = null; }
-    if (loadingEl) loadingEl.style.display = "none";
+    if (loadingEl) loadingEl.classList.add("is-hidden");
     window.trx.map.initAprsMap();
     window.trx.map.sizeAprsMapToViewport();
     if (window.trx.map.aprsMap) setTimeout(() => window.trx.map.aprsMap.invalidateSize(), 50);
     return;
   }
-  // Not ready yet — show loading and poll until both are available.
-  if (loadingEl) loadingEl.style.display = "";
+  // Not ready yet — show overlay and poll until both are available.
+  if (loadingEl) loadingEl.classList.remove("is-hidden");
   if (!_mapInitTimer) {
     _mapInitTimer = setInterval(() => {
       if (_activeTab !== "map") { clearInterval(_mapInitTimer); _mapInitTimer = null; return; }
diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
index 03e75fa..8e5a3e5 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/index.html
@@ -977,7 +977,12 @@
       </div>
     </div>
     <div id="tab-map" class="tab-panel" data-tab="map" style="display:none;">
-      <div id="map-loading" class="map-loading-msg">Loading map&hellip;</div>
+      <div id="map-loading" class="decode-history-overlay content-overlay" aria-live="polite" aria-atomic="true">
+        <div class="decode-history-overlay-card">
+          <div class="decode-history-overlay-title">Loading map&hellip;</div>
+          <div class="decode-history-overlay-sub">Waiting for map engine to initialise</div>
+        </div>
+      </div>
       <template id="tmpl-map">
       <div id="map-stage">
         <div class="map-overlay-panel">
diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/style.css b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/style.css
index 314504d..8ff986e 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/style.css
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/style.css
@@ -1703,15 +1703,7 @@ small { color: var(--text-muted); }
   min-height: 0;
   gap: 0.85rem;
 }
-.map-loading-msg {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 60vh;
-  font-size: 1.1rem;
-  color: var(--text-secondary);
-  opacity: 0.8;
-}
+/* map-loading uses the shared .decode-history-overlay .content-overlay classes */
 #map-stage {
   position: relative;
   flex: 0 1 auto;