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 35adb42..54dd065 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
@@ -4391,7 +4391,6 @@ window.ft8MapAddLocator = function(message, grids, type = "ft8", station = null,
       const tooltipHtml = buildDecodeLocatorTooltipHtml(grid, existing, markerType);
       existing.marker.setStyle(locatorStyleForCount(count, markerType));
       existing.marker.setPopupContent(tooltipHtml);
-      existing.marker.setTooltipContent(tooltipHtml);
       assignLocatorMarkerMeta(existing.marker, existing.sourceType, existing.bandMeta);
       rebuildMapLocatorFilters();
       applyMapFilter();
@@ -4406,13 +4405,7 @@ window.ft8MapAddLocator = function(message, grids, type = "ft8", station = null,
     const tooltipHtml = buildDecodeLocatorTooltipHtml(grid, { stations, stationDetails }, markerType);
     const marker = L.rectangle(bounds, locatorStyleForCount(count, markerType))
       .addTo(aprsMap)
-      .bindPopup(tooltipHtml)
-      .bindTooltip(tooltipHtml, {
-        className: "decode-locator-tip-shell",
-        direction: "top",
-        sticky: true,
-        opacity: 1,
-      });
+      .bindPopup(tooltipHtml);
     marker.__trxType = markerType;
     const bandMeta = collectBandMeta(
       Array.from(stationDetails.values()).map((detail) => Number(detail?.freq_hz))
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 9a5a425..ef5aa25 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
@@ -579,12 +579,12 @@
       </div>
       <div class="map-locator-filters">
         <div class="map-locator-filter-group">
-          <span class="map-locator-filter-label">Locator Sources</span>
-          <div id="map-locator-mode-filter" class="map-locator-chip-row"></div>
+          <span class="map-locator-filter-label">Phase 1</span>
+          <div id="map-locator-phase" class="map-locator-phase-row"></div>
         </div>
         <div class="map-locator-filter-group">
-          <span class="map-locator-filter-label">Bands</span>
-          <div id="map-locator-band-filter" class="map-locator-chip-row"></div>
+          <span class="map-locator-filter-label" id="map-locator-choice-label">Phase 2</span>
+          <div id="map-locator-choice-filter" class="map-locator-chip-row"></div>
         </div>
       </div>
       <div id="aprs-map"></div>
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 3795abf..39ec3b7 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
@@ -1456,17 +1456,6 @@ small { color: var(--text-muted); }
 .aprs-popup-table td { padding: 0.06rem 0.3rem 0.06rem 0; vertical-align: top; font-size: 0.88em; }
 .aprs-popup-label { color: var(--text-muted); white-space: nowrap; padding-right: 0.5rem !important; }
 .aprs-popup-info { font-size: 0.85em; color: var(--text); border-top: 1px solid var(--border-light); padding-top: 0.25rem; margin-top: 0.1rem; word-break: break-word; }
-.decode-locator-tip-shell {
-  background: transparent;
-  border: none;
-  box-shadow: none;
-}
-.decode-locator-tip-shell .leaflet-tooltip-content {
-  margin: 0;
-}
-.decode-locator-tip-shell.leaflet-tooltip-top::before {
-  border-top-color: color-mix(in srgb, var(--card-bg) 94%, transparent);
-}
 .decode-locator-tip {
   min-width: 16rem;
   max-width: 26rem;