diff --git a/boards/m5stack-tab5/platformio.ini b/boards/m5stack-tab5/platformio.ini
index 2ecf75bdd1..1bf41509b0 100644
--- a/boards/m5stack-tab5/platformio.ini
+++ b/boards/m5stack-tab5/platformio.ini
@@ -15,9 +15,9 @@ board_upload.speed = 1500000
 build_src_filter =${env.build_src_filter} +<../boards/m5stack-tab5>
 build_src_flags =
 	${env.build_src_flags}
-	-D FP=1 ;3
-	-D FM=2 ;6
-	-D FG=3 ;9
+	-D FP=2
+	-D FM=4
+	-D FG=6
 
 build_flags =
 	${env.build_flags}
@@ -28,6 +28,8 @@ build_flags =
 
 	-DDEVICE_NAME='"M5Stack Tab5"'
 
+	-DUSB_as_HID=1
+
 	-DUSE_M5GFX=1
 	-DHAS_SCREEN=1
 	-DUSE_CARDKB2=1
diff --git a/include/precompiler_flags.h b/include/precompiler_flags.h
index 43f2509b6c..78432b0d09 100644
--- a/include/precompiler_flags.h
+++ b/include/precompiler_flags.h
@@ -75,6 +75,9 @@
 #ifndef FG                  // LArge Font -> Fonte Grande
   #define FG 3
 #endif
+#ifndef TOUCH_FOOTER_HEIGHT
+  #define TOUCH_FOOTER_HEIGHT (LH * FM + 2 * (FP + 4))
+#endif
 #ifndef ROTATION
   #define ROTATION 1
 #endif
