diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index 717b7fc..7b7a80e 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -1002,7 +1002,7 @@ void loop() {
     if (shouldScan) {
       if (scanmute && scanholdonsignal) {
         radio.setMute();
-        if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+        if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
         SQ = true;
       }
       scanholdflag = false;
@@ -1044,7 +1044,7 @@ void loop() {
       if (scanmute && scanholdonsignal) {
         radio.setUnMute();
         SQ = false;
-        if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+        if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
       }
     }
 
@@ -1100,7 +1100,7 @@ void loop() {
       if (radio.af_counter == 0) {
         if (findMemoryAF && radio.rds.correctPI != 0 && tunemode == TUNE_MEM && (USN > 250 || WAM > 250)) {
           radio.setMute();
-          tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+          tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
           SQ = true;
           if (!screenmute) {
             if (advancedRDS) {
@@ -1144,7 +1144,7 @@ void loop() {
 
           radio.setUnMute();
           SQ = false;
-          tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+          tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
         }
         findMemoryAF = false;
       } else {
@@ -1270,7 +1270,7 @@ void loop() {
         tftPrint(-1, "RT:", 3, 221, GreyoutColor, BackgroundColor, 16);
         tftPrint(-1, "PTY:", 3, 163, GreyoutColor, BackgroundColor, 16);
         tft.drawLine(16, 143, 203, 143, GreyoutColor);
-        tft.drawBitmap(122, 5, RDSLogo, 35, 22, GreyoutColor);
+        tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
       }
       LowLevelInit = false;
     }
@@ -2350,7 +2350,7 @@ void SelectBand() {
   }
 
   if (band > BAND_GAP) {
-    if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+    if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
     if (tunemode == TUNE_MI_BAND && band != BAND_SW) tunemode = TUNE_MAN;
     BWreset = true;
     BWset = BWsetAM;
@@ -2386,7 +2386,7 @@ void SelectBand() {
       tftPrint(-1, "PS:", 3, 193, GreyoutColor, BackgroundColor, 16);
       tftPrint(-1, "RT:", 3, 221, GreyoutColor, BackgroundColor, 16);
       tftPrint(-1, "PTY:", 3, 163, GreyoutColor, BackgroundColor, 16);
-      tft.drawBitmap(122, 5, RDSLogo, 35, 22, GreyoutColor);
+      tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
       tft.fillRoundRect(249, 57, 30, 18, 2, GreyoutColor);
       tftPrint(0, "iMS", 265, 59, BackgroundColor, GreyoutColor, 16);
       tft.fillRoundRect(287, 57, 30, 18, 2, GreyoutColor);
@@ -2479,7 +2479,7 @@ void BWButtonPress() {
   } else {
     if (!usesquelch) radio.setUnMute();
     if (!BWtune && !menu) {
-      if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+      if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
       unsigned long counterold = millis();
       unsigned long counter = millis();
       while (digitalRead(BWBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
@@ -2507,23 +2507,23 @@ void BWButtonPress() {
 void doStereoToggle() {
   if (StereoToggle) {
     if (!screenmute) {
-      tft.drawCircle(66, 15, 10, BackgroundColor);
-      tft.drawCircle(66, 15, 9, BackgroundColor);
-      tft.drawCircle(76, 15, 10, BackgroundColor);
-      tft.drawCircle(76, 15, 9, BackgroundColor);
-      tft.drawCircle(71, 15, 10, SecondaryColor);
-      tft.drawCircle(71, 15, 9, SecondaryColor);
+      tft.drawCircle(43, 15, 10, BackgroundColor);
+      tft.drawCircle(43, 15, 9, BackgroundColor);
+      tft.drawCircle(53, 15, 10, BackgroundColor);
+      tft.drawCircle(53, 15, 9, BackgroundColor);
+      tft.drawCircle(48, 15, 10, SecondaryColor);
+      tft.drawCircle(48, 15, 9, SecondaryColor);
     }
     radio.setMono(true);
     StereoToggle = false;
   } else {
     if (!screenmute) {
-      tft.drawCircle(71, 15, 10, BackgroundColor);
-      tft.drawCircle(71, 15, 9, BackgroundColor);
-      tft.drawCircle(66, 15, 10, GreyoutColor);
-      tft.drawCircle(66, 15, 9, GreyoutColor);
-      tft.drawCircle(76, 15, 10, GreyoutColor);
-      tft.drawCircle(76, 15, 9, GreyoutColor);
+      tft.drawCircle(48, 15, 10, BackgroundColor);
+      tft.drawCircle(48, 15, 9, BackgroundColor);
+      tft.drawCircle(43, 15, 10, GreyoutColor);
+      tft.drawCircle(43, 15, 9, GreyoutColor);
+      tft.drawCircle(53, 15, 10, GreyoutColor);
+      tft.drawCircle(53, 15, 9, GreyoutColor);
     }
     radio.setMono(false);
     Stereostatusold = false;
@@ -2553,7 +2553,7 @@ void ModeButtonPress() {
     } else {
       if (!BWtune && !menu) {
         if (!screenmute) {
-          tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+          tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
         }
         memorystore = false;
         unsigned long counterold = millis();
@@ -2761,7 +2761,7 @@ void ButtonPress() {
           }
         }
       } else {
-        if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+        if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
         unsigned long counterold = millis();
         unsigned long counter = millis();
         while (digitalRead(ROTARY_BUTTON) == LOW && counter - counterold <= 1000) counter = millis();
@@ -3102,20 +3102,20 @@ void DoMemoryPosTune() {
     StereoToggle = presets[memorypos].ms;
     if (!StereoToggle) {
       Stereostatusold = false;
-      tft.drawCircle(66, 15, 10, BackgroundColor);
-      tft.drawCircle(66, 15, 9, BackgroundColor);
-      tft.drawCircle(76, 15, 10, BackgroundColor);
-      tft.drawCircle(76, 15, 9, BackgroundColor);
-      tft.drawCircle(71, 15, 10, SecondaryColor);
-      tft.drawCircle(71, 15, 9, SecondaryColor);
+      tft.drawCircle(43, 15, 10, BackgroundColor);
+      tft.drawCircle(43, 15, 9, BackgroundColor);
+      tft.drawCircle(53, 15, 10, BackgroundColor);
+      tft.drawCircle(53, 15, 9, BackgroundColor);
+      tft.drawCircle(48, 15, 10, SecondaryColor);
+      tft.drawCircle(48, 15, 9, SecondaryColor);
     } else {
       Stereostatusold = false;
-      tft.drawCircle(71, 15, 10, BackgroundColor);
-      tft.drawCircle(71, 15, 9, BackgroundColor);
-      tft.drawCircle(66, 15, 10, GreyoutColor);
-      tft.drawCircle(66, 15, 9, GreyoutColor);
-      tft.drawCircle(76, 15, 10, GreyoutColor);
-      tft.drawCircle(76, 15, 9, GreyoutColor);
+      tft.drawCircle(48, 15, 10, BackgroundColor);
+      tft.drawCircle(48, 15, 9, BackgroundColor);
+      tft.drawCircle(43, 15, 10, GreyoutColor);
+      tft.drawCircle(43, 15, 9, GreyoutColor);
+      tft.drawCircle(53, 15, 10, GreyoutColor);
+      tft.drawCircle(53, 15, 9, GreyoutColor);
     }
   }
 
@@ -3421,9 +3421,9 @@ void ShowRDSLogo(bool RDSstatus) {
   if (!screenmute) {
     if (RDSstatus != RDSstatusold) {
       if (RDSstatus) {
-        tft.drawBitmap(122, 5, RDSLogo, 35, 22, RDSColor);
+        tft.drawBitmap(70, 5, RDSLogo, 35, 22, RDSColor);
       } else {
-        tft.drawBitmap(122, 5, RDSLogo, 35, 22, GreyoutColor);
+        tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
       }
     }
     RDSstatusold = RDSstatus;
@@ -3435,16 +3435,16 @@ void ShowStereoStatus() {
     if (band < BAND_GAP) Stereostatus = radio.getStereoStatus(); else Stereostatus = false;
     if (Stereostatus != Stereostatusold) {
       if (Stereostatus && !screenmute) {
-        tft.drawCircle(66, 15, 10, StereoColor);
-        tft.drawCircle(66, 15, 9, StereoColor);
-        tft.drawCircle(76, 15, 10, StereoColor);
-        tft.drawCircle(76, 15, 9, StereoColor);
+        tft.drawCircle(43, 15, 10, StereoColor);
+        tft.drawCircle(43, 15, 9, StereoColor);
+        tft.drawCircle(53, 15, 10, StereoColor);
+        tft.drawCircle(53, 15, 9, StereoColor);
       } else {
         if (!screenmute) {
-          tft.drawCircle(66, 15, 10, GreyoutColor);
-          tft.drawCircle(66, 15, 9, GreyoutColor);
-          tft.drawCircle(76, 15, 10, GreyoutColor);
-          tft.drawCircle(76, 15, 9, GreyoutColor);
+          tft.drawCircle(43, 15, 10, GreyoutColor);
+          tft.drawCircle(43, 15, 9, GreyoutColor);
+          tft.drawCircle(53, 15, 10, GreyoutColor);
+          tft.drawCircle(53, 15, 9, GreyoutColor);
         }
       }
       Stereostatusold = Stereostatus;
@@ -3460,17 +3460,17 @@ void ShowOffset() {
       return;
     }
 
-    int baseX = 1;  // Left boundary
-    int baseY = 16; // Top boundary
-    int width = 51; // Max width
-    int height = 13; // Max height
+    int baseX = 13; // Left boundary
+    int baseY = 2; // Top boundary
+    int width = 4; // Max width
+    int height = 26; // Max height
 
     int centerX = baseX + width / 2;    // Center dot X
     int centerY = baseY + height / 2;   // Center dot Y
 
     // **Move arrows 3px further from the dot**
     int arrowGap = 3; // Space between dot and arrows
-    int arrowWidth = 18; // Arrow stretch size
+    int arrowWidth = 9; // Arrow stretch size
     int leftArrowBaseX = centerX - arrowWidth - arrowGap;  // Shift left arrow further left
     int rightArrowBaseX = centerX + arrowWidth + arrowGap; // Shift right arrow further right
 
@@ -3673,7 +3673,7 @@ void doSquelch() {
         if (SQ || BWreset) {
           if (!seek) radio.setUnMute();
           if (!screenmute && !seek) {
-            tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+            tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
           }
           autosquelchtimer = millis();
           SQ = false;
@@ -3682,7 +3682,7 @@ void doSquelch() {
         if ((!SQ || BWreset) && (millis() >= autosquelchtimer + 1000)) {
           radio.setMute();
           if (!screenmute && !seek) {
-            tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+            tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
           }
           autosquelchtimer = millis();
           SQ = true;
@@ -3692,13 +3692,13 @@ void doSquelch() {
       if ((USN < amscansens * 30) && (OStatus < 2 && OStatus > -2) && (!scandxmode || (scandxmode && !scanmute))) {
         if (!seek) radio.setUnMute();
         if (!screenmute && !seek) {
-          tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+          tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
         }
         SQ = false;
       } else {
         radio.setMute();
         if (!screenmute && !seek) {
-          tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+          tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
         }
         SQ = true;
       }
@@ -3732,13 +3732,13 @@ void doSquelch() {
           if (Squelch < SStatus || Squelch == -100 || Squelch == 0) {
             if (!seek) radio.setUnMute();
             if (!screenmute && !seek) {
-              tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+              tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
             }
             SQ = false;
           } else {
             radio.setMute();
             if (!screenmute && !seek) {
-              tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+              tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
             }
             SQ = true;
           }
@@ -3746,13 +3746,13 @@ void doSquelch() {
           if (Stereostatus) {
             radio.setUnMute();
             if (!screenmute && !seek) {
-              tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+              tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
             }
             SQ = false;
           } else {
             radio.setMute();
             if (!screenmute && !seek) {
-              tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+              tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
             }
             SQ = true;
           }
@@ -3781,13 +3781,13 @@ void doSquelch() {
         if (Squelch < SStatus || Squelch == -100 || Squelch == 0) {
           if (!seek) radio.setUnMute();
           if (!screenmute && !seek) {
-            tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+            tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
           }
           SQ = false;
         } else {
           radio.setMute();
           if (!screenmute && !seek) {
-            tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+            tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
           }
           SQ = true;
         }
@@ -3795,13 +3795,13 @@ void doSquelch() {
         if (Stereostatus) {
           if (!seek) radio.setUnMute();
           if (!screenmute && !seek) {
-            tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+            tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
           }
           SQ = false;
         } else {
           radio.setMute();
           if (!screenmute && !seek) {
-            tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+            tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
           }
           SQ = true;
         }
@@ -4404,12 +4404,12 @@ void EdgeBeeper() {
   if (radio.mute) {
     radio.setMute();
     if (!screenmute) {
-      tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+      tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
     }
   } else {
     radio.setUnMute();
     if (!screenmute) {
-      tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+      tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
     }
   }
 }
@@ -4426,7 +4426,7 @@ void Seek(bool mode) {
   }
 
   if (!screenmute) {
-    tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+    tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
   }
   if (!mode) TuneDown(); else TuneUp();
   delay(50);
@@ -4442,7 +4442,7 @@ void Seek(bool mode) {
       seek = false;
       radio.setUnMute();
       if (!screenmute) {
-        tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+        tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
       }
       store = true;
     } else {
@@ -4456,7 +4456,7 @@ void Seek(bool mode) {
       seek = false;
       radio.setUnMute();
       if (!screenmute) {
-        tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+        tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
       }
       store = true;
     } else {
@@ -4830,7 +4830,7 @@ void cancelDXScan() {
   scandxmode = false;
   if (scanmute) {
     radio.setUnMute();
-    tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+    tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
 
     if (!flashing) {
       tft.fillRoundRect(2, 80, 40, 18, 2, SecondaryColor);
@@ -4995,7 +4995,7 @@ void startFMDXScan() {
   }
   if (scanmute) {
     radio.setMute();
-    tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+    tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
     SQ = true;
     Squelchold = -2;
   }
diff --git a/src/comms.cpp b/src/comms.cpp
index 72880cb..aa258c0 100644
--- a/src/comms.cpp
+++ b/src/comms.cpp
@@ -732,7 +732,7 @@ void XDRGTKRoutine() {
 
           case '\0':
             radio.setMute();
-            if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+            if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
             if (!screenmute) {
               tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor);
               tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor);
@@ -761,7 +761,7 @@ void XDRGTKRoutine() {
             XDRScan = false;
             if (VolSet != 0) {
               radio.setUnMute();
-              if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+              if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
               radio.setVolume(((VolSet * 10) - 40) / 10);
             }
             break;
@@ -799,12 +799,12 @@ void XDRGTKRoutine() {
         VolSet = atoi(buff + 1);
         if (VolSet == 0) {
           radio.setMute();
-          if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, PrimaryColor);
+          if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
           XDRMute = true;
           SQ = true;
         } else {
           radio.setUnMute();
-          if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+          if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
           radio.setVolume((VolSet - 40) / 10);
           XDRMute = false;
         }
@@ -831,7 +831,7 @@ void XDRGTKRoutine() {
         store = true;
         XDRMute = false;
         radio.setUnMute();
-        if (!screenmute) tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+        if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
         VolSet = EEPROM.readByte(EE_BYTE_VOLSET);
         LowLevelSet = EEPROM.readByte(EE_BYTE_LOWLEVELSET);
         softmuteam = EEPROM.readByte(EE_BYTE_SOFTMUTEAM);
diff --git a/src/gui.cpp b/src/gui.cpp
index 37f7737..eb19475 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -466,13 +466,14 @@ void BuildAFScreen() {
   tft.fillScreen(BackgroundColor);
   tft.drawRect(0, 0, 320, 240, FrameColor);
   tft.drawLine(0, 30, 320, 30, FrameColor);
-  tft.drawLine(0, 15, 53, 15, FrameColor);
+  tft.drawLine(0, 15, 13, 15, FrameColor);
   tft.drawLine(0, 199, 320, 199, FrameColor);
   tft.drawLine(0, 218, 320, 218, FrameColor);
-  tft.drawLine(53, 30, 53, 0, FrameColor);
-  tft.drawLine(89, 30, 89, 0, FrameColor);
-  tft.drawLine(120, 30, 120, 0, FrameColor);
-  tft.drawLine(158, 30, 158, 0, FrameColor);
+  tft.drawLine(30, 30, 30, 0, FrameColor);
+  tft.drawLine(67, 30, 67, 0, FrameColor);
+  tft.drawLine(107, 30, 107, 0, FrameColor);
+  tft.drawLine(107, 15, 160, 15, FrameColor);
+  tft.drawLine(160, 30, 160, 0, FrameColor);
   tft.drawLine(248, 30, 248, 0, FrameColor);
   tftPrint(-1, "kHz", 203, 4, ActiveColor, ActiveColorSmooth, 28);
   tftPrint(0, myLanguage[language][33], 160, 222, ActiveColor, ActiveColorSmooth, 16);
@@ -2826,15 +2827,15 @@ void BuildAdvancedRDS() {
   tft.drawRect(0, 0, 320, 240, FrameColor);
   tft.drawLine(0, 30, 320, 30, FrameColor);
   tft.drawLine(0, 68, 320, 68, FrameColor);
-  tft.drawLine(0, 15, 53, 15, FrameColor);
+  tft.drawLine(107, 15, 160, 15, FrameColor);
   tft.drawLine(0, 104, 320, 104, FrameColor);
   tft.drawLine(0, 126, 320, 126, FrameColor);
-  tft.drawLine(120, 30, 120, 0, FrameColor);
+  tft.drawLine(107, 30, 107, 0, FrameColor);
   tft.drawLine(210, 30, 210, 240, FrameColor);
-  tft.drawLine(53, 30, 53, 0, FrameColor);
-  tft.drawLine(89, 30, 89, 0, FrameColor);
-  tft.drawLine(120, 30, 120, 0, FrameColor);
-  tft.drawLine(158, 30, 158, 0, FrameColor);
+  tft.drawLine(30, 30, 30, 0, FrameColor);
+  tft.drawLine(67, 30, 67, 0, FrameColor);
+  tft.drawLine(107, 30, 107, 0, FrameColor);
+  tft.drawLine(160, 30, 160, 0, FrameColor);
   tft.drawLine(248, 30, 248, 0, FrameColor);
   tft.drawLine(0, 140, 210, 140, FrameColor);
   tft.drawLine(0, 166, 210, 166, FrameColor);
@@ -2884,17 +2885,17 @@ void BuildAdvancedRDS() {
 
   tftPrint(-1, "kHz", 203, 4, ActiveColor, ActiveColorSmooth, 28);
 
-  tft.drawBitmap(122, 5, RDSLogo, 35, 22, GreyoutColor);
-  tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+  tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
+  tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
 
   if (!StereoToggle) {
-    tft.drawCircle(71, 15, 10, SecondaryColor);
-    tft.drawCircle(71, 15, 9, SecondaryColor);
+    tft.drawCircle(48, 15, 10, SecondaryColor);
+    tft.drawCircle(48, 15, 9, SecondaryColor);
   } else {
-    tft.drawCircle(66, 15, 10, GreyoutColor);
-    tft.drawCircle(66, 15, 9, GreyoutColor);
-    tft.drawCircle(76, 15, 10, GreyoutColor);
-    tft.drawCircle(76, 15, 9, GreyoutColor);
+    tft.drawCircle(43, 15, 10, GreyoutColor);
+    tft.drawCircle(43, 15, 9, GreyoutColor);
+    tft.drawCircle(53, 15, 10, GreyoutColor);
+    tft.drawCircle(53, 15, 9, GreyoutColor);
   }
 
   tftPrint(-1, "TP", 2, 51, GreyoutColor, BackgroundColor, 16);
@@ -2960,16 +2961,16 @@ void BuildDisplay() {
   tft.drawRect(0, 0, 320, 240, FrameColor);
   tft.drawLine(0, 30, 320, 30, FrameColor);
   tft.drawLine(0, 100, 320, 100, FrameColor);
-  tft.drawLine(0, 15, 53, 15, FrameColor);
-  tft.drawLine(120, 30, 120, 0, FrameColor);
+  tft.drawLine(107, 15, 160, 15, FrameColor);
+  tft.drawLine(107, 30, 107, 0, FrameColor);
   tft.drawLine(210, 100, 210, 217, FrameColor);
   tft.drawLine(248, 30, 248, 0, FrameColor);
   tft.drawLine(0, 160, 210, 160, FrameColor);
   tft.drawLine(0, 180, 320, 180, FrameColor);
   tft.drawLine(0, 217, 320, 217, FrameColor);
-  tft.drawLine(53, 30, 53, 0, FrameColor);
-  tft.drawLine(89, 30, 89, 0, FrameColor);
-  tft.drawLine(158, 30, 158, 0, FrameColor);
+  tft.drawLine(30, 30, 30, 0, FrameColor);
+  tft.drawLine(67, 30, 67, 0, FrameColor);
+  tft.drawLine(160, 30, 160, 0, FrameColor);
   tft.drawLine(16, 114, 202, 114, ActiveColor);
 
   if (!showmodulation) tft.drawLine(16, 143, 202, 143, GreyoutColor); else tft.drawLine(16, 143, 202, 143, ActiveColor);
@@ -3019,17 +3020,17 @@ void BuildDisplay() {
   tftPrint(-1, "kHz", 203, 4, ActiveColor, ActiveColorSmooth, 28);
   tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, 16);
 
-  tft.drawBitmap(122, 5, RDSLogo, 35, 22, GreyoutColor);
-  tft.drawBitmap(92, 4, Speaker, 26, 22, GreyoutColor);
+  tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
+  tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
 
   if (!StereoToggle) {
-    tft.drawCircle(71, 15, 10, SecondaryColor);
-    tft.drawCircle(71, 15, 9, SecondaryColor);
+    tft.drawCircle(48, 15, 10, SecondaryColor);
+    tft.drawCircle(48, 15, 9, SecondaryColor);
   } else {
-    tft.drawCircle(66, 15, 10, GreyoutColor);
-    tft.drawCircle(66, 15, 9, GreyoutColor);
-    tft.drawCircle(76, 15, 10, GreyoutColor);
-    tft.drawCircle(76, 15, 9, GreyoutColor);
+    tft.drawCircle(43, 15, 10, GreyoutColor);
+    tft.drawCircle(43, 15, 9, GreyoutColor);
+    tft.drawCircle(53, 15, 10, GreyoutColor);
+    tft.drawCircle(53, 15, 9, GreyoutColor);
   }
 
   if (autosquelch) showAutoSquelch(1);
diff --git a/src/language.h b/src/language.h
index d0f13e7..3387270 100644
--- a/src/language.h
+++ b/src/language.h
@@ -2756,7 +2756,7 @@ static const char* const myLanguage[21][300] PROGMEM = {
     "Luminosité de l'affichage", // 29
     "Éteint", // 30
     "Allumé", // 31
-    "APPUYEZ MODE POUR SORTIE ET STOCKAGE", // 32
+    "APPUYEZ MODE POUR SORTIE & STOCKAGE", // 32
     "APPUYEZ SUR BAND POUR FERMER", // 33
     "RECHERCHE...", // 34
     "Tuner non détecté", // 35
@@ -5474,7 +5474,7 @@ static const char* const myLanguage[21][300] PROGMEM = {
     "Osvetljenost ekrana", // 29
     "Isključeno", // 30
     "Uključeno", // 31
-    "PRITISNITE MODE DA IZLAZITE I SPASITE", // 32
+    "PRITISNITE MODE ZA IZLAZ I SPAS", // 32
     "PRITISNITE BAND DA ZATVORITE", // 33
     "SKENIRANJE...", // 34
     "Tuner nije\ndetektovan", // 35
@@ -5776,8 +5776,8 @@ static const char* const myLanguage[21][300] PROGMEM = {
     "Näytön kirkkaus", // 29
     "Pois", // 30
     "Päällä", // 31
-    "Paina MODE poistuaksesi ja tallentaaksesi", // 32
-    "Paina BAND sulkeaksesi", // 33
+    "PAINA MODE POISTU JA TALLENNA", // 32
+    "PAINA BAND SULKEAKSESI", // 33
     "SKANNATAAN...", // 34
     "Virittimen havaitseminen\nepäonnistui", // 35
     "AM-antenni vahvistus", // 36
@@ -5928,7 +5928,7 @@ static const char* const myLanguage[21][300] PROGMEM = {
     "FM-asetukset", // 181
     "AM-asetukset", // 182
     "Yhteydet ja kello", // 183
-    "Paina MODE palataksesi", // 184
+    "PAINA MODE PALATAKSESI", // 184
     "CoChannel-tunnistin", // 185
     "CoChannel-tunnistin\nherkkyys", // 186
     "CoChannel-tunnistin\nkynnys", // 187
diff --git a/src/rds.cpp b/src/rds.cpp
index e565f56..a7e1615 100644
--- a/src/rds.cpp
+++ b/src/rds.cpp
@@ -841,14 +841,14 @@ void showCT() {
       }
 
       // Display the updated time
-      tftReplace(0, rds_clockold, rds_clock, 26, 1, RDSColor, RDSColorSmooth, BackgroundColor, 16);
+      tftReplace(0, rds_clockold, rds_clock, 135, 1, RDSColor, RDSColorSmooth, BackgroundColor, 16);
     } else { // Handle dropout scenarios
 
       if (rtcset) { // Display dropout message if RTC was set
-        tftReplace(0, rds_clockold, rds_clock, 26, 1, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
+        tftReplace(0, rds_clockold, rds_clock, 135, 1, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
       } else { // Clear and reprint the clock
-        tftPrint(0, rds_clockold, 26, 1, BackgroundColor, BackgroundColor, 16);
-        tftPrint(0, rds_clock, 26, 1, BackgroundColor, BackgroundColor, 16);
+        tftPrint(0, rds_clockold, 135, 1, BackgroundColor, BackgroundColor, 16);
+        tftPrint(0, rds_clock, 135, 1, BackgroundColor, BackgroundColor, 16);
       }
     }
   }