diff --git a/html/early.js b/html/early.js
index dcf9fb1..91cbf49 100644
--- a/html/early.js
+++ b/html/early.js
@@ -307,8 +307,7 @@ const TIMEZONE = new Date().toLocaleTimeString(undefined,{timeZoneName:'short'})
 function localTime(date) {
     return date.getHours().toString().padStart(2,'0')
         + ":" + date.getMinutes().toString().padStart(2,'0')
-        + ":" + date.getSeconds().toString().padStart(2,'0')
-    + NBSP + TIMEZONE;
+        + ":" + date.getSeconds().toString().padStart(2,'0');
 }
 function zDateString(date) {
     let string = date.getUTCFullYear() + '-'
diff --git a/html/planeObject.js b/html/planeObject.js
index 6190091..380fbda 100644
--- a/html/planeObject.js
+++ b/html/planeObject.js
@@ -1859,11 +1859,14 @@ PlaneObject.prototype.updateLines = function() {
                 }
                 timestamp1 += '\n';
             }
-            if ((utcTimesLive && !showTrace) || (utcTimesHistoric && showTrace)) {
-                timestamp2 += zuluTime(date);
-            } else {
+            if ((showTrace && !utcTimesLive) {
+                timestamp2 += (localTime(date) + '\n' + TIMEZONE);
+            } else if (!showTrace && !utcTimesLive) {
                 timestamp2 += localTime(date);
+            } else {
+                timestamp2 += zuluTime(date);
             }
+
             if (traces_high_res) {
                 timestamp2 = timestamp2.split(NBSP);
                 timestamp2 = timestamp2[0] + '.' + (Math.floor((seg.ts*10)) % 10) + NBSP + timestamp2[1];
diff --git a/html/script.js b/html/script.js
index 11399c4..35113bb 100644
--- a/html/script.js
+++ b/html/script.js
@@ -2690,7 +2690,7 @@ function refreshSelected() {
     if (showTrace) {
         if (selected.position_time) {
             const date = new Date(selected.position_time * 1000);
-            let timestamp = utcTimesHistoric ? zuluTime(date) : localTime(date);
+            let timestamp = utcTimesHistoric ? zuluTime(date) : (lDateString(date) + ' ' + localTime(date) + NBSP + TIMEZONE);
             jQuery('#trace_time').updateText('Time:\n' + timestamp);
         } else {
             jQuery('#trace_time').updateText('Time:\n');
@@ -6698,7 +6698,7 @@ function replayOnSliderMove() {
         jQuery("#replayTimeHint").html("Time: " + zuluTime(date));
     } else {
         jQuery("#replayDateHint").html("Date: " + lDateString(date));
-        jQuery("#replayTimeHint").html("Time: " + localTime(date));
+        jQuery("#replayTimeHint").html("Time: " + localTime(date) + NBSP + TIMEZONE);
     }
 }
 let replayJumpEnabled = true;
@@ -6735,7 +6735,7 @@ function replaySetTimeHint(arg) {
         timeString = zuluTime(replay.ts);
     } else {
         dateString = lDateString(replay.ts);
-        timeString = localTime(replay.ts);
+        timeString = localTime(replay.ts) + NBSP + TIMEZONE;
     }
     jQuery("#replayDateHint").html("Date: " + dateString);
     jQuery("#replayTimeHint").html("Time: " + timeString);