diff --git a/src/core/configPins.cpp b/src/core/configPins.cpp
index cefab9190c..a0c5dce88d 100644
--- a/src/core/configPins.cpp
+++ b/src/core/configPins.cpp
@@ -3,8 +3,8 @@
 #include "sd_functions.h"
 #include <globals.h>
 String getMacAddress() {
-    uint8_t mac[6];
-    esp_read_mac(mac, ESP_MAC_WIFI_STA);
+    uint8_t mac[6] = {0};
+    esp_read_mac(mac, ESP_MAC_BASE);
 
     char macStr[18];
     snprintf(
@@ -212,7 +212,7 @@ void BruceConfigPins::fromJson(JsonObject obj) {
     //     log_e("Fail");
     // }
     if (!root["i2c_bus"].isNull()) {
-#if defined(SOC_HP_I2C_NUM) && SOC_HP_I2C_NUM < 2 && SYS_I2C_SDA >= 0 && SYS_I2C_SCL >= 0 && \
+#if defined(SOC_HP_I2C_NUM) && SOC_HP_I2C_NUM < 2 && SYS_I2C_SDA >= 0 && SYS_I2C_SCL >= 0 &&                 \
     !defined(BRUCE_BOARD_HAS_SOFTWARE_I2C)
         log_e("I2C Pins cannot be changed on this board, using default values");
         i2c_bus = sys_i2c;
diff --git a/src/core/display.cpp b/src/core/display.cpp
index 3c5267b9c5..4c384ed068 100644
--- a/src/core/display.cpp
+++ b/src/core/display.cpp
@@ -68,12 +68,19 @@ void displayScrollingText(const String &text, Opt_Coord &coord, bool highlight)
 ***************************************************************************************/
 void TouchFooter(uint16_t color) {
 #if defined(HAS_TOUCH)
-    tft.drawRoundRect(5, tftHeight + 2, tftWidth - 10, 43, 5, color);
+    tft.drawRoundRect(
+        BORDER_OFFSET_FROM_SCREEN_EDGE,
+        tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 3,
+        tftWidth - 2 * BORDER_OFFSET_FROM_SCREEN_EDGE,
+        TOUCH_FOOTER_HEIGHT - BORDER_OFFSET_FROM_SCREEN_EDGE + 3,
+        FP + 4,
+        color
+    );
     tft.setTextColor(color);
     tft.setTextSize(FM);
-    tft.drawCentreString("PREV", tftWidth / 6, tftHeight + 4, 1);
-    tft.drawCentreString("SEL", tftWidth / 2, tftHeight + 4, 1);
-    tft.drawCentreString("NEXT", 5 * tftWidth / 6, tftHeight + 4, 1);
+    tft.drawCentreString("PREV", tftWidth / 6, tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 1, 1);
+    tft.drawCentreString("SEL", tftWidth / 2, tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 1, 1);
+    tft.drawCentreString("NEXT", 5 * tftWidth / 6, tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 1, 1);
 #endif
 }
 /***************************************************************************************
@@ -81,12 +88,19 @@ void TouchFooter(uint16_t color) {
 ** Description:   Draw touch screen footer
 ***************************************************************************************/
 void MegaFooter(uint16_t color) {
-    tft.drawRoundRect(5, tftHeight + 2, tftWidth - 10, 43, 5, color);
+    tft.drawRoundRect(
+        BORDER_OFFSET_FROM_SCREEN_EDGE,
+        tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 3,
+        tftWidth - 2 * BORDER_OFFSET_FROM_SCREEN_EDGE,
+        TOUCH_FOOTER_HEIGHT - BORDER_OFFSET_FROM_SCREEN_EDGE + 3,
+        FP + 4,
+        color
+    );
     tft.setTextColor(color);
     tft.setTextSize(FM);
-    tft.drawCentreString("Exit", tftWidth / 6, tftHeight + 4, 1);
-    tft.drawCentreString("UP", tftWidth / 2, tftHeight + 4, 1);
-    tft.drawCentreString("DOWN", 5 * tftWidth / 6, tftHeight + 4, 1);
+    tft.drawCentreString("Exit", tftWidth / 6, tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 1, 1);
+    tft.drawCentreString("UP", tftWidth / 2, tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 1, 1);
+    tft.drawCentreString("DOWN", 5 * tftWidth / 6, tftHeight + BORDER_OFFSET_FROM_SCREEN_EDGE - 1, 1);
 }
 
 /***************************************************************************************
@@ -176,12 +190,11 @@ void displayRedStripe(const String &text, uint16_t fgcolor, uint16_t bgcolor) {
     if (fgcolor == bgcolor && fgcolor == TFT_WHITE) fgcolor = TFT_BLACK;
 
     // Calculate max chars per line based on font size
-    int maxCharsFM = (tftWidth - 20) / (LW * FM);
-    int maxCharsFP = (tftWidth - 20) / (LW * FP);
+    int maxCharsFM = (tftWidth - 2 * BORDER_PAD_X) / (LW * FM);
+    int maxCharsFP = (tftWidth - 2 * BORDER_PAD_X) / (LW * FP);
 
     // Determine if we need to wrap the text
     std::vector<String> wrappedLines;
-    int boxHeight = 26; // Default height for single line
 
     if (text.length() * LW * FM < (tftWidth - 2 * FM * LW)) {
         // Text fits with FM font
@@ -193,16 +206,18 @@ void displayRedStripe(const String &text, uint16_t fgcolor, uint16_t bgcolor) {
         wrappedLines = wrapText(text, maxCharsFP);
     }
 
-    // Adjust box height based on number of lines
-    if (wrappedLines.size() > 1) { boxHeight = 13 + (wrappedLines.size() * (size == FM ? 8 : 10)); }
+    // Line pitch must fit the actual glyph height at this size, or wrapped lines overlap.
+    int lineHeight = LH * size + 2;
+    int boxHeight = wrappedLines.size() * lineHeight + 8;
 
     tft.drawPixel(0, 0, 0);
-    tft.fillRoundRect(10, tftHeight / 2 - boxHeight / 2, tftWidth - 20, boxHeight, 7, bgcolor);
+    tft.fillRoundRect(
+        BORDER_PAD_X, tftHeight / 2 - boxHeight / 2, tftWidth - 2 * BORDER_PAD_X, boxHeight, 7, bgcolor
+    );
     tft.setTextColor(fgcolor, bgcolor);
     tft.setTextSize(size);
 
     // Draw each line centered
-    int lineHeight = size == FM ? 8 : 10;
     int startY = tftHeight / 2 - (wrappedLines.size() * lineHeight) / 2;
     for (size_t i = 0; i < wrappedLines.size(); i++) {
         tft.drawCentreString(wrappedLines[i], tftWidth / 2, startY + i * lineHeight);
@@ -242,16 +257,16 @@ int8_t displayMessage(
 
     while (end != -1) {
         tft.drawString(msg.substring(start, end), tftWidth / 2, y);
-        y += FM * 8;
+        y += FM * LH;
         start = end + 1;
         end = msg.indexOf('\n', start);
     }
     tft.drawString(msg.substring(start), tftWidth / 2, y);
 
     tft.setTextDatum(BC_DATUM);
-    int16_t buttonHeight = 20;
-    int16_t buttonY = tftHeight - buttonHeight - 5;
-    int16_t buttonWidth = tftWidth / 3 - 10;
+    int16_t buttonHeight = LH * FM + 4;
+    int16_t buttonY = tftHeight - buttonHeight - BORDER_OFFSET_FROM_SCREEN_EDGE;
+    int16_t buttonWidth = tftWidth / 3 - BORDER_PAD_X;
 
     int8_t totalButtons = (leftButton ? 1 : 0) + (centerButton ? 1 : 0) + (rightButton ? 1 : 0);
     int8_t selected = 0; // Start at first available button
@@ -273,13 +288,21 @@ int8_t displayMessage(
 
         if (redraw) {
             if (leftButton) {
-                drawButton(5, buttonY, buttonWidth, buttonHeight, color, leftButton, selected == index);
+                drawButton(
+                    BORDER_OFFSET_FROM_SCREEN_EDGE,
+                    buttonY,
+                    buttonWidth,
+                    buttonHeight,
+                    color,
+                    leftButton,
+                    selected == index
+                );
                 index++;
             }
 
             if (centerButton) {
                 drawButton(
-                    tftWidth / 3 + 5,
+                    tftWidth / 3 + BORDER_OFFSET_FROM_SCREEN_EDGE,
                     buttonY,
                     buttonWidth,
                     buttonHeight,
@@ -292,7 +315,7 @@ int8_t displayMessage(
 
             if (rightButton) {
                 drawButton(
-                    tftWidth * 2 / 3 + 5,
+                    tftWidth * 2 / 3 + BORDER_OFFSET_FROM_SCREEN_EDGE,
                     buttonY,
                     buttonWidth,
                     buttonHeight,
@@ -777,13 +800,23 @@ int loopOptions(
 ** Dependencia: prog_handler =>>    0 - Flash, 1 - LittleFS
 ***************************************************************************************/
 void progressHandler(int progress, size_t total, const String &message) {
-    int barWidth = map(progress, 0, total, 0, tftWidth - 40);
+    int barHeight = LH * FP + 5;
+    int barY = tftHeight - barHeight - BORDER_PAD_Y;
+    int barWidth = map(progress, 0, total, 0, tftWidth - 4 * BORDER_PAD_X);
     if (barWidth < 3) {
-        tft.fillRect(6, 27, tftWidth - 12, tftHeight - 33, bruceConfig.bgColor);
-        tft.drawRect(18, tftHeight - 47, tftWidth - 36, 17, bruceConfig.priColor);
+        tft.fillRect(
+            BORDER_OFFSET_FROM_SCREEN_EDGE + 1,
+            STATUS_BAR_HEIGHT - 3,
+            tftWidth - 2 * (BORDER_OFFSET_FROM_SCREEN_EDGE + 1),
+            tftHeight - STATUS_BAR_HEIGHT - BORDER_OFFSET_FROM_SCREEN_EDGE,
+            bruceConfig.bgColor
+        );
+        tft.drawRect(
+            2 * BORDER_PAD_X, barY - 2, tftWidth - 4 * BORDER_PAD_X, barHeight + 4, bruceConfig.priColor
+        );
         displayRedStripe(message, TFT_WHITE, bruceConfig.priColor);
     }
-    tft.fillRect(20, tftHeight - 45, barWidth, 13, bruceConfig.priColor);
+    tft.fillRect(2 * BORDER_PAD_X, barY, barWidth, barHeight, bruceConfig.priColor);
 }
 
 /***************************************************************************************
@@ -803,24 +836,26 @@ Opt_Coord drawOptions(
     // Uncomment to update the statusBar (causes flickering)
     // drawStatusBar();
 
-    int32_t optionsTopY = tftHeight / 2 - menuSize * (FM * 8 + 4) / 2 - 5;
+    int32_t optionsTopY = tftHeight / 2 - menuSize * (FM * LH + 4) / 2 - BORDER_OFFSET_FROM_SCREEN_EDGE;
     tft.drawPixel(0, 0, bruceConfig.bgColor);
     if (firstRender) {
         tft.fillRoundRect(
-            tftWidth * 0.10, optionsTopY, tftWidth * 0.8, (FM * 8 + 4) * menuSize + 10, 5, bgcolor
+            tftWidth * 0.10, optionsTopY, tftWidth * 0.8, (FM * LH + 4) * menuSize + 10, 5, bgcolor
         );
         tft.drawRoundRect(
             tftWidth * 0.10,
-            tftHeight / 2 - menuSize * (FM * 8 + 4) / 2 - 5,
+            tftHeight / 2 - menuSize * (FM * LH + 4) / 2 - BORDER_OFFSET_FROM_SCREEN_EDGE,
             tftWidth * 0.8,
-            (FM * 8 + 4) * menuSize + 10,
+            (FM * LH + 4) * menuSize + 10,
             5,
             fgcolor
         );
     }
     tft.setTextColor(fgcolor, bgcolor);
     tft.setTextSize(FM);
-    tft.setCursor(tftWidth * 0.10 + 5, tftHeight / 2 - menuSize * (FM * 8 + 4) / 2);
+    tft.setCursor(
+        tftWidth * 0.10 + BORDER_OFFSET_FROM_SCREEN_EDGE, tftHeight / 2 - menuSize * (FM * LH + 4) / 2
+    );
 
     int i = 0;
     int init = 0;
@@ -857,14 +892,14 @@ Opt_Coord drawOptions(
             String text = "";
             if (i == index) {
                 text += ">";
-                coord.x = tftWidth * 0.10 + 5 + FM * LW;
+                coord.x = tftWidth * 0.10 + BORDER_OFFSET_FROM_SCREEN_EDGE + FM * LW;
                 coord.y = tft.getCursorY() + 4;
                 coord.size = (tftWidth * 0.8 - 10) / (LW * FM) - 1;
                 coord.fgcolor = fgcolor;
                 coord.bgcolor = bgcolor;
             } else text += " ";
             text += String(options[i].label) + "              ";
-            tft.setCursor(tftWidth * 0.10 + 5, tft.getCursorY() + 4);
+            tft.setCursor(tftWidth * 0.10 + BORDER_OFFSET_FROM_SCREEN_EDGE, tft.getCursorY() + 4);
 
             // Draw text with appropriate colors for selection
             if (i == index) { tft.setTextColor(bgcolor, bruceConfig.priColor); }
@@ -895,15 +930,22 @@ void drawSubmenu(int index, std::vector<Option> &options, const char *title) {
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     tft.setTextSize(FP);
     tft.drawPixel(0, 0, 0);
-    tft.fillRect(6, 30, tftWidth - 12, 8 * FP, bruceConfig.bgColor);
-    tft.drawString(title, 12, 30);
+    tft.fillRect(
+        BORDER_OFFSET_FROM_SCREEN_EDGE + 1,
+        STATUS_BAR_HEIGHT,
+        tftWidth - 2 * (BORDER_OFFSET_FROM_SCREEN_EDGE + 1),
+        LH * FP,
+        bruceConfig.bgColor
+    );
+    tft.drawString(title, BORDER_PAD_X, STATUS_BAR_HEIGHT);
 
     // middle of the drawing area
-    int middle = 25 /*status*/ + (tftHeight - 30 /*status + bottom margin*/) / 2;
+    int middle = (STATUS_BAR_HEIGHT - 5) /*status*/ + (tftHeight - STATUS_BAR_HEIGHT) / 2;
     // drawCentreString uses TC_DATUM, so we need to adjust the Y position
-    // 42 ensures that title isnt touched( 30 + 8 (LH) + 4(Margin))
-    int middle_up = middle - (tftHeight - 42) / 3 - FM * LH / 2 + 4;
-    int middle_down = middle + (tftHeight - 42) / 3 - FM * LH / 2;
+    // title area ensures the title row (STATUS_BAR_HEIGHT + LH*FP + margin) isn't touched
+    int titleClearance = STATUS_BAR_HEIGHT + LH * FP + 4;
+    int middle_up = middle - (tftHeight - titleClearance) / 3 - FM * LH / 2 + 4;
+    int middle_down = middle + (tftHeight - titleClearance) / 3 - FM * LH / 2;
 
     tft.setTextSize(FM);
 #if defined(HAS_TOUCH)
@@ -913,14 +955,26 @@ void drawSubmenu(int index, std::vector<Option> &options, const char *title) {
     int firstIndex = index - 1 >= 0 ? index - 1 : menuSize - 1;
     const char *firstOption = options[firstIndex].label.c_str();
     tft.setTextColor(options[firstIndex].enabled ? bruceConfig.secColor : TFT_DARKGREY);
-    tft.fillRect(6, middle_up, tftWidth - 12, 8 * FM, bruceConfig.bgColor);
+    tft.fillRect(
+        BORDER_OFFSET_FROM_SCREEN_EDGE + 1,
+        middle_up,
+        tftWidth - 2 * (BORDER_OFFSET_FROM_SCREEN_EDGE + 1),
+        LH * FM,
+        bruceConfig.bgColor
+    );
     tft.drawCentreString(firstOption, tftWidth / 2, middle_up, SMOOTH_FONT);
 
     // Selected item
     int selectedTextSize = options[index].label.length() <= tftWidth / (LW * FG) - 1 ? FG : FM;
     tft.setTextSize(selectedTextSize);
     tft.setTextColor(options[index].enabled ? bruceConfig.priColor : TFT_DARKGREY);
-    tft.fillRect(6, middle - FG * LH / 2 - 1, tftWidth - 12, FG * LH + 5, bruceConfig.bgColor);
+    tft.fillRect(
+        BORDER_OFFSET_FROM_SCREEN_EDGE + 1,
+        middle - FG * LH / 2 - 1,
+        tftWidth - 2 * (BORDER_OFFSET_FROM_SCREEN_EDGE + 1),
+        FG * LH + 5,
+        bruceConfig.bgColor
+    );
     tft.drawCentreString(options[index].label, tftWidth / 2, middle - selectedTextSize * LH / 2, SMOOTH_FONT);
     tft.drawFastHLine(
         tftWidth / 2 - strlen(options[index].label.c_str()) * selectedTextSize * LW / 2,
@@ -933,16 +987,34 @@ void drawSubmenu(int index, std::vector<Option> &options, const char *title) {
     const char *thirdOption = options[thirdIndex].label.c_str();
     tft.setTextSize(FM);
     tft.setTextColor(options[thirdIndex].enabled ? bruceConfig.secColor : TFT_DARKGREY);
-    tft.fillRect(6, middle_down, tftWidth - 12, 8 * FM, bruceConfig.bgColor);
+    tft.fillRect(
+        BORDER_OFFSET_FROM_SCREEN_EDGE + 1,
+        middle_down,
+        tftWidth - 2 * (BORDER_OFFSET_FROM_SCREEN_EDGE + 1),
+        LH * FM,
+        bruceConfig.bgColor
+    );
     tft.drawCentreString(thirdOption, tftWidth / 2, middle_down, SMOOTH_FONT);
 
-    tft.fillRect(tftWidth - 5, 0, 5, tftHeight, bruceConfig.bgColor);
-    tft.fillRect(tftWidth - 5, index * tftHeight / menuSize, 5, tftHeight / menuSize, bruceConfig.priColor);
+    tft.fillRect(
+        tftWidth - BORDER_OFFSET_FROM_SCREEN_EDGE,
+        0,
+        BORDER_OFFSET_FROM_SCREEN_EDGE,
+        tftHeight,
+        bruceConfig.bgColor
+    );
+    tft.fillRect(
+        tftWidth - BORDER_OFFSET_FROM_SCREEN_EDGE,
+        index * tftHeight / menuSize,
+        BORDER_OFFSET_FROM_SCREEN_EDGE,
+        tftHeight / menuSize,
+        bruceConfig.priColor
+    );
 
 #if defined(HAS_TOUCH)
     tft.drawCentreString("\\/", tftWidth / 2, middle_down + (FM * LH + 6), 1);
     tft.setTextColor(getColorVariation(bruceConfig.priColor), bruceConfig.bgColor);
-    tft.drawString("[ x ]", 7, 7, 1);
+    tft.drawString("[ x ]", BORDER_OFFSET_FROM_SCREEN_EDGE + 2, BORDER_OFFSET_FROM_SCREEN_EDGE + 2, 1);
     TouchFooter();
 #endif
 }
@@ -952,13 +1024,26 @@ void drawStatusBar() {
     if (bat > 0) drawBatteryStatus(bat);
 
     if (bruceConfig.theme.border) {
-        tft.drawRoundRect(5, 5, tftWidth - 10, tftHeight - 10, 5, bruceConfig.priColor);
-        tft.drawLine(5, 25, tftWidth - 6, 25, bruceConfig.priColor);
+        tft.drawRoundRect(
+            BORDER_OFFSET_FROM_SCREEN_EDGE,
+            BORDER_OFFSET_FROM_SCREEN_EDGE,
+            tftWidth - 2 * BORDER_OFFSET_FROM_SCREEN_EDGE,
+            tftHeight - 2 * BORDER_OFFSET_FROM_SCREEN_EDGE,
+            5,
+            bruceConfig.priColor
+        );
+        tft.drawLine(
+            BORDER_OFFSET_FROM_SCREEN_EDGE,
+            STATUS_BAR_HEIGHT - 5,
+            tftWidth - BORDER_OFFSET_FROM_SCREEN_EDGE - 1,
+            STATUS_BAR_HEIGHT - 5,
+            bruceConfig.priColor
+        );
     }
 
     if (clock_set) {
-        setTftDisplay(12, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
-        tft.fillRect(12, 12, 60, LH, bruceConfig.bgColor);
+        setTftDisplay(BORDER_PAD_X, BORDER_PAD_X, bruceConfig.priColor, FP, bruceConfig.bgColor);
+        tft.fillRect(BORDER_PAD_X, BORDER_PAD_X, LW * FP * 10, LH * FP, bruceConfig.bgColor);
 #if defined(HAS_RTC)
         updateTimeStr(_rtc.getTimeStruct());
 #else
@@ -966,7 +1051,7 @@ void drawStatusBar() {
 #endif
         tft.print(timeStr);
     } else {
-        setTftDisplay(12, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
+        setTftDisplay(BORDER_PAD_X, BORDER_PAD_X, bruceConfig.priColor, FP, bruceConfig.bgColor);
         tft.print("BRUCE " + String(BRUCE_VERSION));
     }
 
@@ -989,12 +1074,14 @@ void drawStatusBar() {
     if (showWG) iconCount++;
 
     if (iconCount > 0) {
+        // Icon glyphs are fixed-size bitmaps (not text), so they don't scale with FP/FM/FG;
+        // only their position within the status bar is kept relative.
         const int IW = 16;
         const int IH = 16;
         const int GAP = 6;
         int totalW = iconCount * IW + (iconCount - 1) * GAP;
         int sx = (tftWidth - totalW) / 2;
-        int iy = 7;
+        int iy = BORDER_OFFSET_FROM_SCREEN_EDGE + 2;
         int idx = 0;
 
         if (showSD) {
@@ -1041,7 +1128,7 @@ void drawMainBorder(bool clear) {
         tft.drawPixel(0, 0, 0);
         tft.fillScreen(bruceConfig.bgColor);
     }
-    setTftDisplay(12, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
+    setTftDisplay(BORDER_PAD_X, BORDER_PAD_X, bruceConfig.priColor, FP, bruceConfig.bgColor);
     tft.setTextDatum(0);
 
     // if(wifiConnected) {tft.print(timeStr);} else {tft.print("BRUCE 1.0b");}
@@ -1099,7 +1186,13 @@ void printFootnote(const String &text) {
 }
 
 void printCenterFootnote(const String &text) {
-    tft.fillRect(10, tftHeight - BORDER_PAD_X - FP * LH, tftWidth - 20, FP * LH, bruceConfig.bgColor);
+    tft.fillRect(
+        BORDER_PAD_X,
+        tftHeight - BORDER_PAD_X - FP * LH,
+        tftWidth - 2 * BORDER_PAD_X,
+        FP * LH,
+        bruceConfig.bgColor
+    );
     tft.setTextSize(FP);
     tft.drawCentreString(text, tftWidth / 2, tftHeight - BORDER_PAD_X - FP * LH, SMOOTH_FONT);
 }
@@ -1113,19 +1206,45 @@ void drawBatteryStatus(uint8_t bat) {
     uint16_t barcolor = bruceConfig.priColor;
     if (bat < 16) barcolor = color = TFT_RED;
 
-    tft.drawRoundRect(tftWidth - 42, 7, 34, 17, 2, color);
+    const int battH = STATUS_BAR_HEIGHT - (5 + BORDER_OFFSET_FROM_SCREEN_EDGE + FP * 2);
+    const int battW = 2 * battH;
+    const int battY = BORDER_OFFSET_FROM_SCREEN_EDGE + FP;
+    const int battX = tftWidth - BORDER_OFFSET_FROM_SCREEN_EDGE - battW - FP;
+    const int insetX = FP;
+    const int insetY = FP;
+    const int barW = battW - 2 * insetX;
+    const int barH = battH - 2 * insetY;
+    const int textGap = FP + 3;
+    const int textClearW = 4 * LW * FP + 4; // fits "100%" / "CHG"
+
+    tft.fillRect(battX - textGap - textClearW, battY, textClearW, battH + 1, bruceConfig.bgColor);
+    int textY = BORDER_PAD_X; // top-align with the clock/version text drawn at BORDER_PAD_X
+
     tft.setTextSize(FP);
-    tft.fillRect(tftWidth - 85, 7, 42, 18, bruceConfig.bgColor);
     if (charging) {
         tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
-        tft.drawRightString("CHG", tftWidth - 44, 12, 1);
+        tft.drawRightString("CHG", battX - textGap, textY, 1);
     } else {
         tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
-        tft.drawRightString((bat == 100 ? "" : " ") + String(bat) + "%", tftWidth - 44, 12, 1);
+        tft.drawRightString((bat == 100 ? "" : " ") + String(bat) + "%", battX - textGap, textY, 1);
     }
-    tft.fillRoundRect(tftWidth - 40, 9, 30 * bat / 100, 13, 2, barcolor);
-    tft.drawLine(tftWidth - 30, 9, tftWidth - 30, 9 + 13, bruceConfig.bgColor);
-    tft.drawLine(tftWidth - 20, 9, tftWidth - 20, 9 + 13, bruceConfig.bgColor);
+
+    tft.drawRoundRect(battX, battY, battW, battH, 2, color);
+    tft.fillRoundRect(battX + insetX, battY + insetY, barW * bat / 100, barH, 1, barcolor);
+    tft.drawLine(
+        battX + insetX + barW / 3,
+        battY + insetY,
+        battX + insetX + barW / 3,
+        battY + insetY + barH,
+        bruceConfig.bgColor
+    );
+    tft.drawLine(
+        battX + insetX + 2 * barW / 3,
+        battY + insetY,
+        battX + insetX + 2 * barW / 3,
+        battY + insetY + barH,
+        bruceConfig.bgColor
+    );
 }
 
 void drawWireguardStatus(int x, int y) {
diff --git a/src/core/display.h b/src/core/display.h
index 43167b6146..cc31560845 100644
--- a/src/core/display.h
+++ b/src/core/display.h
@@ -7,10 +7,10 @@
 #include <LittleFS.h>
 #include <SD.h>
 #include <globals.h>
-#define STATUS_BAR_HEIGHT 30
 #define BORDER_OFFSET_FROM_SCREEN_EDGE 5
-#define BORDER_PAD_X 10
-#define BORDER_PAD_Y 28
+#define BORDER_PAD_X (LW * FP + 4)
+#define STATUS_BAR_HEIGHT (LH * FM + 14)
+#define BORDER_PAD_Y (STATUS_BAR_HEIGHT - 2)
 #define MENU_TYPE_MAIN 0
 #define MENU_TYPE_SUBMENU 1
 #define MENU_TYPE_REGULAR 2
diff --git a/src/core/main_menu.cpp b/src/core/main_menu.cpp
index a755009908..04961ee92a 100644
--- a/src/core/main_menu.cpp
+++ b/src/core/main_menu.cpp
@@ -124,7 +124,7 @@ void MainMenu::buildGridLayout(int itemCount) {
     if (itemCount < 1) itemCount = 1;
 
     int areaX = BORDER_OFFSET_FROM_SCREEN_EDGE + 2;
-    int areaY = 28; // first line free under the status bar separator
+    int areaY = STATUS_BAR_HEIGHT - 2; // first line free under the status bar separator
     int areaW = tftWidth - 2 * areaX - SCROLLBAR_AREA;
     int areaH = tftHeight - areaY - areaX;
 
diff --git a/src/core/mykeyboard.cpp b/src/core/mykeyboard.cpp
index ebebdfe094..fc8fc90476 100644
--- a/src/core/mykeyboard.cpp
+++ b/src/core/mykeyboard.cpp
@@ -502,10 +502,10 @@ String generalKeyboard(
     // so these do not change
     /*---------------------------------------------------------------------------------------*/
 
-    const int PAD = 2;
-    const int KBLH = 6 + LH * FM;
+    const int PAD = FP + 1;
+    const int KBLH = (BORDER_OFFSET_FROM_SCREEN_EDGE + 1) + LH * FM;
     const int counter_height = LH * FP;
-    const int top_button_text_y = 2 + (KBLH - LH * FM) / 2;
+    const int top_button_text_y = (FP + 1) + (KBLH - LH * FM) / 2;
     const int counter_y = KBLH + 4;
     const int textbox_y = KBLH + counter_height + 5;
     const int textbox_text_y = textbox_y + 2;
@@ -686,13 +686,15 @@ String generalKeyboard(
             tft.setTextColor(getComplementaryColor2(bruceConfig.bgColor), bruceConfig.bgColor);
             String chars_counter = String(current_text.length()) + "/" + String(max_size);
             tft.fillRect(
-                tftWidth - ((chars_counter.length() * LW * FP) + 20),
+                tftWidth - ((chars_counter.length() * LW * FP) + 2 * BORDER_PAD_X),
                 counter_y,
-                (chars_counter.length() * LW * FP) + 20,
+                (chars_counter.length() * LW * FP) + 2 * BORDER_PAD_X,
                 LH * FP,
                 bruceConfig.bgColor
             ); // clear previous text
-            tft.drawString(chars_counter, tftWidth - ((chars_counter.length() * LW * FP) + 10), counter_y);
+            tft.drawString(
+                chars_counter, tftWidth - ((chars_counter.length() * LW * FP) + BORDER_PAD_X), counter_y
+            );
 
             // Prints the title of the textbox, it should report what the user has to write in it
             tft.setTextColor(getComplementaryColor2(bruceConfig.bgColor), 0x5AAB);
@@ -784,14 +786,14 @@ String generalKeyboard(
             tft.setTextSize(FP);
             if (current_text.length() > (max_FP_size)) {
                 cursor_y = textbox_text_y + LH * FP;
-                cursor_x = 5 + (current_text.length() - max_FP_size) * LW * FP;
+                cursor_x = BORDER_OFFSET_FROM_SCREEN_EDGE + (current_text.length() - max_FP_size) * LW * FP;
             } else {
                 cursor_y = textbox_text_y;
-                cursor_x = 5 + current_text.length() * LW * FP;
+                cursor_x = BORDER_OFFSET_FROM_SCREEN_EDGE + current_text.length() * LW * FP;
             }
         } else {
             cursor_y = textbox_text_y;
-            cursor_x = 5 + current_text.length() * LW * FM;
+            cursor_x = BORDER_OFFSET_FROM_SCREEN_EDGE + current_text.length() * LW * FM;
         }
         // Prioritize Serial Input for navigation
         if (SerialCmdPress) { // only for Remote Control, if no type of input was detected on device
diff --git a/src/core/scrollableTextArea.cpp b/src/core/scrollableTextArea.cpp
index f554a476fe..0457e8a4f9 100644
--- a/src/core/scrollableTextArea.cpp
+++ b/src/core/scrollableTextArea.cpp
@@ -3,7 +3,7 @@
 ScrollableTextArea::ScrollableTextArea(const String &title)
     : firstVisibleLine{0}, _redraw{true}, _title(title), _fontSize(FP), _startX(BORDER_PAD_X),
       _startY(BORDER_PAD_Y), _width(tftWidth - 2 * BORDER_PAD_X),
-      _height(tftHeight - 4 - BORDER_PAD_X - BORDER_PAD_Y) {
+      _height(tftHeight - BORDER_OFFSET_FROM_SCREEN_EDGE - BORDER_PAD_X - BORDER_PAD_Y) {
     drawMainBorder();
 
     if (!_title.isEmpty()) {
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 97b106e36a..4d53f9475a 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -91,14 +91,14 @@ int gsetRotation(bool set) {
     if (result & 0b01) { // if 1 or 3
         tftWidth = TFT_HEIGHT;
 #if defined(HAS_TOUCH)
-        tftHeight = TFT_WIDTH - 20;
+        tftHeight = TFT_WIDTH - TOUCH_FOOTER_HEIGHT;
 #else
         tftHeight = TFT_WIDTH;
 #endif
     } else { // if 2 or 0
         tftWidth = TFT_WIDTH;
 #if defined(HAS_TOUCH)
-        tftHeight = TFT_HEIGHT - 20;
+        tftHeight = TFT_HEIGHT - TOUCH_FOOTER_HEIGHT;
 #else
         tftHeight = TFT_HEIGHT;
 #endif
@@ -273,7 +273,7 @@ void setMainMenuStyleMenu() {
          bruceConfig.mainMenuStyle == MAIN_MENU_CAROUSEL},
         {"Grid",
          []() { bruceConfig.setMainMenuStyle(MAIN_MENU_GRID); },
-         bruceConfig.mainMenuStyle == MAIN_MENU_GRID     },
+         bruceConfig.mainMenuStyle == MAIN_MENU_GRID    },
     };
     addOptionToMainMenu();
 
@@ -1033,7 +1033,7 @@ void runClockLoop(bool showMenuHint) {
 
             // "OK to show menu" hint management
             if (hintVisible && (millis() - hintStartTime < 5000)) {
-                tft.setTextSize(1);
+                tft.setTextSize(FP);
                 tft.drawCentreString("OK to show menu", tftWidth / 2, tftHeight / 2 + 25, 1);
             } else if (hintVisible && (millis() - hintStartTime >= 5000)) {
                 // Clear hint after 5 seconds
diff --git a/src/main.cpp b/src/main.cpp
index 7b568b10f9..b298b2f9c0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -156,7 +156,8 @@ tft_sprite draw = tft_sprite(&tft);
 volatile int tftWidth = TFT_HEIGHT;
 #ifdef HAS_TOUCH
 volatile int tftHeight =
-    TFT_WIDTH - 20; // 20px to draw the TouchFooter(), were the btns are being read in touch devices.
+    TFT_WIDTH - TOUCH_FOOTER_HEIGHT; // reserved to draw the TouchFooter(), were the btns are being read in
+                                      // touch devices.
 #else
 volatile int tftHeight = TFT_WIDTH;
 #endif
@@ -257,7 +258,7 @@ void begin_tft() {
     tft.setRotation(bruceConfigPins.rotation);
     tftWidth = tft.width();
 #ifdef HAS_TOUCH
-    tftHeight = tft.height() - 20;
+    tftHeight = tft.height() - TOUCH_FOOTER_HEIGHT;
 #else
     tftHeight = tft.height();
 #endif
diff --git a/src/modules/NRF24/nrf_mousejack.cpp b/src/modules/NRF24/nrf_mousejack.cpp
index 4dd6a9dcef..4f3082a0ec 100644
--- a/src/modules/NRF24/nrf_mousejack.cpp
+++ b/src/modules/NRF24/nrf_mousejack.cpp
@@ -605,18 +605,19 @@ static void mj_drawScanScreen(uint8_t currentCh, bool initial) {
 
     // Status line (below title, inside border)
     tft.setTextSize(FP);
-    tft.fillRect(7, contentY, tftWidth - 14, 12, bruceConfig.bgColor);
+    int rowH = LH * FP + 4;
+    tft.fillRect(7, contentY, tftWidth - 14, rowH, bruceConfig.bgColor);
     tft.setTextColor(TFT_GREEN, bruceConfig.bgColor);
     char statusBuf[40];
     snprintf(statusBuf, sizeof(statusBuf), "CH:%3d  Targets:%d", currentCh, mj_targetCount);
     tft.drawCentreString(statusBuf, tftWidth / 2, contentY, 1);
 
     // Target list
-    int maxItems = listH / 12;
+    int maxItems = listH / rowH;
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     for (int i = 0; i < maxItems && i < mj_targetCount; i++) {
-        int y = listY + i * 12;
-        tft.fillRect(7, y, tftWidth - 14, 12, bruceConfig.bgColor);
+        int y = listY + i * rowH;
+        tft.fillRect(7, y, tftWidth - 14, rowH, bruceConfig.bgColor);
         char line[40];
         snprintf(
             line,
@@ -754,10 +755,10 @@ static void mj_attackString(int targetIndex) {
     tft.drawCentreString(
         "[" + String(mj_getTypeLabel(target.type)) + "] " + mj_formatAddr(target), tftWidth / 2, cy, 1
     );
-    cy += 16;
+    cy += LH * FP + 8;
     tft.setTextColor(TFT_GREEN, bruceConfig.bgColor);
     tft.drawCentreString("Sending keystrokes...", tftWidth / 2, cy, 1);
-    cy += 16;
+    cy += LH * FP + 8;
 
     // Show first 30 chars of the text
     String preview = text.substring(0, 30);
@@ -811,10 +812,10 @@ static void mj_attackDucky(int targetIndex) {
     tft.drawCentreString(
         "[" + String(mj_getTypeLabel(target.type)) + "] " + mj_formatAddr(target), tftWidth / 2, cy, 1
     );
-    cy += 16;
+    cy += LH * FP + 8;
     tft.setTextColor(TFT_GREEN, bruceConfig.bgColor);
     tft.drawCentreString("Running script...", tftWidth / 2, cy, 1);
-    cy += 16;
+    cy += LH * FP + 8;
 
     // Show filename
     int lastSlash = filepath.lastIndexOf('/');
diff --git a/src/modules/NRF24/nrf_spectrum.cpp.bak b/src/modules/NRF24/nrf_spectrum.cpp.bak
deleted file mode 100644
index cd27dc98da..0000000000
--- a/src/modules/NRF24/nrf_spectrum.cpp.bak
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
- * @file nrf_spectrum.cpp
- * @brief Enhanced 2.4 GHz spectrum analyzer for Bruce firmware.
- *
- * Features:
- *  - 126 channels (full 2.400-2.525 GHz ISM band)
- *  - Color gradient bars (green→yellow→red based on signal level)
- *  - Peak hold markers with slow decay
- *  - Smooth EMA (Exponential Moving Average) filtering
- *  - 6 simultaneous receive pipes for maximum sensitivity
- *  - Adaptive layout for all screen resolutions
- *  - Grid lines every 10 channels for visual reference
- *  - PA+LNA module support (E01-ML01SP2: -90dBm effective threshold)
- *
- * RPD (Received Power Detector) is binary: 1 = signal above -64dBm
- * at chip input (-90dBm with PA+LNA module).
- */
-
-#include "nrf_spectrum.h"
-#include "core/display.h"
-#include "core/mykeyboard.h"
-
-// ── Spectrum data ───────────────────────────────────────────────
-static uint8_t channel[NRF_SPECTRUM_CHANNELS];
-static uint8_t peakHold[NRF_SPECTRUM_CHANNELS];
-static uint8_t peakTimer[NRF_SPECTRUM_CHANNELS];
-
-#define PEAK_HOLD_SWEEPS 25 // Number of sweeps before peak decays
-
-// ── Device label tracking ────────────────────────────────────────
-#define LABEL_DECAY_SWEEPS 10                           // Sweeps until label fades after signal gone
-static uint8_t deviceLabelTimer[NRF_SPECTRUM_CHANNELS]; // Decay timer per channel
-
-// Display mode (0=bars+peaks, 1=bars only, 2=bars+device labels, 3=waterfall)
-static uint8_t specDisplayMode = 0;
-
-// Waterfall mode state
-static int waterfallY = 0;
-static unsigned long sweepCount = 0;
-
-// Device type detection for channels
-enum DeviceType { DEV_NONE, DEV_WIFI, DEV_BLE, DEV_BT, DEV_ZIGBEE };
-
-struct DeviceInfo {
-    const char *label;
-    uint16_t labelColor;
-};
-
-static const struct DeviceInfo deviceInfo[] = {
-    {nullptr,  TFT_BLACK  }, // DEV_NONE
-    {"WiFi",   TFT_WHITE  }, // DEV_WIFI
-    {"BLE",    TFT_CYAN   }, // DEV_BLE
-    {"BT",     TFT_MAGENTA}, // DEV_BT
-    {"Zigbee", TFT_GREEN  }, // DEV_ZIGBEE
-};
-
-// Detect device type from channel number
-static inline DeviceType getDeviceType(int channel) {
-    // WiFi: ch 1-14 (2.412-2.484 GHz) → NRF ch 12-84
-    if (channel >= 12 && channel <= 84) return DEV_WIFI;
-
-    // BLE Advertising: ch 37-39 (2.402, 2.426, 2.480 GHz) → NRF ch 2, 26, 80
-    if (channel == 2 || channel == 26 || channel == 80) return DEV_BLE;
-
-    // BT Classic: ch ~50-79 (2.450-2.480 GHz) → NRF ch 50-79
-    if (channel >= 50 && channel <= 79) return DEV_BT;
-
-    // Zigbee/Thread: ch 11-26 + 5-80 with 5MHz spacing (2.405-2.480 GHz) → NRF ch 5,10,15...80
-    if (channel >= 5 && channel <= 80 && (channel - 5) % 5 == 0) return DEV_ZIGBEE;
-
-    return DEV_NONE;
-}
-
-// ── Color gradient based on signal intensity (0-100) ────────────
-static uint16_t getSpectrumColor(uint8_t level) {
-    if (level > 85) return TFT_RED;
-    if (level > 65) return TFT_ORANGE;
-    if (level > 45) return TFT_YELLOW;
-    if (level > 25) return TFT_GREEN;
-    return TFT_DARKGREEN;
-}
-
-// ── Layout calculations ─────────────────────────────────────────
-static int spec_headerH;  // Header area height
-static int spec_footerH;  // Footer area height (freq labels)
-static int spec_barAreaY; // Top of bar area
-static int spec_barAreaH; // Height of bar area
-static int spec_mirrorH;  // Height of top mirror area
-static int spec_marginL;  // Left margin
-static int spec_drawW;    // Available drawing width (after margins)
-
-static void calcLayout() {
-    spec_headerH = 0;
-    spec_footerH = 14;
-    spec_mirrorH = 0; // Mirror removed — eliminates top artifacts
-    spec_barAreaY = 0;
-    spec_barAreaH = tftHeight - spec_footerH - 2;
-    spec_marginL = max(2, tftWidth / 80); // Small left margin
-    int marginR = spec_marginL;           // Symmetric right margin
-    spec_drawW = tftWidth - spec_marginL - marginR;
-}
-
-/// Get x position and width for channel i, distributed proportionally
-static inline void getBarGeom(int i, int &x, int &w) {
-    x = spec_marginL + (i * spec_drawW) / NRF_SPECTRUM_CHANNELS;
-    int nextX = spec_marginL + ((i + 1) * spec_drawW) / NRF_SPECTRUM_CHANNELS;
-    w = max(1, nextX - x);
-}
-
-// ── Scanning and drawing ────────────────────────────────────────
-String scanChannels(bool web) {
-    String result = web ? "{" : "";
-
-    // Toggle CE low during channel switch
-    digitalWrite(bruceConfigPins.NRF24_bus.io0, LOW);
-
-    for (int i = 0; i < NRF_SPECTRUM_CHANNELS; i++) {
-        NRFradio.setChannel(i);
-        NRFradio.startListening();
-        delayMicroseconds(170); // 130µs PLL settle + 40µs RPD sample window
-        NRFradio.stopListening();
-
-        int rpd = NRFradio.testRPD() ? 1 : 0;
-
-        // EMA smoothing: fast attack, medium decay
-        // Attack: signal instantly jumps to ~50 on first hit
-        // Decay: drops ~25% per sweep when signal gone
-        if (rpd) {
-            channel[i] = (uint8_t)min(100, (int)((channel[i] + 100) / 2));
-            deviceLabelTimer[i] = LABEL_DECAY_SWEEPS; // Reset label timer on active signal
-        } else {
-            channel[i] = (uint8_t)((channel[i] * 3) / 4);
-            // Decay label timer when no signal
-            if (deviceLabelTimer[i] > 0) { deviceLabelTimer[i]--; }
-        }
-
-        // Peak hold tracking
-        if (channel[i] >= peakHold[i]) {
-            peakHold[i] = channel[i];
-            peakTimer[i] = PEAK_HOLD_SWEEPS;
-        } else if (peakTimer[i] > 0) {
-            peakTimer[i]--;
-        } else {
-            if (peakHold[i] > 2) peakHold[i] -= 2;
-            else peakHold[i] = 0;
-        }
-    }
-
-    digitalWrite(bruceConfigPins.NRF24_bus.io0, HIGH);
-
-    sweepCount++;
-
-    // ── Draw spectrum bars (modes 0, 1, 2) ──────────────────────
-    if (specDisplayMode != 3) {
-    uint8_t maxLevel = 0;
-    uint8_t maxCh = 0;
-
-    for (int i = 0; i < NRF_SPECTRUM_CHANNELS; i++) {
-        int x, w;
-        getBarGeom(i, x, w);
-
-        int level = channel[i];
-        if (level > maxLevel) {
-            maxLevel = level;
-            maxCh = i;
-        }
-
-        int barH = (level * spec_barAreaH) / 100;
-        int peakH = (peakHold[i] * spec_barAreaH) / 100;
-
-        // Grid line color (every 10 channels)
-        uint16_t gridColor = (i % 10 == 0) ? TFT_DARKGREY : bruceConfig.bgColor;
-
-        // Main bar area: clear above, draw bar from bottom
-        if (barH < spec_barAreaH) { tft.fillRect(x, spec_barAreaY, w, spec_barAreaH - barH, gridColor); }
-        if (barH > 0) {
-            uint16_t barColor = getSpectrumColor(level);
-            tft.fillRect(x, spec_barAreaY + spec_barAreaH - barH, w, barH, barColor);
-        }
-
-        // Peak hold marker (Mode 0 only): white line segment
-        if (specDisplayMode == 0 && peakH > 0 && peakH >= barH) {
-            int peakY = spec_barAreaY + spec_barAreaH - peakH;
-            if (peakY >= spec_barAreaY && peakY < spec_barAreaY + spec_barAreaH) {
-                tft.fillRect(x, peakY, w, 1, TFT_WHITE);
-            }
-        }
-
-        if (web) {
-            if (i > 0) result += ",";
-            result += String(level);
-        }
-    }
-
-    // Stats overlay (top, drawn after all bars)
-    {
-        int activeCh = 0;
-        for (int i = 0; i < NRF_SPECTRUM_CHANNELS; i++) {
-            if (channel[i] > 10) activeCh++;
-        }
-        tft.setTextSize(FP);
-        char statBuf[36];
-        int stY = 1;
-        // Right: peak info
-        if (maxLevel > 10) {
-            int peakFreq = 2400 + (int)maxCh;
-            snprintf(statBuf, sizeof(statBuf), "PK:%dMHz %d%%", peakFreq, (int)maxLevel);
-            tft.fillRect(tftWidth - 110, stY, 110, 9, bruceConfig.bgColor);
-            tft.setTextColor(TFT_YELLOW, bruceConfig.bgColor);
-            tft.drawRightString(statBuf, tftWidth - spec_marginL - 2, stY, 1);
-        }
-        // Left (below mode): active + sweep count
-        snprintf(statBuf, sizeof(statBuf), "ACT:%d SW:%lu", activeCh, sweepCount);
-        tft.fillRect(spec_marginL, stY + 10, 90, 9, bruceConfig.bgColor);
-        tft.setTextColor(TFT_CYAN, bruceConfig.bgColor);
-        tft.drawString(statBuf, spec_marginL, stY + 10, 1);
-    }
-
-    // ── Draw device labels (Mode 2 only) ──────────────────────────
-    if (specDisplayMode == 2) {
-        // Group labels by channel and stack vertically
-        int labelY = 2;
-        for (int i = 0; i < NRF_SPECTRUM_CHANNELS; i++) {
-            // Show label if signal present or timer still active
-            if ((channel[i] > 10) || (deviceLabelTimer[i] > 0)) {
-                DeviceType dev = getDeviceType(i);
-
-                if (dev != DEV_NONE) {
-                    // Display known device label
-                    int x, w;
-                    getBarGeom(i, x, w);
-                    int labelX = x + w / 2; // Center on channel
-
-                    tft.setTextSize(FP);
-                    tft.setTextColor(deviceInfo[dev].labelColor, bruceConfig.bgColor);
-                    tft.drawCentreString(deviceInfo[dev].label, labelX, labelY, 1);
-
-                    labelY += 8;                       // Stack labels vertically
-                    if (labelY > tftHeight / 4) break; // Prevent overflow
-                } else if (channel[i] > 10) {
-                    // Unknown device: show small "?" in gray
-                    int x, w;
-                    getBarGeom(i, x, w);
-                    int labelX = x + w / 2;
-
-                    tft.setTextSize(1); // Tiny font
-                    tft.setTextColor(TFT_DARKGREY, bruceConfig.bgColor);
-                    tft.drawCentreString("?", labelX, labelY, 1);
-
-                    labelY += 6;
-                    if (labelY > tftHeight / 5) break;
-                }
-            }
-        }
-    }
-    } // end if (specDisplayMode != 3)
-
-    // ── Waterfall mode (mode 3) ─────────────────────────────────
-    if (specDisplayMode == 3) {
-        int rowH = max(2, spec_barAreaH / 60);
-        for (int i = 0; i < NRF_SPECTRUM_CHANNELS; i++) {
-            int x, w;
-            getBarGeom(i, x, w);
-            uint16_t color = (channel[i] > 3) ? getSpectrumColor(channel[i]) : bruceConfig.bgColor;
-            tft.fillRect(x, spec_barAreaY + waterfallY, w, rowH, color);
-        }
-        // Draw cursor line at next position
-        int nextY = waterfallY + rowH;
-        if (nextY < spec_barAreaH) {
-            tft.drawFastHLine(spec_marginL, spec_barAreaY + nextY, spec_drawW, TFT_DARKGREY);
-        }
-        waterfallY += rowH;
-        if (waterfallY >= spec_barAreaH) waterfallY = 0;
-    }
-
-    if (web) result += "}";
-    return result;
-}
-
-void nrf_spectrum() {
-    tft.fillScreen(bruceConfig.bgColor);
-
-    // Initialize data
-    memset(channel, 0, sizeof(channel));
-    memset(peakHold, 0, sizeof(peakHold));
-    memset(peakTimer, 0, sizeof(peakTimer));
-    memset(deviceLabelTimer, 0, sizeof(deviceLabelTimer));
-    specDisplayMode = 0; // Start in mode 0
-    waterfallY = 0;
-    sweepCount = 0;
-
-    // Calculate layout
-    calcLayout();
-
-    // Draw frequency labels at bottom with WiFi channel markers
-    tft.setTextSize(FP);
-    tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
-    int labelY = tftHeight - spec_footerH + 2;
-    tft.drawString("2.400", spec_marginL, labelY, 1);
-    tft.drawCentreString("2.462", tftWidth / 2, labelY, 1);
-    tft.drawRightString("2.525", tftWidth - spec_marginL, labelY, 1);
-
-    // WiFi channel markers (ch1=nrf12, ch6=nrf37, ch11=nrf62)
-    tft.setTextColor(TFT_CYAN, bruceConfig.bgColor);
-    int wifiChs[] = {12, 37, 62};
-    const char *wifiLabels[] = {"W1", "W6", "W11"};
-    for (int w = 0; w < 3; w++) {
-        int wx, ww;
-        getBarGeom(wifiChs[w], wx, ww);
-        tft.drawCentreString(wifiLabels[w], wx + ww / 2, labelY + 7, 1);
-        // Draw vertical tick mark at separator line
-        tft.drawFastVLine(wx + ww / 2, spec_barAreaY + spec_barAreaH + 1, 3, TFT_CYAN);
-    }
-
-    // Draw separator line
-    tft.drawFastHLine(0, spec_barAreaY + spec_barAreaH + 1, tftWidth, TFT_DARKGREY);
-
-    // Draw mode indicator
-    tft.setTextSize(FP);
-    tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
-    const char *modeStr[] = {"Mode:Peak", "Mode:Bar", "Mode:Dev", "Mode:WF"};
-    tft.drawString(modeStr[specDisplayMode], spec_marginL, 2, 1);
-
-    if (nrf_start(NRF_MODE_SPI)) {
-        // Configure for wideband spectrum sensing
-        NRFradio.setAutoAck(false);
-        NRFradio.disableCRC();
-        NRFradio.setAddressWidth(2);
-
-        // Open 6 reading pipes at noise-detection addresses
-        // More pipes = higher sensitivity (radio checks all in parallel)
-        const uint8_t noiseAddress[][2] = {
-            {0x55, 0x55},
-            {0xAA, 0xAA},
-            {0xA0, 0xAA},
-            {0xAB, 0xAA},
-            {0xAC, 0xAA},
-            {0xAD, 0xAA}
-        };
-        for (uint8_t i = 0; i < 6; ++i) { NRFradio.openReadingPipe(i, noiseAddress[i]); }
-
-        NRFradio.setDataRate(RF24_1MBPS);
-
-        while (!check(EscPress)) {
-            scanChannels();
-
-            // SEL to cycle through modes
-            if (check(SelPress)) {
-                specDisplayMode = (specDisplayMode + 1) % 4;
-                waterfallY = 0;
-                // Clear only spectrum bar area, preserve frequency labels at bottom
-                tft.fillRect(0, spec_barAreaY, tftWidth, spec_barAreaH, bruceConfig.bgColor);
-                delay(200);
-            }
-        }
-
-        NRFradio.stopListening();
-        NRFradio.powerDown();
-        delay(250);
-    } else {
-        Serial.println("Fail Starting radio");
-        displayError("NRF24 not found");
-        delay(500);
-    }
-}
diff --git a/src/modules/badusb_ble/ducky_typer.cpp b/src/modules/badusb_ble/ducky_typer.cpp
index c1a2f5ed73..e6e30a3a1e 100644
--- a/src/modules/badusb_ble/ducky_typer.cpp
+++ b/src/modules/badusb_ble/ducky_typer.cpp
@@ -904,7 +904,7 @@ void key_input(FS fs, const String &bad_script, HIDInterface *_hid) {
                         delay(50);
                     }
                     printStatusBadUSBBLE("Running");
-                    tft.setTextSize(1);
+                    tft.setTextSize(FP);
                 } else if (PriCmd->type == DuckyCommandType_Delay) {
                     if ((int)PriCmd->key > 0) delay(DEF_DELAY);
                     else {
@@ -1026,10 +1026,12 @@ void ducky_keyboard(HIDInterface *&hid, bool ble) {
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     tft.setTextSize(FP);
     drawMainBorder();
-    tft.setCursor(10, 28);
+    tft.setCursor(BORDER_PAD_X, BORDER_PAD_Y);
     if (ble) tft.println("BLE Keyboard:");
     else tft.println("USB Keyboard:");
-    tft.drawCentreString("> " + String(KB_HID_EXIT_MSG) + " <", tftWidth / 2, tftHeight - 20, 1);
+    tft.drawCentreString(
+        "> " + String(KB_HID_EXIT_MSG) + " <", tftWidth / 2, tftHeight - BORDER_PAD_X - LH * FP, 1
+    );
     tft.setTextSize(FP);
 
     while (1) {
@@ -1422,18 +1424,24 @@ void PresenterMode(HIDInterface *&hid, bool ble) {
         tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
         tft.drawCentreString("Time", tftWidth / 2, tftHeight / 2 + 15, 1);
 
-        tft.setTextSize(1);
+        tft.setTextSize(FP);
         tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
         tft.drawCentreString("<< PREV | SEL | NEXT >>", tftWidth / 2, tftHeight - 15, 1);
     };
 
+    // Tuned for text size 4 at LW=6/LH=8 defaults; scaled proportionally for other boards.
+    const int slideSize = FG + 1;
+    const int slideClearH = 40 * slideSize / 4;
+    const int slideClearY = tftHeight / 2 - 35 * slideSize / 4;
+    const int slideDrawY = tftHeight / 2 - 30 * slideSize / 4;
+
     auto updateSlideDisplay = [&]() {
-        tft.fillRect(0, tftHeight / 2 - 35, tftWidth, 40, bruceConfig.bgColor);
+        tft.fillRect(0, slideClearY, tftWidth, slideClearH, bruceConfig.bgColor);
 
-        tft.setTextSize(4);
+        tft.setTextSize(slideSize);
         tft.setTextColor(TFT_WHITE, bruceConfig.bgColor);
         String slideStr = "Slide " + String(currentSlide);
-        tft.drawCentreString(slideStr, tftWidth / 2, tftHeight / 2 - 30, 1);
+        tft.drawCentreString(slideStr, tftWidth / 2, slideDrawY, 1);
         lastDisplayedSlide = currentSlide;
     };
 
@@ -1452,10 +1460,14 @@ void PresenterMode(HIDInterface *&hid, bool ble) {
             snprintf(timeBuffer, sizeof(timeBuffer), "%02d:%02d", minutes, seconds);
         }
 
-        tft.fillRect(0, tftHeight / 2 + 30, tftWidth, 30, bruceConfig.bgColor);
-        tft.setTextSize(3);
+        const int timerSize = FG;
+        const int timerClearY = tftHeight / 2 + 30 * timerSize / 3;
+        const int timerClearH = 30 * timerSize / 3;
+        const int timerDrawY = tftHeight / 2 + 35 * timerSize / 3;
+        tft.fillRect(0, timerClearY, tftWidth, timerClearH, bruceConfig.bgColor);
+        tft.setTextSize(timerSize);
         tft.setTextColor(timerStarted ? TFT_GREEN : TFT_DARKGREY, bruceConfig.bgColor);
-        tft.drawCentreString(timeBuffer, tftWidth / 2, tftHeight / 2 + 35, 1);
+        tft.drawCentreString(timeBuffer, tftWidth / 2, timerDrawY, 1);
 
         lastDisplayedSeconds = elapsed;
     };
diff --git a/src/modules/ble/BLE_Suite.cpp b/src/modules/ble/BLE_Suite.cpp
index 2aadee378d..27c887d097 100644
--- a/src/modules/ble/BLE_Suite.cpp
+++ b/src/modules/ble/BLE_Suite.cpp
@@ -5549,10 +5549,10 @@ void runAudioControlTest(NimBLEAddress target) {
             tft.drawRect(5, 5, tftWidth - 10, tftHeight - 10, TFT_WHITE);
 
             tft.setTextColor(TFT_WHITE, bruceConfig.bgColor);
-            tft.setTextSize(2);
+            tft.setTextSize(FM);
             tft.setCursor((tftWidth - tft.textWidth("AUDIO CONTROL TEST")) / 2, 15);
             tft.print("AUDIO CONTROL TEST");
-            tft.setTextSize(1);
+            tft.setTextSize(FP);
 
             tft.setTextColor(TFT_WHITE, bruceConfig.bgColor);
             tft.setCursor(20, 60);
diff --git a/src/modules/ble/ble_common.cpp b/src/modules/ble/ble_common.cpp
index e814d033ec..5494bfba1f 100644
--- a/src/modules/ble/ble_common.cpp
+++ b/src/modules/ble/ble_common.cpp
@@ -66,11 +66,15 @@ char strAddl[200];
 void ble_info(const String &name, const String &address, const String &signal) {
     drawMainBorder();
     tft.setTextColor(bruceConfig.priColor);
-    tft.drawCentreString("-=Information=-", tftWidth / 2, 28, SMOOTH_FONT);
-    tft.drawString("Name: " + name, 10, 48);
-    tft.drawString("Adresse: " + address, 10, 66);
-    tft.drawString("Signal: " + String(signal) + " dBm", 10, 84);
-    tft.drawCentreString("   Press " + String(BTN_ALIAS) + " to act", tftWidth / 2, tftHeight - 20, 1);
+    int rowStep = LH * FP + 10;
+    int row1Y = BORDER_PAD_Y + FM * LH + 4;
+    tft.drawCentreString("-=Information=-", tftWidth / 2, BORDER_PAD_Y, SMOOTH_FONT);
+    tft.drawString("Name: " + name, BORDER_PAD_X, row1Y);
+    tft.drawString("Adresse: " + address, BORDER_PAD_X, row1Y + rowStep);
+    tft.drawString("Signal: " + String(signal) + " dBm", BORDER_PAD_X, row1Y + 2 * rowStep);
+    tft.drawCentreString(
+        "   Press " + String(BTN_ALIAS) + " to act", tftWidth / 2, tftHeight - BORDER_PAD_X - LH * FP, 1
+    );
 
     delay(300);
     while (!check(SelPress)) {
@@ -294,7 +298,12 @@ void disPlayBLESend() {
     uint8_t senddata[2] = {0};
     tft.fillScreen(bruceConfig.bgColor);
     drawMainBorder();
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
+    int contentY = STATUS_BAR_HEIGHT - 4;
+    int contentH = tftHeight - contentY - 10;
+    int textX = BORDER_PAD_X + 2;
+    int rowStep = FM * LH + 9;
+    int row1Y = contentY + FM * LH + 8;
 
     if (!pServer) {
         if (!initBLEServer()) {
@@ -315,16 +324,16 @@ void disPlayBLESend() {
     while (!check(EscPress)) {
         if (deviceConnected) {
             if (!wasConnected) {
-                tft.fillRect(10, 26, tftWidth - 20, tftHeight - 36, TFT_BLACK);
-                drawBLE_beacon(180, 28, TFT_BLUE);
+                tft.fillRect(BORDER_PAD_X, contentY, tftWidth - 2 * BORDER_PAD_X, contentH, TFT_BLACK);
+                drawBLE_beacon(180, contentY + 2, TFT_BLUE);
                 tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
                 tft.setTextSize(FM);
-                tft.setCursor(12, 50);
+                tft.setCursor(textX, row1Y);
                 tft.printf("BLE Send\n");
                 tft.setTextSize(FM);
             }
-            tft.fillRect(10, 100, tftWidth - 20, 28, TFT_BLACK);
-            tft.setCursor(12, 100);
+            tft.fillRect(BORDER_PAD_X, row1Y + 2 * rowStep, tftWidth - 2 * BORDER_PAD_X, LH * FM + 12, TFT_BLACK);
+            tft.setCursor(textX, row1Y + 2 * rowStep);
             if (senddata[0] % 4 == 0) {
                 tft.printf("0x%02X>    ", senddata[0]);
             } else if (senddata[0] % 4 == 1) {
@@ -346,16 +355,16 @@ void disPlayBLESend() {
         } else {
             if (wasConnected or first_run) {
                 first_run = false;
-                tft.fillRect(10, 26, tftWidth - 20, tftHeight - 36, TFT_BLACK);
+                tft.fillRect(BORDER_PAD_X, contentY, tftWidth - 2 * BORDER_PAD_X, contentH, TFT_BLACK);
                 tft.setTextSize(FM);
-                tft.setCursor(12, 50);
+                tft.setCursor(textX, row1Y);
                 tft.setTextColor(TFT_RED);
                 tft.printf("BLE disconnect\n");
-                tft.setCursor(12, 75);
+                tft.setCursor(textX, row1Y + rowStep);
                 tft.setTextColor(tft.color565(18, 150, 219));
 
                 tft.printf(String("Name:" + blename + "\n").c_str());
-                tft.setCursor(12, 100);
+                tft.setCursor(textX, row1Y + 2 * rowStep);
                 tft.printf("UUID:1bc68b2a\n");
                 drawBLE_beacon(180, 40, TFT_DARKGREY);
             }
diff --git a/src/modules/ble/ble_ninebot.cpp b/src/modules/ble/ble_ninebot.cpp
index b7a6b16b57..f2e2a4a750 100644
--- a/src/modules/ble/ble_ninebot.cpp
+++ b/src/modules/ble/ble_ninebot.cpp
@@ -96,7 +96,7 @@ void BLENinebot::clientDisconnect() {
 }
 
 void BLENinebot::setup() {
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
 
     NimBLEDevice::init("");
diff --git a/src/modules/fm/fm.cpp b/src/modules/fm/fm.cpp
index 2593b676fd..e01a04e6db 100644
--- a/src/modules/fm/fm.cpp
+++ b/src/modules/fm/fm.cpp
@@ -184,7 +184,7 @@ void fm_spectrum() {
     int SIGNAL_STRENGTH_THRESHOLD = 35;
 
     tft.fillScreen(bruceConfig.bgColor);
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
 
     fm_options(f_min, f_max, false);
     delay(10);
diff --git a/src/modules/ir/ir_jammer.cpp b/src/modules/ir/ir_jammer.cpp
index 23c045e5c8..0ac34efac8 100644
--- a/src/modules/ir/ir_jammer.cpp
+++ b/src/modules/ir/ir_jammer.cpp
@@ -401,7 +401,7 @@ void renderJammerUI(JammerState &state) {
 
     // Calculate layout dimensions based on screen size
     int contentWidth = tftWidth - 20;
-    int yStart = 35;
+    int yStart = BORDER_PAD_Y;
     int ySpacing = 10;
     int rightColumnX = tftWidth / 2 + 10;
 
@@ -429,7 +429,7 @@ void renderJammerUI(JammerState &state) {
     }
 
     // Display current status with highlighting for selected setting
-    int curY = yStart + 20;
+    int curY = yStart + LH * FM + 4;
     tft.setCursor(10, curY);
     tft.setTextSize(FP);
     tft.setTextColor((state.settingIndex == 0) ? TFT_YELLOW : bruceConfig.priColor, bruceConfig.bgColor);
@@ -467,7 +467,7 @@ void renderJammerUI(JammerState &state) {
 
     // Display exit instruction in top-right corner
     tft.setTextColor(TFT_RED, bruceConfig.bgColor);
-    tft.setCursor(tftWidth - 70, 30);
+    tft.setCursor(tftWidth - 70, BORDER_PAD_Y);
     tft.print("[ESC] Exit");
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
 
diff --git a/src/modules/ir/ir_read.cpp b/src/modules/ir/ir_read.cpp
index 2f9cc95680..e6914bbe40 100644
--- a/src/modules/ir/ir_read.cpp
+++ b/src/modules/ir/ir_read.cpp
@@ -203,7 +203,7 @@ void IrRead::begin() {
 
 void IrRead::cls() {
     drawMainBorder();
-    tft.setCursor(10, 28);
+    tft.setCursor(BORDER_PAD_X, BORDER_PAD_Y);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
 }
 
diff --git a/src/modules/lora/LoRaRF.cpp b/src/modules/lora/LoRaRF.cpp
index b1daf2507a..a285b9bd77 100644
--- a/src/modules/lora/LoRaRF.cpp
+++ b/src/modules/lora/LoRaRF.cpp
@@ -34,7 +34,7 @@ const int maxMessages = 19;
 int contentWidth = tftWidth - 20;
 int yStart = 35;
 int yPos = yStart;
-int ySpacing = 10;
+int ySpacing = LH * FP + 2;
 int rightColumnX = tftWidth / 2 + 10;
 SPIClass *loraSpi = nullptr;
 Module *loraModule = nullptr;
@@ -206,7 +206,7 @@ void reciveMessage() {
 
 void render() {
     if (!update) return;
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     tft.fillScreen(TFT_BLACK);
     tft.setTextColor(0x6DFC);
     if (!intlora) { tft.drawString("Lora Init Failed", 10, 13); }
@@ -247,8 +247,8 @@ void sendmsg() {
         tft.setTextColor(bruceConfig.priColor);
 
         tft.setTextColor(TFT_RED);
-        tft.setTextSize(2);
-        tft.setCursor(10, tftHeight / 2 - 10);
+        tft.setTextSize(FM);
+        tft.setCursor(BORDER_PAD_X, tftHeight / 2 - BORDER_PAD_X);
         tft.print("LoRa not init!");
 
         tft.drawCentreString("LoRa not initialized!", tftWidth / 2, tftHeight / 2, 2);
diff --git a/src/modules/others/audio_player.cpp b/src/modules/others/audio_player.cpp
index b95043a79e..4463d4276c 100644
--- a/src/modules/others/audio_player.cpp
+++ b/src/modules/others/audio_player.cpp
@@ -122,7 +122,7 @@ void drawVectorIcon(int x, int y, int size, IconType icon, uint16_t color) {
             // Arrow tip to indicate loop
             tft.fillTriangle(cx + r - 3, cy - 3, cx + r + 3, cy - 3, cx + r, cy + 3, color);
             tft.setTextColor(color);
-            tft.setTextSize(1);
+            tft.setTextSize(FP);
             tft.setCursor(cx - 2, cy - 3);
             tft.print("1");
             break;
@@ -134,7 +134,7 @@ void drawVectorIcon(int x, int y, int size, IconType icon, uint16_t color) {
             // Arrow tip to indicate loop direction
             tft.fillTriangle(cx + r - 3, cy - 3, cx + r + 3, cy - 3, cx + r, cy + 3, TFT_DARKGREY);
             tft.setTextColor(TFT_DARKGREY);
-            tft.setTextSize(1);
+            tft.setTextSize(FP);
             tft.setCursor(cx - 2, cy - 3);
             tft.print("1");
             break;
@@ -221,7 +221,7 @@ bool showVolumeControl(uint8_t &currentVolume) {
 
         // Volume percentage text
         tft.setTextColor(TFT_WHITE, TFT_BLACK);
-        tft.setTextSize(1);
+        tft.setTextSize(FP);
         tft.setCursor(BAR_X + 10, BAR_Y + BAR_HEIGHT - 15);
         tft.printf("%3d%%", tempVolume);
     };
@@ -323,12 +323,12 @@ void musicPlayerUI(FS *fs, const String &filepath) {
         int boxSize = iconSize + 45; // Wider box towards right
         tft.drawRoundRect(ui.MARGIN_X, y + 2, boxSize, iconSize, 4, TFT_DARKGREY);
         tft.setTextColor(TFT_WHITE);
-        tft.setTextSize(2);
+        tft.setTextSize(FM);
 
         // Center "AUDIO" text in box
-        String AudioFormatLabel = "AUDIO";              // TODO: Use file extension
-        int textWidth = AudioFormatLabel.length() * 12; // textSize(2): 6 pixel base * 2 = 12 pixel per char
-        int textHeight = 16;                            // textSize(2): 8 pixel base * 2 = 16 pixel
+        String AudioFormatLabel = "AUDIO"; // TODO: Use file extension
+        int textWidth = AudioFormatLabel.length() * LW * FM;
+        int textHeight = LH * FM;
         int centerX = ui.MARGIN_X + (boxSize - textWidth) / 2 + 2; // Offset 5
         int centerY = y + 2 + (iconSize - textHeight) / 2;
         tft.setCursor(centerX, centerY);
diff --git a/src/modules/others/clicker.cpp b/src/modules/others/clicker.cpp
index fd56550383..4082a82cf9 100644
--- a/src/modules/others/clicker.cpp
+++ b/src/modules/others/clicker.cpp
@@ -890,12 +890,12 @@ void usbClickerSetup() { clicker_setup(); }
 void bleClickerSetup() {
     tft.fillScreen(bruceConfig.bgColor);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
-    tft.setTextSize(2);
-    tft.setCursor(10, tftHeight / 2 - 8);
+    tft.setTextSize(FM);
+    tft.setCursor(BORDER_PAD_X, tftHeight / 2 - LH * FM / 2);
     tft.print("BLE Mode");
 
-    tft.setTextSize(1);
-    tft.setCursor(10, tftHeight / 2 + 20);
+    tft.setTextSize(FP);
+    tft.setCursor(BORDER_PAD_X, tftHeight / 2 + LH * FM + 4);
     tft.print("Not yet implemented");
 
     delay(2000);
diff --git a/src/modules/others/mic.cpp b/src/modules/others/mic.cpp
index 44b7ff8e74..918296a540 100644
--- a/src/modules/others/mic.cpp
+++ b/src/modules/others/mic.cpp
@@ -771,7 +771,7 @@ void mic_record_app() {
             setBrightness(10, false);
             tft.fillScreen(TFT_BLACK);
             tft.setTextColor(TFT_RED);
-            tft.setTextSize(1);
+            tft.setTextSize(FP);
             tft.setCursor(5, 5);
             tft.print(".");
         } else {
diff --git a/src/modules/others/timer.cpp b/src/modules/others/timer.cpp
index 9443d7e64d..06818263c8 100644
--- a/src/modules/others/timer.cpp
+++ b/src/modules/others/timer.cpp
@@ -206,11 +206,11 @@ void Timer::playAlarmPattern() {
     tft.fillScreen(bruceConfig.bgColor);
     drawMainBorderWithTitle("Timer finished!", false);
 
-    tft.setTextSize(2);
+    tft.setTextSize(FM);
     tft.setTextColor(TFT_RED, bruceConfig.bgColor);
     tft.drawCentreString("TIME'S UP!", timerX, timerY - LH, 1);
 
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     tft.drawCentreString("Press SEL or BACK to stop", timerX, timerY + (2 * LH), 1);
 
@@ -269,7 +269,7 @@ void Timer::underlineSeconds() {
 void Timer::drawSoundOption(bool highlight) {
     int optionY = underlineY + (2 * LH); // Position below timer
 
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
 
     // Choose colors based on highlight state
     uint16_t textColor = highlight ? bruceConfig.priColor : TFT_DARKGREY;
diff --git a/src/modules/others/u2f.cpp b/src/modules/others/u2f.cpp
index 982e47aa5a..ee7d7982d6 100644
--- a/src/modules/others/u2f.cpp
+++ b/src/modules/others/u2f.cpp
@@ -1667,28 +1667,35 @@ U2fHidDevice &u2fDevice() {
     return *g_u2f;
 }
 
+namespace {
+const int u2fTitleY = BORDER_PAD_X;
+const int u2fBodyStartY = u2fTitleY + LH * FM + 12;
+const int u2fLineStep = LH * FP + 6;
+const int u2fRuntimeY = u2fBodyStartY + 3 * u2fLineStep + 6;
+} // namespace
+
 void drawU2fStatusScreen() {
     tft.fillScreen(bruceConfig.bgColor);
-    tft.setTextSize(2);
+    tft.setTextSize(FM);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
-    tft.setCursor(6, 8);
+    tft.setCursor(BORDER_OFFSET_FROM_SCREEN_EDGE + 1, u2fTitleY);
     tft.print("USB U2F");
 
-    tft.setTextSize(1);
-    tft.setCursor(6, 36);
+    tft.setTextSize(FP);
+    tft.setCursor(BORDER_OFFSET_FROM_SCREEN_EDGE + 1, u2fBodyStartY);
     tft.print("Ready for registration/login");
-    tft.setCursor(6, 50);
+    tft.setCursor(BORDER_OFFSET_FROM_SCREEN_EDGE + 1, u2fBodyStartY + u2fLineStep);
     tft.print("Press center when prompted");
-    tft.setCursor(6, 64);
+    tft.setCursor(BORDER_OFFSET_FROM_SCREEN_EDGE + 1, u2fBodyStartY + 2 * u2fLineStep);
     tft.print("ESC: Back");
 }
 
 void updateU2fRuntimeInfo(const U2fHidDevice &device) {
-    tft.fillRect(0, 84, tftWidth, tftHeight - 84, bruceConfig.bgColor);
-    tft.setTextSize(2);
-    tft.setCursor(6, 94);
+    tft.fillRect(0, u2fRuntimeY, tftWidth, tftHeight - u2fRuntimeY, bruceConfig.bgColor);
+    tft.setTextSize(FM);
+    tft.setCursor(BORDER_OFFSET_FROM_SCREEN_EDGE + 1, u2fRuntimeY + BORDER_PAD_X);
     tft.print(device.waitingForPresence() ? "Confirm now" : "Waiting...");
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
 }
 
 } // namespace
diff --git a/src/modules/pwnagotchi/spam.cpp b/src/modules/pwnagotchi/spam.cpp
index 23e6a54c9b..73b67449d1 100644
--- a/src/modules/pwnagotchi/spam.cpp
+++ b/src/modules/pwnagotchi/spam.cpp
@@ -165,7 +165,7 @@ void displaySpamStatus() {
     drawTopCanvas();
     drawBottomCanvas();
     tft.fillRect(0, 20, tftWidth, tftHeight - 40, bruceConfig.bgColor);
-    tft.setTextSize(1.5);
+    tft.setTextSize(FP);
     tft.setCursor(0, 20);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     tft.println("PwnGrid Spam Running...");
diff --git a/src/modules/pwnagotchi/ui.cpp b/src/modules/pwnagotchi/ui.cpp
index 4bb1c9d129..e5f485d1f7 100644
--- a/src/modules/pwnagotchi/ui.cpp
+++ b/src/modules/pwnagotchi/ui.cpp
@@ -26,7 +26,7 @@ uint8_t menu_current_cmd = 0;
 uint8_t menu_current_opt = 0;
 
 void initUi() {
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     tft.fillScreen(bruceConfig.bgColor);
     tft.setTextColor(bruceConfig.priColor);
 
@@ -75,7 +75,7 @@ void drawTime() {
 void drawFooterData(uint8_t friends_run, uint8_t friends_tot, const String &last_friend_name, signed int rssi) {
     tft.drawPixel(0, 0, 0);
     tft.fillRect(0, canvas_bot_h + 1, display_w - 50, canvas_bot_h + 10, bruceConfig.bgColor);
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     tft.setTextColor(bruceConfig.priColor);
     tft.setTextDatum(TL_DATUM);
 
@@ -117,7 +117,7 @@ void updateUi(bool show_toolbars) {
 
 void drawTopCanvas() {
     // prepare canvas
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     tft.setTextDatum(TL_DATUM);
     char buffer[32];
@@ -131,7 +131,7 @@ void drawTopCanvas() {
 
 void drawBottomCanvas() {
     // prepare canvas
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     tft.setTextDatum(TR_DATUM);
     // draw screen
@@ -152,7 +152,7 @@ void drawMood(const String &face, const String &phrase, bool broken) {
     tft.drawCentreString(face, canvas_center_x, canvas_h / 3, SMOOTH_FONT);
     // prepare canvas
     tft.setTextDatum(BC_DATUM);
-    tft.setTextSize(1);
+    tft.setTextSize(FP);
     // draw screen
     tft.drawPixel(0, 0, 0);
     tft.drawCentreString(phrase, canvas_center_x, canvas_h - 30, SMOOTH_FONT);
diff --git a/src/modules/rf/emit.cpp b/src/modules/rf/emit.cpp
index c89003447b..06da135feb 100644
--- a/src/modules/rf/emit.cpp
+++ b/src/modules/rf/emit.cpp
@@ -17,7 +17,7 @@ TaskHandle_t rf_raw_emit_draw_handle = NULL;
 void rf_raw_emit_draw(void *parameter) {
     tft.fillScreen(bruceConfig.bgColor);
     drawMainBorder();
-    tft.setCursor(20, 38);
+    tft.setCursor(2 * BORDER_PAD_X, BORDER_PAD_Y + LH * FP + 2);
     tft.setTextSize(FP);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
     tft.print("Emitting: ");
diff --git a/src/modules/rf/record.cpp b/src/modules/rf/record.cpp
index f79d42873b..32aa96d682 100644
--- a/src/modules/rf/record.cpp
+++ b/src/modules/rf/record.cpp
@@ -1,8 +1,8 @@
-#include "record.h"
-#include "protocols/rf_config.h"
-#include "protocols/rf_decoder.h"
-#include "rf_utils.h"
-#include <ELECHOUSE_CC1101_SRC_DRV.h>
+#include "record.h"
+#include "protocols/rf_config.h"
+#include "protocols/rf_decoder.h"
+#include "rf_utils.h"
+#include <ELECHOUSE_CC1101_SRC_DRV.h>
 static bool
 record_rmt_rx_done_callback(rmt_channel_t *channel, const rmt_rx_done_event_data_t *edata, void *user_data) {
     BaseType_t high_task_wakeup = pdFALSE;
@@ -36,8 +36,8 @@ void sinewave_animation() {
     lastAnimationUpdate = millis();
 }
 
-void rf_raw_record_draw(RawRecordingStatus status) {
-    tft.setCursor(20, 38);
+void rf_raw_record_draw(RawRecordingStatus status) {
+    tft.setCursor(2 * BORDER_PAD_X, BORDER_PAD_Y + LH * FP + 2);
     tft.setTextSize(FP);
     if (status.frequency <= 0) {
         tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
@@ -80,78 +80,78 @@ void rf_raw_record_draw(RawRecordingStatus status) {
         // Draw the bar
         tft.drawFastVLine(x, yTop, barHeight * 2, bruceConfig.priColor);
     }
-}
-
-static size_t rf_durations_to_rmt_symbols(const std::vector<int> &durations, rmt_symbol_word_t **out) {
-    *out = nullptr;
-    if (durations.empty()) return 0;
-
-    size_t symbolCount = (durations.size() + 1) / 2;
-    rmt_symbol_word_t *code = (rmt_symbol_word_t *)malloc(symbolCount * sizeof(rmt_symbol_word_t));
-    if (code == nullptr) return 0;
-
-    for (size_t i = 0; i < symbolCount; i++) {
-        rmt_symbol_word_t symbol = {};
-
-        int d0 = durations[i * 2];
-        symbol.level0 = d0 > 0 ? 1 : 0;
-        symbol.duration0 = abs(d0);
-
-        size_t j = i * 2 + 1;
-        if (j < durations.size()) {
-            int d1 = durations[j];
-            symbol.level1 = d1 > 0 ? 1 : 0;
-            symbol.duration1 = abs(d1);
-        } else {
-            symbol.level1 = symbol.level0 ? 0 : 1;
-            symbol.duration1 = 0;
-        }
-
-        code[i] = symbol;
-    }
-
-    *out = code;
-    return symbolCount;
-}
-
-static void rf_raw_record_accept_capture(
-    RawRecording &recorded, RawRecordingStatus &status, bool &fakeRssiPresent, rmt_symbol_word_t *code,
-    size_t codeLength, unsigned long long signalDuration
-) {
-    fakeRssiPresent = true;
-
-    unsigned long receivedTime = millis();
-    recorded.codes.push_back(code);
-    recorded.codeLengths.push_back(codeLength);
-
-    if (status.lastSignalTime != 0) {
-        unsigned long signalDurationMs = signalDuration / RMT_1MS_TICKS;
-        uint16_t gap = (uint16_t)(receivedTime - status.lastSignalTime - signalDurationMs - 5);
-        recorded.gaps.push_back(gap);
-    } else {
-        status.firstSignalTime = receivedTime;
-        status.recordingStarted = true;
-        tft.drawPixel(0, 0, 0);
-        tft.fillRect(10, 30, tftWidth - 20, tftHeight - 40, bruceConfig.bgColor);
-    }
-    status.lastSignalTime = receivedTime;
-}
-
-static void rf_raw_record_update_status(
-    RawRecordingStatus &status, bool &fakeRssiPresent, bool rssiFeature
-) {
-    if (status.recordingStarted &&
-        (status.lastRssiUpdate == 0 || millis() - status.lastRssiUpdate >= 100)) {
-        if (fakeRssiPresent) status.latestRssi = -45;
-        else status.latestRssi = -90;
-        fakeRssiPresent = false;
-
-        if (rssiFeature) status.latestRssi = ELECHOUSE_cc1101.getRssi();
-
-        status.rssiCount++;
-        status.lastRssiUpdate = millis();
-    }
-}
+}
+
+static size_t rf_durations_to_rmt_symbols(const std::vector<int> &durations, rmt_symbol_word_t **out) {
+    *out = nullptr;
+    if (durations.empty()) return 0;
+
+    size_t symbolCount = (durations.size() + 1) / 2;
+    rmt_symbol_word_t *code = (rmt_symbol_word_t *)malloc(symbolCount * sizeof(rmt_symbol_word_t));
+    if (code == nullptr) return 0;
+
+    for (size_t i = 0; i < symbolCount; i++) {
+        rmt_symbol_word_t symbol = {};
+
+        int d0 = durations[i * 2];
+        symbol.level0 = d0 > 0 ? 1 : 0;
+        symbol.duration0 = abs(d0);
+
+        size_t j = i * 2 + 1;
+        if (j < durations.size()) {
+            int d1 = durations[j];
+            symbol.level1 = d1 > 0 ? 1 : 0;
+            symbol.duration1 = abs(d1);
+        } else {
+            symbol.level1 = symbol.level0 ? 0 : 1;
+            symbol.duration1 = 0;
+        }
+
+        code[i] = symbol;
+    }
+
+    *out = code;
+    return symbolCount;
+}
+
+static void rf_raw_record_accept_capture(
+    RawRecording &recorded, RawRecordingStatus &status, bool &fakeRssiPresent, rmt_symbol_word_t *code,
+    size_t codeLength, unsigned long long signalDuration
+) {
+    fakeRssiPresent = true;
+
+    unsigned long receivedTime = millis();
+    recorded.codes.push_back(code);
+    recorded.codeLengths.push_back(codeLength);
+
+    if (status.lastSignalTime != 0) {
+        unsigned long signalDurationMs = signalDuration / RMT_1MS_TICKS;
+        uint16_t gap = (uint16_t)(receivedTime - status.lastSignalTime - signalDurationMs - 5);
+        recorded.gaps.push_back(gap);
+    } else {
+        status.firstSignalTime = receivedTime;
+        status.recordingStarted = true;
+        tft.drawPixel(0, 0, 0);
+        tft.fillRect(10, 30, tftWidth - 20, tftHeight - 40, bruceConfig.bgColor);
+    }
+    status.lastSignalTime = receivedTime;
+}
+
+static void rf_raw_record_update_status(
+    RawRecordingStatus &status, bool &fakeRssiPresent, bool rssiFeature
+) {
+    if (status.recordingStarted &&
+        (status.lastRssiUpdate == 0 || millis() - status.lastRssiUpdate >= 100)) {
+        if (fakeRssiPresent) status.latestRssi = -45;
+        else status.latestRssi = -90;
+        fakeRssiPresent = false;
+
+        if (rssiFeature) status.latestRssi = ELECHOUSE_cc1101.getRssi();
+
+        status.rssiCount++;
+        status.lastRssiUpdate = millis();
+    }
+}
 
 // TODO: replace frequency scans throughout rf.cpp with this unified function
 #define FREQUENCY_SCAN_MAX_TRIES 5
@@ -243,62 +243,62 @@ void rf_raw_record_create(RawRecording &recorded, bool &returnToMenu) {
     // Erase sinewave animation
     tft.drawPixel(0, 0, 0);
     tft.fillRect(10, 30, tftWidth - 20, tftHeight - 40, bruceConfig.bgColor);
-    rf_raw_record_draw(status);
-
-    // Start recording
-    delay(200);
-    if (bruceConfigPins.rfModule == M5_RF_MODULE) {
-        RfRxSession rx;
-        if (!rx.begin()) {
-            deinitRfModule();
-            return;
-        }
-        Serial.println("M5 GPIO RAW recorder initialized");
-
-        while (!status.recordingFinished) {
-            previousMillis = millis();
-
-            std::vector<int> durations;
-            if (rx.poll(durations)) {
-                if (durations.size() >= 5) {
-                    rmt_symbol_word_t *code = nullptr;
-                    size_t codeLength = rf_durations_to_rmt_symbols(durations, &code);
-                    if (codeLength > 0) {
-                        unsigned long long signalDuration = 0;
-                        for (int d : durations) signalDuration += abs(d);
-                        rf_raw_record_accept_capture(
-                            recorded, status, fakeRssiPresent, code, codeLength, signalDuration
-                        );
-                        RF_DBG(
-                            "m5 raw record: durations=%u symbols=%u",
-                            (unsigned)durations.size(),
-                            (unsigned)codeLength
-                        );
-                    }
-                }
-            }
-
-            rf_raw_record_update_status(status, fakeRssiPresent, rssiFeature);
-
-            if (status.firstSignalTime > 0 && millis() - status.firstSignalTime >= 20000)
-                status.recordingFinished = true;
-            if (check(SelPress) && status.recordingStarted) status.recordingFinished = true;
-            if (check(EscPress)) {
-                status.recordingFinished = true;
-                returnToMenu = true;
-            }
-            rf_raw_record_draw(status);
-            vTaskDelay(pdMS_TO_TICKS(10));
-        }
-
-        Serial.println("Recording stopped.");
-        rx.end();
-        deinitRfModule();
-        return;
-    }
-
-    rmt_channel_handle_t rx_ch = NULL;
-    rx_ch = setup_rf_rx();
+    rf_raw_record_draw(status);
+
+    // Start recording
+    delay(200);
+    if (bruceConfigPins.rfModule == M5_RF_MODULE) {
+        RfRxSession rx;
+        if (!rx.begin()) {
+            deinitRfModule();
+            return;
+        }
+        Serial.println("M5 GPIO RAW recorder initialized");
+
+        while (!status.recordingFinished) {
+            previousMillis = millis();
+
+            std::vector<int> durations;
+            if (rx.poll(durations)) {
+                if (durations.size() >= 5) {
+                    rmt_symbol_word_t *code = nullptr;
+                    size_t codeLength = rf_durations_to_rmt_symbols(durations, &code);
+                    if (codeLength > 0) {
+                        unsigned long long signalDuration = 0;
+                        for (int d : durations) signalDuration += abs(d);
+                        rf_raw_record_accept_capture(
+                            recorded, status, fakeRssiPresent, code, codeLength, signalDuration
+                        );
+                        RF_DBG(
+                            "m5 raw record: durations=%u symbols=%u",
+                            (unsigned)durations.size(),
+                            (unsigned)codeLength
+                        );
+                    }
+                }
+            }
+
+            rf_raw_record_update_status(status, fakeRssiPresent, rssiFeature);
+
+            if (status.firstSignalTime > 0 && millis() - status.firstSignalTime >= 20000)
+                status.recordingFinished = true;
+            if (check(SelPress) && status.recordingStarted) status.recordingFinished = true;
+            if (check(EscPress)) {
+                status.recordingFinished = true;
+                returnToMenu = true;
+            }
+            rf_raw_record_draw(status);
+            vTaskDelay(pdMS_TO_TICKS(10));
+        }
+
+        Serial.println("Recording stopped.");
+        rx.end();
+        deinitRfModule();
+        return;
+    }
+
+    rmt_channel_handle_t rx_ch = NULL;
+    rx_ch = setup_rf_rx();
     if (rx_ch == NULL) return;
     ESP_LOGI("RMT_SPECTRUM", "register RX done callback");
     QueueHandle_t receive_queue = xQueueCreate(1, sizeof(rmt_rx_done_event_data_t));
@@ -325,27 +325,27 @@ void rf_raw_record_create(RawRecording &recorded, bool &returnToMenu) {
             rx_size = rx_data.num_symbols;
             rx_items = rx_data.received_symbols;
         }
-        if (rx_size != 0) {
-            bool valid_signal = false;
-            if (rx_size >= 5) valid_signal = true;
-            if (valid_signal) {         // ignore codes shorter than 5 items
-                rmt_symbol_word_t *code = (rmt_symbol_word_t *)malloc(rx_size * sizeof(rmt_symbol_word_t));
-
-                // Gap calculation
-                unsigned long long signalDuration = 0;
-                for (size_t i = 0; i < rx_size; i++) {
-                    code[i] = rx_items[i];
-                    signalDuration += rx_items[i].duration0 + rx_items[i].duration1;
-                }
-                rf_raw_record_accept_capture(recorded, status, fakeRssiPresent, code, rx_size, signalDuration);
-            }
-            ESP_ERROR_CHECK(rmt_receive(rx_ch, item, sizeof(item), &receive_config));
-            rx_size = 0;
-        }
-        vTaskDelay(pdMS_TO_TICKS(1));
-
-        // Periodically update RSSI
-        rf_raw_record_update_status(status, fakeRssiPresent, rssiFeature);
+        if (rx_size != 0) {
+            bool valid_signal = false;
+            if (rx_size >= 5) valid_signal = true;
+            if (valid_signal) {         // ignore codes shorter than 5 items
+                rmt_symbol_word_t *code = (rmt_symbol_word_t *)malloc(rx_size * sizeof(rmt_symbol_word_t));
+
+                // Gap calculation
+                unsigned long long signalDuration = 0;
+                for (size_t i = 0; i < rx_size; i++) {
+                    code[i] = rx_items[i];
+                    signalDuration += rx_items[i].duration0 + rx_items[i].duration1;
+                }
+                rf_raw_record_accept_capture(recorded, status, fakeRssiPresent, code, rx_size, signalDuration);
+            }
+            ESP_ERROR_CHECK(rmt_receive(rx_ch, item, sizeof(item), &receive_config));
+            rx_size = 0;
+        }
+        vTaskDelay(pdMS_TO_TICKS(1));
+
+        // Periodically update RSSI
+        rf_raw_record_update_status(status, fakeRssiPresent, rssiFeature);
 
         // Stop recording after 20 seconds
         if (status.firstSignalTime > 0 && millis() - status.firstSignalTime >= 20000)
@@ -404,10 +404,10 @@ void rf_raw_record() {
             rf_raw_record_create(recorded, returnToMenu);
         }
 
-        if (returnToMenu || check(EscPress)) return;
-        option = rf_raw_record_options(saved);
-        vTaskDelay(pdMS_TO_TICKS(1));
-    }
+        if (returnToMenu || check(EscPress)) return;
+        option = rf_raw_record_options(saved);
+        vTaskDelay(pdMS_TO_TICKS(1));
+    }
     for (auto &code : recorded.codes) free(code);
     recorded.codes.clear();
     recorded.codeLengths.clear();
diff --git a/src/modules/rf/rf_scan.cpp b/src/modules/rf/rf_scan.cpp
index a8d0c004f9..6305e5f680 100644
--- a/src/modules/rf/rf_scan.cpp
+++ b/src/modules/rf/rf_scan.cpp
@@ -1092,7 +1092,7 @@ String rfReceiveSignal(float frequency, int max_loops, bool raw, bool headless)
 
     if (!headless) {
         drawMainBorder();
-        tft.setCursor(10, 28);
+        tft.setCursor(BORDER_PAD_X, BORDER_PAD_Y);
         tft.setTextSize(FP);
         tft.println("Waiting for a " + String(frequency) + " MHz " + "signal.");
     }
diff --git a/src/modules/rf/rf_waterfall.cpp b/src/modules/rf/rf_waterfall.cpp
index dec95ac600..4e11c9d5a8 100644
--- a/src/modules/rf/rf_waterfall.cpp
+++ b/src/modules/rf/rf_waterfall.cpp
@@ -87,7 +87,7 @@ void rf_waterfall_run() {
             int x = i * (screen_width / 4);
             float f_freq = f_start + (f_end - f_start) * i / 4.0;
             tft.setCursor(x, 0);
-            tft.setTextSize(1);
+            tft.setTextSize(FP);
 
             if (i == 0 && selected_item == 0) {
                 tft.setTextColor(TFT_PINK, TFT_BLACK);
@@ -182,7 +182,7 @@ void rf_waterfall_run() {
             max_freq = temp_max_freq;
             tft.fillRect(0, 10, screen_width, 10, TFT_BLACK);
             tft.setCursor(3, 10);
-            tft.setTextSize(1);
+            tft.setTextSize(FP);
             tft.setTextColor(TFT_YELLOW, TFT_BLACK);
             tft.printf("%d dBm @ %.3f", max_rssi, max_freq);
 
diff --git a/src/modules/rfid/rfid125.cpp b/src/modules/rfid/rfid125.cpp
index eb791337cc..e9c9e42486 100644
--- a/src/modules/rfid/rfid125.cpp
+++ b/src/modules/rfid/rfid125.cpp
@@ -129,7 +129,7 @@ void RFID125::set_state(RFID125_State state) {
 
 void RFID125::cls() {
     drawMainBorder();
-    tft.setCursor(10, 28);
+    tft.setCursor(BORDER_PAD_X, BORDER_PAD_Y);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
 }
 
diff --git a/src/modules/wifi/karma_attack.cpp b/src/modules/wifi/karma_attack.cpp
index 16cf0a1309..c85283150f 100644
--- a/src/modules/wifi/karma_attack.cpp
+++ b/src/modules/wifi/karma_attack.cpp
@@ -2427,16 +2427,19 @@ void updateKarmaDisplay() {
     if (currentTime - last_time > 1000) {
         last_time = currentTime;
 
-        tft.fillRect(10, 45, tftWidth - 20, tftHeight - 70, bruceConfig.bgColor);
-        tft.setTextSize(1);
+        tft.fillRect(
+            BORDER_PAD_X, BORDER_PAD_Y, tftWidth - 2 * BORDER_PAD_X, tftHeight - BORDER_PAD_Y - 25,
+            bruceConfig.bgColor
+        );
+        tft.setTextSize(FP);
         tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
 
-        int y = 45;
-        tft.setCursor(10, y);
+        int y = BORDER_PAD_Y;
+        tft.setCursor(BORDER_PAD_X, y);
 
         if (karmaPaused) {
             tft.setTextColor(TFT_RED, bruceConfig.bgColor);
-            tft.setCursor(10, y);
+            tft.setCursor(BORDER_PAD_X, y);
             tft.print("KARMA PAUSED");
             tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
             y += LH + 2;
@@ -2769,9 +2772,9 @@ void karma_setup() {
                 {"Enhanced Stats",
                  [&]() {
                      drawMainBorderWithTitle("ADVANCED STATS");
-                     int y = 45;
-                     tft.setTextSize(1);
-                     tft.setCursor(10, y);
+                     int y = BORDER_PAD_Y;
+                     tft.setTextSize(FP);
+                     tft.setCursor(BORDER_PAD_X, y);
                      padprint("Total: " + String(totalProbes));
                      padprintln("Unique: " + String(uniqueClients), 10);
                      padprint("Karma: " + String(karmaResponsesSent));
@@ -2983,20 +2986,24 @@ void karma_setup() {
                          {"Database Info",
                  [&]() {
                               drawMainBorderWithTitle("SSID DATABASE");
-                              int y = 60;
-                              tft.setTextSize(1);
-                              tft.fillRect(10, 40, tftWidth - 20, 100, bruceConfig.bgColor);
+                              int rowStep = LH * FP + 7;
+                              int y = BORDER_PAD_Y + FM * LH;
+                              tft.setTextSize(FP);
+                              tft.fillRect(
+                                  BORDER_PAD_X, y - LH * FP, tftWidth - 2 * BORDER_PAD_X, 3 * rowStep + LH * FP,
+                                  bruceConfig.bgColor
+                              );
                               size_t total = SSIDDatabase::getCount();
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print("Total SSIDs: " + String(total));
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print("Cached: streaming");
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print("Progress: " + broadcastAttack.getProgressString());
-                              tft.setCursor(10, tftHeight - 20);
+                              tft.setCursor(BORDER_PAD_X, tftHeight - BORDER_PAD_X - LH * FP);
                               tft.print("Sel: Back");
                               while (!check(SelPress) && !check(EscPress)) delay(50);
                           }},
@@ -3172,31 +3179,32 @@ void karma_setup() {
                      broadcastOptions.push_back(
                          {"Show Stats", [&]() {
                               drawMainBorderWithTitle("BROADCAST STATS");
-                              int y = 40;
-                              tft.setTextSize(1);
+                              int rowStep = LH * FP + 7;
+                              int y = BORDER_PAD_Y;
+                              tft.setTextSize(FP);
                               size_t totalSSIDs = SSIDDatabase::getCount();
                               size_t currentPos = broadcastAttack.getCurrentPosition();
                               float progress = broadcastAttack.getProgressPercent();
                               BroadcastStats stats = broadcastAttack.getStats();
 
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print("Total SSIDs: " + String(totalSSIDs));
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print("Progress: " + String(progress, 1) + "%");
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print("Broadcasts: " + String(stats.totalBroadcasts));
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print("Responses: " + String(stats.totalResponses));
-                              tft.setCursor(10, y);
-                              y += 15;
+                              tft.setCursor(BORDER_PAD_X, y);
+                              y += rowStep;
                               tft.print(
                                   "Status: " + String(broadcastAttack.isActive() ? "ACTIVE" : "INACTIVE")
                               );
-                              tft.setCursor(10, tftHeight - 20);
+                              tft.setCursor(BORDER_PAD_X, tftHeight - BORDER_PAD_X - LH * FP);
                               tft.print("Sel: Back");
                               while (!check(SelPress) && !check(EscPress)) {
                                   if (check(PrevPress)) break;
@@ -3256,9 +3264,9 @@ void karma_setup() {
                 {"Show Stats",
                  [&]() {
                      drawMainBorderWithTitle("KARMA STATS");
-                     int y = 45;
-                     tft.setTextSize(1);
-                     tft.setCursor(10, y);
+                     int y = BORDER_PAD_Y;
+                     tft.setTextSize(FP);
+                     tft.setCursor(BORDER_PAD_X, y);
                      padprint("Probes: " + String(totalProbes));
                      padprintln("Uniq Clients: " + String(uniqueClients), 11);
                      padprint("Responses: " + String(karmaResponsesSent));
diff --git a/src/modules/wifi/responder.cpp b/src/modules/wifi/responder.cpp
index b56b3e54a7..c4eee26b04 100644
--- a/src/modules/wifi/responder.cpp
+++ b/src/modules/wifi/responder.cpp
@@ -196,37 +196,37 @@ void updateHashUI() {
     // 1) NTLM count
     tft.setTextSize(FP);
     tft.setTextColor(bruceConfig.priColor, bruceConfig.bgColor);
-    tft.setCursor(10, BORDER_PAD_Y + FM * LH);
+    tft.setCursor(BORDER_PAD_X, BORDER_PAD_Y + FM * LH);
     tft.print("NTLM: ");
-    tft.setTextSize(2);
+    tft.setTextSize(FM);
     tft.println(hashCount);
 
     // 2) User
     tft.setTextSize(FP);
-    tft.setCursor(10, tft.getCursorY());
+    tft.setCursor(BORDER_PAD_X, tft.getCursorY());
     tft.print("User: ");
-    tft.setTextSize(2);
+    tft.setTextSize(FM);
     tft.println(lastUser);
 
     // 3) Domain
     tft.setTextSize(FP);
-    tft.setCursor(10, tft.getCursorY());
+    tft.setCursor(BORDER_PAD_X, tft.getCursorY());
     tft.print("Domain: ");
-    tft.setTextSize(2);
+    tft.setTextSize(FM);
     tft.println(lastDomain);
 
     // 4) Client (hostname)
     tft.setTextSize(FP);
-    tft.setCursor(10, tft.getCursorY());
+    tft.setCursor(BORDER_PAD_X, tft.getCursorY());
     tft.print("Client: ");
-    tft.setTextSize(2);
+    tft.setTextSize(FM);
     tft.println(lastClient);
 
     // 5) Query (NBNS/LLMNR + name)
     tft.setTextSize(FP);
-    tft.setCursor(10, tft.getCursorY());
+    tft.setCursor(BORDER_PAD_X, tft.getCursorY());
     tft.print(lastQueryProtocol + ": ");
-    tft.setTextSize(2);
+    tft.setTextSize(FM);
     tft.println(lastQueryName);
 }
 
@@ -607,7 +607,7 @@ void responder() {
         if (now - lastAnim > 250) {
             //  Choix de la fonction selon le count
             if (hashCount == 0) {
-                tft.setCursor(10, BORDER_PAD_Y + FM * LH);
+                tft.setCursor(BORDER_PAD_X, BORDER_PAD_Y + FM * LH);
                 tft.setTextSize(FP);
                 tft.println("Waiting LLMNR Interact");
             } else if (hashCount == 1) {
diff --git a/src/modules/wifi/sniffer.cpp b/src/modules/wifi/sniffer.cpp
index 1d52466425..7cc72c48de 100644
--- a/src/modules/wifi/sniffer.cpp
+++ b/src/modules/wifi/sniffer.cpp
@@ -1125,7 +1125,7 @@ static void sendDeauthNow() {
         }
     }
     if (deauth_sent) {
-        tft.setTextSize(1);
+        tft.setTextSize(FP);
         tft.setTextDatum(0);
         tft.drawString("Deauth sent.", DEAUTH_MSG_X, DEAUTH_MSG_Y);
         deauth_displayed = true;
diff --git a/src/modules/wifi/wifi_atks.cpp b/src/modules/wifi/wifi_atks.cpp
index 9bd3f11c2b..2e206e76a3 100644
--- a/src/modules/wifi/wifi_atks.cpp
+++ b/src/modules/wifi/wifi_atks.cpp
@@ -170,11 +170,15 @@ void wsl_bypasser_send_raw_frame(const wifi_ap_record_t *ap_record, uint8_t chan
 void wifi_atk_info(const String &tssid, const String &mac, uint8_t channel) {
     drawMainBorder();
     tft.setTextColor(bruceConfig.priColor);
-    tft.drawCentreString("-=Information=-", tft.width() / 2, 28, SMOOTH_FONT);
-    tft.drawString("AP: " + tssid, 10, 48);
-    tft.drawString("Channel: " + String(channel), 10, 66);
-    tft.drawString(mac, 10, 84);
-    tft.drawString("Press " + String(BTN_ALIAS) + " to act", 10, tftHeight - 20);
+    int rowStep = LH * FP + 10;
+    int row1Y = BORDER_PAD_Y + FM * LH + 4;
+    tft.drawCentreString("-=Information=-", tft.width() / 2, BORDER_PAD_Y, SMOOTH_FONT);
+    tft.drawString("AP: " + tssid, BORDER_PAD_X, row1Y);
+    tft.drawString("Channel: " + String(channel), BORDER_PAD_X, row1Y + rowStep);
+    tft.drawString(mac, BORDER_PAD_X, row1Y + 2 * rowStep);
+    tft.drawString(
+        "Press " + String(BTN_ALIAS) + " to act", BORDER_PAD_X, tftHeight - BORDER_PAD_X - LH * FP
+    );
     vTaskDelay(200 / portTICK_PERIOD_MS);
     SelPress = false;