diff --git a/radio/src/gui/9X/lcd.cpp b/radio/src/gui/9X/lcd.cpp
index c4b48fc24..34fecfa71 100644
--- a/radio/src/gui/9X/lcd.cpp
+++ b/radio/src/gui/9X/lcd.cpp
@@ -203,12 +203,12 @@ void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags flags)
 }
 #endif
 
-void lcd_putc(coord_t x, coord_t y, const unsigned char c)
+void lcdDrawChar(coord_t x, coord_t y, const unsigned char c)
 {
   lcdDrawChar(x, y, c, 0);
 }
 
-void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags flags)
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags flags)
 {
   const coord_t orig_x = x;
 #if defined(CPUARM)
@@ -281,24 +281,24 @@ void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, uint8_t len, Lc
 #endif
 }
 
-void lcd_putsn(coord_t x, coord_t y, const pm_char * s, uint8_t len)
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len)
 {
-  lcdDrawTextWithLen(x, y, s, len, 0);
+  lcdDrawSizedText(x, y, s, len, 0);
 }
 
 void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags flags)
 {
-  lcdDrawTextWithLen(x, y, s, 255, flags);
+  lcdDrawSizedText(x, y, s, 255, flags);
 }
 
-void lcd_puts(coord_t x, coord_t y, const pm_char * s)
+void lcdDrawText(coord_t x, coord_t y, const pm_char * s)
 {
   lcdDrawText(x, y, s, 0);
 }
 
 void lcd_putsLeft(coord_t y, const pm_char * s)
 {
-  lcd_puts(0, y, s);
+  lcdDrawText(0, y, s);
 }
 
 #if !defined(BOOT)
@@ -306,11 +306,11 @@ void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s,uint8_t idx, Lcd
 {
   uint8_t length;
   length = pgm_read_byte(s++);
-  lcdDrawTextWithLen(x, y, s+length*idx, length, flags & ~(BSS|ZCHAR));
+  lcdDrawSizedText(x, y, s+length*idx, length, flags & ~(BSS|ZCHAR));
 }
 
 #if defined(CPUARM)
-void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
+void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
 {
   x += FWNUM*4+1;
   for (int i=0; i<4; i++) {
@@ -322,7 +322,7 @@ void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
   }
 }
 #else
-void lcd_outhex4(coord_t x, coord_t y, uint16_t val)
+void lcdDrawHexNumber(coord_t x, coord_t y, uint16_t val)
 {
   x += FWNUM*4+1;
   for(int i=0; i<4; i++) {
@@ -335,17 +335,17 @@ void lcd_outhex4(coord_t x, coord_t y, uint16_t val)
 }
 #endif
 
-void lcd_outdez8(coord_t x, coord_t y, int8_t val)
+void lcdDraw8bitsNumber(coord_t x, coord_t y, int8_t val)
 {
-  lcd_outdezAtt(x, y, val);
+  lcdDrawNumber(x, y, val);
 }
 
-void lcd_outdezAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags flags)
+void lcdDrawNumber(coord_t x, coord_t y, lcdint_t val, LcdFlags flags)
 {
-  lcd_outdezNAtt(x, y, val, flags);
+  lcdDrawNumber(x, y, val, flags, 0);
 }
 
-void lcd_outdezNAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags flags, uint8_t len)
+void lcdDrawNumber(coord_t x, coord_t y, lcdint_t val, LcdFlags flags, uint8_t len)
 {
   uint8_t fw = FWNUM;
   int8_t mode = MODE(flags);
@@ -632,20 +632,20 @@ void putsTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
 #else
 #define separator ':'
 #endif
-  lcd_outdezNAtt(x, y, qr.quot, att|LEADING0|LEFT, 2);
+  lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2);
 #if defined(CPUARM) && defined(RTCLOCK)
   if (att&TIMEBLINK)
     lcdDrawChar(lcdLastPos, y, separator, BLINK);
   else
 #endif
   lcdDrawChar(lcdLastPos, y, separator, att&att2);
-  lcd_outdezNAtt(lcdNextPos, y, qr.rem, att2|LEADING0|LEFT, 2);
+  lcdDrawNumber(lcdNextPos, y, qr.rem, att2|LEADING0|LEFT, 2);
 }
 
 // TODO to be optimized with putsValueWithUnit
 void putsVolts(coord_t x, coord_t y, uint16_t volts, LcdFlags att)
 {
-  lcd_outdezAtt(x, y, (int16_t)volts, (~NO_UNIT) & (att | ((att&PREC2)==PREC2 ? 0 : PREC1)));
+  lcdDrawNumber(x, y, (int16_t)volts, (~NO_UNIT) & (att | ((att&PREC2)==PREC2 ? 0 : PREC1)));
   if (~att & NO_UNIT) lcdDrawChar(lcdLastPos, y, 'V', att);
 }
 
@@ -657,7 +657,7 @@ void putsVBat(coord_t x, coord_t y, LcdFlags att)
 void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att)
 {
   lcdDrawText(x, y, str, att & ~LEADING0);
-  lcd_outdezNAtt(lcdNextPos, y, idx, att|LEFT, 2);
+  lcdDrawNumber(lcdNextPos, y, idx, att|LEFT, 2);
 }
 
 void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
@@ -684,7 +684,7 @@ void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
   else {
     idx -= MIXSRC_FIRST_TELEM;
     div_t qr = div(idx, 3);
-    lcdDrawTextWithLen(x, y, g_model.telemetrySensors[qr.quot].label, ZLEN(g_model.telemetrySensors[qr.quot].label), ZCHAR|att);
+    lcdDrawSizedText(x, y, g_model.telemetrySensors[qr.quot].label, ZLEN(g_model.telemetrySensors[qr.quot].label), ZCHAR|att);
     if (qr.rem) lcdDrawChar(lcdLastPos, y, qr.rem==2 ? '+' : '-', att);
   }
 #else
@@ -706,7 +706,7 @@ void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att)
     putsStrIdx(x, y, STR_MODEL, id+1, att|LEADING0);
   }
   else {
-    lcdDrawTextWithLen(x, y, name, sizeof(g_model.header.name), ZCHAR|att);
+    lcdDrawSizedText(x, y, name, sizeof(g_model.header.name), ZCHAR|att);
   }
 }
 
@@ -732,7 +732,7 @@ void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att)
   if (idx==0) { lcdDrawTextAtIndex(x, y, STR_MMMINV, 0, att); return; }
   if (idx < 0) { lcdDrawChar(x-2, y, '!', att); idx = -idx; }
   if (att & CONDENSED)
-    lcd_outdezNAtt(x+FW*1, y, idx-1, (att & ~CONDENSED), 1);
+    lcdDrawNumber(x+FW*1, y, idx-1, (att & ~CONDENSED), 1);
   else
     putsStrIdx(x, y, STR_FP, idx-1, att);
 }
@@ -806,7 +806,7 @@ const pm_uint8_t bchunit_ar[] PROGMEM = {
 void putsValueWithUnit(coord_t x, coord_t y, lcdint_t val, uint8_t unit, LcdFlags att)
 {
   // convertUnit(val, unit);
-  lcd_outdezAtt(x, y, val, att & (~NO_UNIT));
+  lcdDrawNumber(x, y, val, att & (~NO_UNIT));
   if (!(att & NO_UNIT) && unit != UNIT_RAW) {
     lcdDrawTextAtIndex(lcdLastPos/*+1*/, y, STR_VTELEMUNIT, unit, 0);
   }
@@ -815,27 +815,27 @@ void putsValueWithUnit(coord_t x, coord_t y, lcdint_t val, uint8_t unit, LcdFlag
 void displayGpsCoord(coord_t x, coord_t y, char direction, int16_t bp, int16_t ap, LcdFlags att, bool seconds=true)
 {
     if (!direction) direction = '-';
-    lcd_outdezAtt(x, y, bp / 100, att); // ddd before '.'
+    lcdDrawNumber(x, y, bp / 100, att); // ddd before '.'
     lcdDrawChar(lcdLastPos, y, '@', att);
     uint8_t mn = bp % 100; // TODO div_t
     if (g_eeGeneral.gpsFormat == 0) {
-      lcd_outdezNAtt(lcdNextPos, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
+      lcdDrawNumber(lcdNextPos, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
       lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
       if (seconds) {
         uint16_t ss = ap * 6 / 10;
-        lcd_outdezNAtt(lcdLastPos+3, y, ss / 100, att|LEFT|LEADING0, 2); // ''
+        lcdDrawNumber(lcdLastPos+3, y, ss / 100, att|LEFT|LEADING0, 2); // ''
         lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
-        lcd_outdezNAtt(lcdLastPos+2, y, ss % 100, att|LEFT|LEADING0, 2); // ''
+        lcdDrawNumber(lcdLastPos+2, y, ss % 100, att|LEFT|LEADING0, 2); // ''
         lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
         lcdDrawSolidVerticalLine(lcdLastPos+2, y, 2);
       }
-      lcd_putc(lcdLastPos+2, y, direction);
+      lcdDrawChar(lcdLastPos+2, y, direction);
     }
     else {
-      lcd_outdezNAtt(lcdLastPos+FW, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
+      lcdDrawNumber(lcdLastPos+FW, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
       lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
-      lcd_outdezNAtt(lcdLastPos+2, y, ap, att|LEFT|UNSIGN|LEADING0, 4); // after '.'
-      lcd_putc(lcdLastPos+1, y, direction);
+      lcdDrawNumber(lcdLastPos+2, y, ap, att|LEFT|UNSIGN|LEADING0, 4); // after '.'
+      lcdDrawChar(lcdLastPos+1, y, direction);
     }
 }
 
@@ -844,24 +844,24 @@ void displayDate(coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags a
   if (att & DBLSIZE) {
     x -= 42;
     att &= ~0x0F00; // TODO constant
-    lcd_outdezNAtt(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos-1, y, '-', att);
-    lcd_outdezNAtt(lcdNextPos-1, y, telemetryItem.datetime.month, att|LEFT, 2);
+    lcdDrawNumber(lcdNextPos-1, y, telemetryItem.datetime.month, att|LEFT, 2);
     lcdDrawChar(lcdLastPos-1, y, '-', att);
-    lcd_outdezAtt(lcdNextPos-1, y, telemetryItem.datetime.year, att|LEFT);
+    lcdDrawNumber(lcdNextPos-1, y, telemetryItem.datetime.year, att|LEFT);
     y += FH;
-    lcd_outdezNAtt(x, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(x, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
   }
   else {
-    lcd_outdezNAtt(x, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(x, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
   }
 }
 
@@ -910,13 +910,13 @@ void putsChannelValue(coord_t x, coord_t y, source_t channel, lcdint_t value, Lc
     putsTimer(x, y, value, att, att);
   }
   else if (channel == MIXSRC_TX_VOLTAGE) {
-    lcd_outdezAtt(x, y, value, att|PREC1);
+    lcdDrawNumber(x, y, value, att|PREC1);
   }
   else {
     if (channel <= MIXSRC_LAST_CH) {
       value = calcRESXto100(value);
     }
-    lcd_outdezAtt(x, y, value, att);
+    lcdDrawNumber(x, y, value, att);
   }
 }
 
@@ -930,7 +930,7 @@ void putsChannel(coord_t x, coord_t y, source_t channel, LcdFlags att)
 void putsValueWithUnit(coord_t x, coord_t y, lcdint_t val, uint8_t unit, LcdFlags att)
 {
   convertUnit(val, unit);
-  lcd_outdezAtt(x, y, val, att & (~NO_UNIT));
+  lcdDrawNumber(x, y, val, att & (~NO_UNIT));
   if (!(att & NO_UNIT) && unit != UNIT_RAW) {
     lcdDrawTextAtIndex(lcdLastPos/*+1*/, y, STR_VTELEMUNIT, unit, 0);
   }
@@ -1095,9 +1095,9 @@ void putsTelemetryChannelValue(coord_t x, coord_t y, uint8_t channel, lcdint_t v
       break;
 
     case TELEM_TX_VOLTAGE-1:
-      lcd_outdezAtt(x, y, val, (att|PREC1) & (~NO_UNIT));
+      lcdDrawNumber(x, y, val, (att|PREC1) & (~NO_UNIT));
       if (!(att & NO_UNIT))
-        lcd_putc(lcdLastPos/*+1*/, y, 'V');
+        lcdDrawChar(lcdLastPos/*+1*/, y, 'V');
       break;
   }
 }
diff --git a/radio/src/gui/9X/lcd.h b/radio/src/gui/9X/lcd.h
index c6a07e798..1aebd1110 100644
--- a/radio/src/gui/9X/lcd.h
+++ b/radio/src/gui/9X/lcd.h
@@ -162,30 +162,26 @@ typedef const unsigned char pm_uchar;
 typedef const char pm_char;
 #endif
 
-void lcd_putc(coord_t x, coord_t y, const unsigned char c);
+void lcdDrawChar(coord_t x, coord_t y, const unsigned char c);
 void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags flags);
 void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags flags);
-void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s,uint8_t idx, LcdFlags flags);
-void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s,unsigned char len, LcdFlags flags);
-void lcd_puts(coord_t x, coord_t y, const pm_char * s);
-void lcd_putsn(coord_t x, coord_t y, const pm_char * s, unsigned char len);
+void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s, uint8_t idx, LcdFlags flags);
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, unsigned char len, LcdFlags flags);
+void lcdDrawText(coord_t x, coord_t y, const pm_char * s);
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, unsigned char len);
 void lcd_putsLeft(coord_t y, const pm_char * s);
 
-#if defined(COLORLCD)
-  void lcd_putsCenter(coord_t y, const pm_char * s, LcdFlags attr=0);
-#else
-  #define lcd_putsCenter(y, s) lcd_puts((LCD_W-sizeof(TR_##s)*FW+FW+1)/2, y, STR_##s)
-#endif
+#define lcd_putsCenter(y, s) lcdDrawText((LCD_W-sizeof(TR_##s)*FW+FW+1)/2, y, STR_##s)
 
 #if defined(CPUARM)
-  void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0);
+  void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0);
 #else
-  void lcd_outhex4(coord_t x, coord_t y, uint16_t val);
+  void lcdDrawHexNumber(coord_t x, coord_t y, uint16_t val);
 #endif
 
-void lcd_outdezNAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags mode=0, uint8_t len=0);
-void lcd_outdezAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags mode=0);
-void lcd_outdez8(coord_t x, coord_t y, int8_t val);
+void lcdDrawNumber(coord_t x, coord_t y, lcdint_t val, LcdFlags mode, uint8_t len);
+void lcdDrawNumber(coord_t x, coord_t y, lcdint_t val, LcdFlags mode=0);
+void lcdDraw8bitsNumber(coord_t x, coord_t y, int8_t val);
 
 void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att=0);
 void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
diff --git a/radio/src/gui/9X/menu_general_diaganas.cpp b/radio/src/gui/9X/menu_general_diaganas.cpp
index 5e745fc00..349b440f7 100644
--- a/radio/src/gui/9X/menu_general_diaganas.cpp
+++ b/radio/src/gui/9X/menu_general_diaganas.cpp
@@ -55,22 +55,22 @@ void menuGeneralDiagAna(uint8_t event)
     coord_t y = MENU_HEADER_HEIGHT + 1 + (i/3)*FH;
     const uint8_t x_coord[] = {0, 70, 154};
     uint8_t x = x_coord[i%3];
-    lcd_outdezNAtt(x, y, i+1, LEADING0|LEFT, 2);
-    lcd_putc(x+2*FW-2, y, ':');
+    lcdDrawNumber(x, y, i+1, LEADING0|LEFT, 2);
+    lcdDrawChar(x+2*FW-2, y, ':');
 #else
     coord_t y = MENU_HEADER_HEIGHT + 1 + (i/2)*FH;
     uint8_t x = i&1 ? 64+5 : 0;
     putsStrIdx(x, y, PSTR("A"), i+1);
-    lcd_putc(lcdNextPos, y, ':');
+    lcdDrawChar(lcdNextPos, y, ':');
 #endif
-    lcd_outhex4(x+3*FW-1, y, anaIn(i));
-    lcd_outdez8(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
+    lcdDrawHexNumber(x+3*FW-1, y, anaIn(i));
+    lcdDraw8bitsNumber(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
   }
 
 #if !defined(CPUARM)
   // Display raw BandGap result (debug)
-  lcd_puts(64+5, MENU_HEADER_HEIGHT+1+3*FH, STR_BG);
-  lcd_outdezAtt(64+5+6*FW-3, 1+4*FH, BandGap, 0);
+  lcdDrawText(64+5, MENU_HEADER_HEIGHT+1+3*FH, STR_BG);
+  lcdDrawNumber(64+5+6*FW-3, 1+4*FH, BandGap, 0);
 #endif
 
 #if defined(PCBSKY9X)
@@ -86,7 +86,7 @@ void menuGeneralDiagAna(uint8_t event)
   static uint16_t adcBatt;
   adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8; // running average, sourced directly (to avoid unending debate :P)
   uint32_t batCalV = ((uint32_t)adcBatt*1390 + (10*(int32_t)adcBatt*g_eeGeneral.txVoltageCalibration)/8) / BandGap;
-  lcd_outdezNAtt(LEN_CALIB_FIELDS*FW+4*FW, 6*FH-2, batCalV, PREC2|(m_posVert==1 ? INVERS : 0));
+  lcdDrawNumber(LEN_CALIB_FIELDS*FW+4*FW, 6*FH-2, batCalV, PREC2|(m_posVert==1 ? INVERS : 0));
 #else
   lcd_putsLeft(6*FH-2, STR_BATT_CALIB);
   putsVolts(LEN_CALIB_FIELDS*FW+4*FW, 6*FH-2, g_vbat100mV, (m_posVert==1 ? INVERS : 0));
diff --git a/radio/src/gui/9X/menu_general_diagkeys.cpp b/radio/src/gui/9X/menu_general_diagkeys.cpp
index 4a88e1a3c..5dd409540 100644
--- a/radio/src/gui/9X/menu_general_diagkeys.cpp
+++ b/radio/src/gui/9X/menu_general_diagkeys.cpp
@@ -46,7 +46,7 @@ void menuGeneralDiagKeys(uint8_t event)
 {
   SIMPLE_MENU(STR_MENUDIAG, menuTabGeneral, e_Keys, 1);
 
-  lcd_puts(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM);
+  lcdDrawText(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM);
 
   for(uint8_t i=0; i<9; i++) {
     coord_t y;
@@ -74,7 +74,7 @@ void menuGeneralDiagKeys(uint8_t event)
   for(uint8_t i=0; i<DIM(g_rotenc); i++) {
     coord_t y = MENU_HEADER_HEIGHT /* ??? + 1 ??? */ + i*FH;
     lcdDrawTextAtIndex(14*FW, y, STR_VRENCODERS, i, 0);
-    lcd_outdezNAtt(18*FW, y, g_rotenc[i], LEFT|(switchState((EnumKeys)(BTN_REa+i)) ? INVERS : 0));
+    lcdDrawNumber(18*FW, y, g_rotenc[i], LEFT|(switchState((EnumKeys)(BTN_REa+i)) ? INVERS : 0));
   }
 #endif
 
diff --git a/radio/src/gui/9X/menu_general_hardware.cpp b/radio/src/gui/9X/menu_general_hardware.cpp
index d8d337b50..992d8167c 100644
--- a/radio/src/gui/9X/menu_general_hardware.cpp
+++ b/radio/src/gui/9X/menu_general_hardware.cpp
@@ -76,7 +76,7 @@ void menuGeneralHardware(uint8_t event)
       case ITEM_SETUP_HW_STICK_RH_GAIN:
       {
         lcdDrawTextAtIndex(INDENT_WIDTH, y, PSTR("\002LVLHRVRH"), k-ITEM_SETUP_HW_STICK_LV_GAIN, 0);
-        lcd_puts(INDENT_WIDTH+3*FW, y, PSTR("Gain"));
+        lcdDrawText(INDENT_WIDTH+3*FW, y, PSTR("Gain"));
         uint8_t mask = (1<<(k-ITEM_SETUP_HW_STICK_LV_GAIN));
         uint8_t val = (g_eeGeneral.sticksGain & mask ? 1 : 0);
         lcdDrawChar(GENERAL_HW_PARAM_OFS, y, val ? '2' : '1', attr);
diff --git a/radio/src/gui/9X/menu_general_sdmanager.cpp b/radio/src/gui/9X/menu_general_sdmanager.cpp
index 7a4e6f5fe..d5e99fe93 100644
--- a/radio/src/gui/9X/menu_general_sdmanager.cpp
+++ b/radio/src/gui/9X/menu_general_sdmanager.cpp
@@ -41,25 +41,25 @@ void menuGeneralSdManagerInfo(uint8_t event)
   SIMPLE_SUBMENU(STR_SD_INFO_TITLE, 1);
 
   lcd_putsLeft(2*FH, STR_SD_TYPE);
-  lcd_puts(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
+  lcdDrawText(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
 
   lcd_putsLeft(3*FH, STR_SD_SIZE);
-  lcd_outdezAtt(10*FW, 3*FH, sdGetSize(), LEFT);
-  lcd_putc(lcdLastPos, 3*FH, 'M');
+  lcdDrawNumber(10*FW, 3*FH, sdGetSize(), LEFT);
+  lcdDrawChar(lcdLastPos, 3*FH, 'M');
 
   lcd_putsLeft(4*FH, STR_SD_SECTORS);
 #if defined(SD_GET_FREE_BLOCKNR)
-  lcd_outdezAtt(10*FW, 4*FH,  SD_GET_FREE_BLOCKNR()/1000, LEFT);
-  lcd_putc(lcdLastPos, 4*FH, '/');
-  lcd_outdezAtt(lcdLastPos+FW, 4*FH, sdGetNoSectors()/1000, LEFT);
+  lcdDrawNumber(10*FW, 4*FH,  SD_GET_FREE_BLOCKNR()/1000, LEFT);
+  lcdDrawChar(lcdLastPos, 4*FH, '/');
+  lcdDrawNumber(lcdLastPos+FW, 4*FH, sdGetNoSectors()/1000, LEFT);
 #else
-  lcd_outdezAtt(10*FW, 4*FH, sdGetNoSectors()/1000, LEFT);
+  lcdDrawNumber(10*FW, 4*FH, sdGetNoSectors()/1000, LEFT);
 #endif
-  lcd_putc(lcdLastPos, 4*FH, 'k');
+  lcdDrawChar(lcdLastPos, 4*FH, 'k');
 
   lcd_putsLeft(5*FH, STR_SD_SPEED);
-  lcd_outdezAtt(10*FW, 5*FH, SD_GET_SPEED()/1000, LEFT);
-  lcd_puts(lcdLastPos, 5*FH, "kb/s");
+  lcdDrawNumber(10*FW, 5*FH, SD_GET_SPEED()/1000, LEFT);
+  lcdDrawText(lcdLastPos, 5*FH, "kb/s");
 }
 
 inline bool isFilenameGreater(bool isfile, const char * fn, const char * line)
diff --git a/radio/src/gui/9X/menu_general_setup.cpp b/radio/src/gui/9X/menu_general_setup.cpp
index a8bb70d40..1392cbe6f 100644
--- a/radio/src/gui/9X/menu_general_setup.cpp
+++ b/radio/src/gui/9X/menu_general_setup.cpp
@@ -167,16 +167,16 @@ void menuGeneralSetup(uint8_t event)
 #if defined(RTCLOCK)
       case ITEM_SETUP_DATE:
         lcd_putsLeft(y, STR_DATE);
-        lcd_putc(RADIO_SETUP_DATE_COLUMN, y, '-'); lcd_putc(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-');
+        lcdDrawChar(RADIO_SETUP_DATE_COLUMN, y, '-'); lcdDrawChar(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-');
         for (uint8_t j=0; j<3; j++) {
           uint8_t rowattr = (m_posHorz==j ? attr : 0);
           switch (j) {
             case 0:
-              lcd_outdezAtt(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+1900, rowattr);
+              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+1900, rowattr);
               if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0);
               break;
             case 1:
-              lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0, 2);
               if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
               break;
             case 2:
@@ -185,7 +185,7 @@ void menuGeneralSetup(uint8_t event)
               int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0);
               static const pm_uint8_t dmon[] PROGMEM = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
               dlim += pgm_read_byte(&dmon[t.tm_mon]);
-              lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0, 2);
               if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0);
               break;
             }
@@ -198,20 +198,20 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_TIME:
         lcd_putsLeft(y, STR_TIME);
-        lcd_putc(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcd_putc(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':');
+        lcdDrawChar(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcdDrawChar(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':');
         for (uint8_t j=0; j<3; j++) {
           uint8_t rowattr = (m_posHorz==j ? attr : 0);
           switch (j) {
             case 0:
-              lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0, 2);
               if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0);
               break;
             case 1:
-              lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0, 2);
               if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0);
               break;
             case 2:
-              lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0, 2);
               if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0);
               break;
           }
@@ -225,7 +225,7 @@ void menuGeneralSetup(uint8_t event)
       case ITEM_SETUP_BATT_RANGE:
         lcd_putsLeft(y, STR_BATTERY_RANGE);
         putsVolts(RADIO_SETUP_2ND_COLUMN, y,  90+g_eeGeneral.vBatMin, (m_posHorz==0 ? attr : 0)|LEFT|NO_UNIT);
-        lcd_putc(lcdLastPos, y, '-');
+        lcdDrawChar(lcdLastPos, y, '-');
         putsVolts(lcdLastPos+FW, y, 120+g_eeGeneral.vBatMax, (m_posHorz>0 ? attr : 0)|LEFT|NO_UNIT);
         if (attr && s_editMode>0) {
           if (m_posHorz==0)
@@ -305,10 +305,10 @@ void menuGeneralSetup(uint8_t event)
         lcd_putsLeft( y, STR_SPKRPITCH);
 #if defined(CPUARM)
         lcdDrawChar(RADIO_SETUP_2ND_COLUMN, y, '+', attr);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT);
         lcdDrawText(lcdLastPos, y, "Hz", attr);
 #else
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.speakerPitch, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.speakerPitch, attr|LEFT);
 #endif
         if (attr) {
           CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20);
@@ -325,19 +325,19 @@ void menuGeneralSetup(uint8_t event)
         break;
       case ITEM_SETUP_VARIO_PITCH:
         lcd_putsLeft(y, STR_PITCH_AT_ZERO);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
         lcdDrawText(lcdLastPos, y, "Hz", attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40);
         break;
       case ITEM_SETUP_VARIO_RANGE:
         lcd_putsLeft(y, STR_PITCH_AT_MAX);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
         lcdDrawText(lcdLastPos, y, "Hz", attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80);
         break;
       case ITEM_SETUP_VARIO_REPEAT:
         lcd_putsLeft(y, STR_REPEAT_AT_ZERO);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
         lcdDrawText(lcdLastPos, y, STR_MS, attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50);
         break;
@@ -363,7 +363,7 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_CONTRAST:
         lcd_putsLeft(y, STR_CONTRAST);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
         if (attr) {
           CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, CONTRAST_MIN, CONTRAST_MAX);
           lcdSetContrast();
@@ -412,8 +412,8 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_INACTIVITY_ALARM:
         lcd_putsLeft( y,STR_INACTIVITYALARM);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT);
-        lcd_putc(lcdLastPos, y, 'm');
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT);
+        lcdDrawChar(lcdLastPos, y, 'm');
         if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
         break;
 
@@ -440,15 +440,15 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_BACKLIGHT_DELAY:
         lcd_putsLeft(y, STR_BLDELAY);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT);
-        lcd_putc(lcdLastPos, y, 's');
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT);
+        lcdDrawChar(lcdLastPos, y, 's');
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5);
         break;
 
 #if defined(CPUARM)
       case ITEM_SETUP_BRIGHTNESS:
         lcd_putsLeft(y, STR_BRIGHTNESS);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ;
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ;
         if (attr) {
           uint8_t b = 100 - g_eeGeneral.backlightBright;
           CHECK_INCDEC_GENVAR(event, b, 0, 100);
@@ -460,13 +460,13 @@ void menuGeneralSetup(uint8_t event)
 #if defined(PWM_BACKLIGHT)
       case ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF:
         lcd_putsLeft(y, STR_BLOFFBRIGHTNESS);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.blOffBright, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.blOffBright, attr|LEFT);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.blOffBright, 0, 15);
         break;
 
       case ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON:
         lcd_putsLeft(y, STR_BLONBRIGHTNESS);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 15-g_eeGeneral.blOnBright, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 15-g_eeGeneral.blOnBright, attr|LEFT);
         if (attr) g_eeGeneral.blOnBright = 15 - checkIncDecGen(event, 15-g_eeGeneral.blOnBright, 0, 15);
         break;
 #endif
@@ -483,7 +483,7 @@ void menuGeneralSetup(uint8_t event)
 #if defined(FRSKY) && defined(FRSKY_HUB) && defined(GPS)
       case ITEM_SETUP_TIMEZONE:
         lcd_putsLeft(y, STR_TIMEZONE);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.timezone, -12, 12);
         break;
 
@@ -537,7 +537,7 @@ void menuGeneralSetup(uint8_t event)
 #if defined(CPUARM)
       case ITEM_SETUP_SWITCHES_DELAY:
         lcd_putsLeft(y, STR_SWITCHES_DELAY);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT);
         lcdDrawText(lcdLastPos, y, STR_MS, attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, +15);
         break;
diff --git a/radio/src/gui/9X/menu_general_trainer.cpp b/radio/src/gui/9X/menu_general_trainer.cpp
index f7a685793..c7eb54d83 100644
--- a/radio/src/gui/9X/menu_general_trainer.cpp
+++ b/radio/src/gui/9X/menu_general_trainer.cpp
@@ -46,13 +46,13 @@ void menuGeneralTrainer(uint8_t event)
   MENU(STR_MENUTRAINER, menuTabGeneral, e_Trainer, (slave ? 1 : 7), {0, 2, 2, 2, 2, 0/*, 0*/});
 
   if (slave) {
-    lcd_puts(7*FW, 4*FH, STR_SLAVE);
+    lcdDrawText(7*FW, 4*FH, STR_SLAVE);
   }
   else {
     uint8_t attr;
     uint8_t blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
 
-    lcd_puts(3*FW, MENU_HEADER_HEIGHT+1, STR_MODESRC);
+    lcdDrawText(3*FW, MENU_HEADER_HEIGHT+1, STR_MODESRC);
 
     y = MENU_HEADER_HEIGHT + 1 + FH;
 
@@ -73,7 +73,7 @@ void menuGeneralTrainer(uint8_t event)
             break;
 
           case 1:
-            lcd_outdezAtt(11*FW, y, td->studWeight, attr);
+            lcdDrawNumber(11*FW, y, td->studWeight, attr);
             if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->studWeight, -125, 125);
             break;
 
@@ -88,7 +88,7 @@ void menuGeneralTrainer(uint8_t event)
 
     attr = (m_posVert==5) ? blink : 0;
     lcd_putsLeft(MENU_HEADER_HEIGHT+1+5*FH, STR_MULTIPLIER);
-    lcd_outdezAtt(LEN_MULTIPLIER*FW+3*FW, MENU_HEADER_HEIGHT+1+5*FH, g_eeGeneral.PPM_Multiplier+10, attr|PREC1);
+    lcdDrawNumber(LEN_MULTIPLIER*FW+3*FW, MENU_HEADER_HEIGHT+1+5*FH, g_eeGeneral.PPM_Multiplier+10, attr|PREC1);
     if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.PPM_Multiplier, -10, 40);
 
     attr = (m_posVert==6) ? INVERS : 0;
@@ -97,9 +97,9 @@ void menuGeneralTrainer(uint8_t event)
     for (uint8_t i=0; i<4; i++) {
       uint8_t x = (i*TRAINER_CALIB_POS+16)*FW/2;
 #if defined (PPM_UNIT_PERCENT_PREC1)
-      lcd_outdezAtt(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])*2, PREC1);
+      lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])*2, PREC1);
 #else
-      lcd_outdezAtt(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])/5, 0);
+      lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])/5, 0);
 #endif
     }
 
diff --git a/radio/src/gui/9X/menu_general_version.cpp b/radio/src/gui/9X/menu_general_version.cpp
index b28c29fd8..4ef67740b 100644
--- a/radio/src/gui/9X/menu_general_version.cpp
+++ b/radio/src/gui/9X/menu_general_version.cpp
@@ -45,7 +45,7 @@ void menuGeneralVersion(uint8_t event)
 #if defined(COPROCESSOR)
   if (Coproc_valid == 1) {
      lcd_putsLeft(6*FH, PSTR("CoPr:"));
-     lcd_outdez8(10*FW, 6*FH, Coproc_read);
+     lcdDraw8bitsNumber(10*FW, 6*FH, Coproc_read);
   }
   else {
      lcd_putsLeft(6*FH, PSTR("CoPr: ---"));
diff --git a/radio/src/gui/9X/menu_model.cpp b/radio/src/gui/9X/menu_model.cpp
index 5a4a28bc8..c6c3b46bb 100644
--- a/radio/src/gui/9X/menu_model.cpp
+++ b/radio/src/gui/9X/menu_model.cpp
@@ -93,7 +93,7 @@ extern uint8_t s_curveChan;
 uint8_t editDelay(const coord_t y, const uint8_t event, const uint8_t attr, const pm_char *str, uint8_t delay)
 {
   lcd_putsLeft(y, str);
-  lcd_outdezAtt(MIXES_2ND_COLUMN, y, (10/DELAY_STEP)*delay, attr|PREC1|LEFT);
+  lcdDrawNumber(MIXES_2ND_COLUMN, y, (10/DELAY_STEP)*delay, attr|PREC1|LEFT);
   if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, delay, DELAY_MAX);
   return delay;
 }
@@ -142,7 +142,7 @@ void editName(coord_t x, coord_t y, char *name, uint8_t size, uint8_t event, uin
       mode = FIXEDWIDTH;
   }
 
-  lcdDrawTextWithLen(x, y, name, size, ZCHAR | mode);
+  lcdDrawSizedText(x, y, name, size, ZCHAR | mode);
 
   if (active) {
     uint8_t cur = editNameCursorPos;
diff --git a/radio/src/gui/9X/menu_model_curves.cpp b/radio/src/gui/9X/menu_model_curves.cpp
index 0997aabc5..b2f52a0ed 100644
--- a/radio/src/gui/9X/menu_model_curves.cpp
+++ b/radio/src/gui/9X/menu_model_curves.cpp
@@ -105,7 +105,7 @@ bool moveCurve(uint8_t index, int8_t shift, int8_t custom=0)
 void menuModelCurveOne(uint8_t event)
 {
   TITLE(STR_MENUCURVE);
-  lcd_outdezAtt(PSIZE(TR_MENUCURVE)*FW+1, 0, s_curveChan+1, INVERS|LEFT);
+  lcdDrawNumber(PSIZE(TR_MENUCURVE)*FW+1, 0, s_curveChan+1, INVERS|LEFT);
   DISPLAY_PROGRESS_BAR(20*FW+1);
 
   CurveInfo crv = curveInfo(s_curveChan);
@@ -188,7 +188,7 @@ void menuModelCurveOne(uint8_t event)
 
   lcd_putsLeft(7*FH, STR_TYPE);
   uint8_t attr = (s_editMode <= 0 ? INVERS : 0);
-  lcd_outdezAtt(5*FW-2, 7*FH, crv.points, LEFT|attr);
+  lcdDrawNumber(5*FW-2, 7*FH, crv.points, LEFT|attr);
   lcdDrawText(lcdLastPos, 7*FH, crv.custom ? PSTR("pt'") : PSTR("pt"), attr);
 
   DrawCurve();
@@ -205,8 +205,8 @@ void menuModelCurveOne(uint8_t event)
 
     int8_t x = -100 + 200*i/(crv.points-1);
     if (crv.custom && i>0 && i<crv.points-1) x = crv.crv[crv.points+i-1];
-    lcd_puts(7, 2*FH, PSTR("x=")); lcd_outdezAtt(7+2*FW, 2*FH, x, LEFT);
-    lcd_puts(7, 3*FH, PSTR("y=")); lcd_outdezAtt(7+2*FW, 3*FH, crv.crv[i], LEFT);
+    lcdDrawText(7, 2*FH, PSTR("x=")); lcdDrawNumber(7+2*FW, 2*FH, x, LEFT);
+    lcdDrawText(7, 3*FH, PSTR("y=")); lcdDrawNumber(7+2*FW, 3*FH, crv.crv[i], LEFT);
     lcdDrawRect(3, 1*FH+4, 7*FW-2, 3*FH-2);
 
     if (p1valdiff || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_FIRST(KEY_UP) || event==EVT_KEY_REPT(KEY_DOWN) || event==EVT_KEY_REPT(KEY_UP))
@@ -256,7 +256,7 @@ void menuModelCurvesAll(uint8_t event)
       putsStrIdx(0, y, STR_GV, k-MAX_CURVES+1);
       if (GVAR_SELECTED()) {
         if (attr && s_editMode>0) attr |= BLINK;
-        lcd_outdezAtt(10*FW, y, GVAR_VALUE(k-MAX_CURVES, -1), attr);
+        lcdDrawNumber(10*FW, y, GVAR_VALUE(k-MAX_CURVES, -1), attr);
         if (attr) g_model.gvars[k-MAX_CURVES] = checkIncDec(event, g_model.gvars[k-MAX_CURVES], -1000, 1000, EE_MODEL);
       }
     }
diff --git a/radio/src/gui/9X/menu_model_custom_functions.cpp b/radio/src/gui/9X/menu_model_custom_functions.cpp
index fdebfa24e..839db7f72 100644
--- a/radio/src/gui/9X/menu_model_custom_functions.cpp
+++ b/radio/src/gui/9X/menu_model_custom_functions.cpp
@@ -200,7 +200,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
             val_displayed = (int8_t)CFN_PARAM(cfn);
 #endif
             val_min = -LIMIT_EXT_PERCENT; val_max = +LIMIT_EXT_PERCENT;
-            lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
+            lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
           }
 #endif
 #if defined(CPUARM)
@@ -224,14 +224,14 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
 #if defined(HAPTIC)
           else if (func == FUNC_HAPTIC) {
             val_max = 3;
-            lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
+            lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
           }
 #endif
 #if defined(CPUARM) && defined(SDCARD)
           else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) {
             coord_t x = (func == FUNC_PLAY_TRACK ? MODEL_CUSTOM_FUNC_2ND_COLUMN + FW + FW*strlen(TR_PLAY_TRACK) : MODEL_CUSTOM_FUNC_3RD_COLUMN);
             if (ZEXIST(cfn->play.name))
-              lcdDrawTextWithLen(x, y, cfn->play.name, sizeof(cfn->play.name), attr);
+              lcdDrawSizedText(x, y, cfn->play.name, sizeof(cfn->play.name), attr);
             else
               lcdDrawTextAtIndex(x, y, STR_VCSWFUNC, 0, attr);
             if (active && event==EVT_KEY_BREAK(KEY_ENTER)) {
@@ -280,16 +280,16 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
               putsStrIdx(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, STR_GV, val_displayed-250, attr);
             }
             else {
-              lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed+PROMPT_CUSTOM_BASE, attr|LEFT);
+              lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed+PROMPT_CUSTOM_BASE, attr|LEFT);
             }
 #else
-            lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed+PROMPT_CUSTOM_BASE, attr|LEFT);
+            lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed+PROMPT_CUSTOM_BASE, attr|LEFT);
 #endif
           }
           else if (func == FUNC_PLAY_BOTH) {
             lcdDrawChar(MODEL_CUSTOM_FUNC_3RD_COLUMN+3*FWNUM, y, '|', attr);
-            lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN+3*FWNUM, y, val_displayed+PROMPT_CUSTOM_BASE, attr);
-            lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN+2+3*FWNUM, y, (val_displayed+PROMPT_CUSTOM_BASE+1)%10, attr|LEFT);
+            lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN+3*FWNUM, y, val_displayed+PROMPT_CUSTOM_BASE, attr);
+            lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN+2+3*FWNUM, y, (val_displayed+PROMPT_CUSTOM_BASE+1)%10, attr|LEFT);
           }
           else if (func == FUNC_PLAY_VALUE) {
             val_max = MIXSRC_FIRST_TELEM + TELEM_DISPLAY_MAX - 1;
@@ -300,8 +300,8 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
 #if defined(SDCARD)
           else if (func == FUNC_LOGS) {
             if (val_displayed) {
-              lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT);
-              lcd_putc(lcdLastPos, y, 's');
+              lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT);
+              lcdDrawChar(lcdLastPos, y, 's');
             }
             else {
               lcdDrawTextAtIndex(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, STR_MMMINV, 0, attr);
@@ -314,7 +314,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
               case FUNC_ADJUST_GVAR_CONSTANT:
                 val_displayed = (int16_t)CFN_PARAM(cfn);
                 val_min = -CFN_GVAR_CST_MAX; val_max = +CFN_GVAR_CST_MAX;
-                lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
+                lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
                 break;
               case FUNC_ADJUST_GVAR_SOURCE:
                 val_max = MIXSRC_LAST_CH;
@@ -373,7 +373,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
             }
 #endif
             else {
-              lcd_outdezAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN+2+FW, y, CFN_PLAY_REPEAT(cfn)*CFN_PLAY_REPEAT_MUL, attr);
+              lcdDrawNumber(MODEL_CUSTOM_FUNC_4TH_COLUMN+2+FW, y, CFN_PLAY_REPEAT(cfn)*CFN_PLAY_REPEAT_MUL, attr);
             }
 #if defined(CPUARM)
             if (active) CFN_PLAY_REPEAT(cfn) = checkIncDec(event, CFN_PLAY_REPEAT(cfn)==CFN_PLAY_REPEAT_NOSTART?-1:CFN_PLAY_REPEAT(cfn), -1, 60/CFN_PLAY_REPEAT_MUL, eeFlags);
diff --git a/radio/src/gui/9X/menu_model_flightmodes.cpp b/radio/src/gui/9X/menu_model_flightmodes.cpp
index 5e1614d4a..8b964e88b 100644
--- a/radio/src/gui/9X/menu_model_flightmodes.cpp
+++ b/radio/src/gui/9X/menu_model_flightmodes.cpp
@@ -42,7 +42,7 @@ void displayFlightModes(coord_t x, coord_t y, FlightModesType value)
   do {
     --p;
     if (!(value & (1<<p)))
-      lcd_putc(x, y, '0'+p);
+      lcdDrawChar(x, y, '0'+p);
     x -= FWNUM;
   } while (p!=0);
 }
@@ -189,7 +189,7 @@ void menuModelPhaseOne(uint8_t event)
         }
 
         uint8_t p = getGVarFlightPhase(s_currIdx, idx);
-        lcd_outdezAtt(21*FW, y, GVAR_VALUE(idx, p), posHorz==2 ? attr : 0);
+        lcdDrawNumber(21*FW, y, GVAR_VALUE(idx, p), posHorz==2 ? attr : 0);
         if (attr && posHorz==2 && ((editMode>0) || p1valdiff)) {
           GVAR_VALUE(idx, p) = checkIncDec(event, GVAR_VALUE(idx, p), -GVAR_LIMIT, GVAR_LIMIT, EE_MODEL);
         }
@@ -253,9 +253,9 @@ void menuModelFlightModesAll(uint8_t event)
     FlightModeData *p = flightModeAddress(i);
     putsFlightMode(0, y, i+1, att|(getFlightMode()==i ? BOLD : 0));
 
-    lcdDrawTextWithLen(4*FW+NAME_OFS, y, p->name, sizeof(p->name), ZCHAR);
+    lcdDrawSizedText(4*FW+NAME_OFS, y, p->name, sizeof(p->name), ZCHAR);
     if (i == 0) {
-      lcd_puts((5+LEN_FLIGHT_MODE_NAME)*FW+SWITCH_OFS, y, STR_DEFAULT);
+      lcdDrawText((5+LEN_FLIGHT_MODE_NAME)*FW+SWITCH_OFS, y, STR_DEFAULT);
     }
     else {
       putsSwitches((5+LEN_FLIGHT_MODE_NAME)*FW+SWITCH_OFS, y, p->swtch, 0);
@@ -270,7 +270,7 @@ void menuModelFlightModesAll(uint8_t event)
     }
 
     if (p->fadeIn || p->fadeOut) {
-      lcd_putc(LCD_W-FW-MENUS_SCROLLBAR_WIDTH, y, (p->fadeIn && p->fadeOut) ? '*' : (p->fadeIn ? 'I' : 'O'));
+      lcdDrawChar(LCD_W-FW-MENUS_SCROLLBAR_WIDTH, y, (p->fadeIn && p->fadeOut) ? '*' : (p->fadeIn ? 'I' : 'O'));
     }
   }
 
diff --git a/radio/src/gui/9X/menu_model_heli.cpp b/radio/src/gui/9X/menu_model_heli.cpp
index 31d766b9c..d8c558ba2 100644
--- a/radio/src/gui/9X/menu_model_heli.cpp
+++ b/radio/src/gui/9X/menu_model_heli.cpp
@@ -67,7 +67,7 @@ void menuModelHeli(uint8_t event)
 
       case ITEM_HELI_SWASHRING:
         lcd_putsLeft(y, STR_SWASHRING);
-        lcd_outdezAtt(HELI_PARAM_OFS, y, g_model.swashR.value,  LEFT|attr);
+        lcdDrawNumber(HELI_PARAM_OFS, y, g_model.swashR.value,  LEFT|attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.swashR.value, 100);
         break;
 
diff --git a/radio/src/gui/9X/menu_model_inputs_mixes.cpp b/radio/src/gui/9X/menu_model_inputs_mixes.cpp
index 5df8e6e77..53b64b769 100644
--- a/radio/src/gui/9X/menu_model_inputs_mixes.cpp
+++ b/radio/src/gui/9X/menu_model_inputs_mixes.cpp
@@ -371,9 +371,9 @@ void menuModelExpoOne(uint8_t event)
   drawFunction(expoFn);
 
   int16_t x512 = calibratedStick[ed->chn];
-  lcd_outdezAtt(LCD_W-8, 6*FH, calcRESXto100(x512), 0);
+  lcdDrawNumber(LCD_W-8, 6*FH, calcRESXto100(x512), 0);
   int16_t y512 = expoFn(x512);
-  lcd_outdezAtt(LCD_W-8-6*FW, 1*FH, calcRESXto100(y512), 0);
+  lcdDrawNumber(LCD_W-8-6*FW, 1*FH, calcRESXto100(y512), 0);
 
 #if defined(CPUARM)
   x512 = X0+x512/(RESX/WCHART);
@@ -424,11 +424,11 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
   int barMax = offset + weight;
   if (y > 15) {
 #if defined(CPUARM)
-    lcd_outdezAtt(x-((barMin >= 0) ? 2 : 3), y-6, barMin, TINSIZE|LEFT);
-    lcd_outdezAtt(x+GAUGE_WIDTH+1, y-6, barMax, TINSIZE);
+    lcdDrawNumber(x-((barMin >= 0) ? 2 : 3), y-6, barMin, TINSIZE|LEFT);
+    lcdDrawNumber(x+GAUGE_WIDTH+1, y-6, barMax, TINSIZE);
 #else
-    lcd_outdezAtt(x-((barMin >= 0) ? 2 : 3), y-8, barMin, LEFT);
-    lcd_outdezAtt(x+GAUGE_WIDTH+1, y-8, barMax);
+    lcdDrawNumber(x-((barMin >= 0) ? 2 : 3), y-8, barMin, LEFT);
+    lcdDrawNumber(x+GAUGE_WIDTH+1, y-8, barMax);
 #endif
   }
   if (barMin < -101)
@@ -544,7 +544,7 @@ void menuModelMixOne(uint8_t event)
         lcdDrawTextAtIndex((not_stick ? COLUMN_X+MIXES_2ND_COLUMN : COLUMN_X+6*FW-3), y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, m_posHorz==0 ? attr : 0);
         if (attr && m_posHorz==0 && (not_stick || editMode>0)) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL);
         if (!not_stick) {
-          lcd_puts(COLUMN_X+MIXES_2ND_COLUMN, y, STR_DREX);
+          lcdDrawText(COLUMN_X+MIXES_2ND_COLUMN, y, STR_DREX);
           menu_lcd_onoff(COLUMN_X+MIXES_2ND_COLUMN+DREX_CHBOX_OFFSET, y, !md2->noExpo, m_posHorz==1 ? attr : 0);
           if (attr && m_posHorz==1 && editMode>0) md2->noExpo = !checkIncDecModel(event, !md2->noExpo, 0, 1);
         }
@@ -599,7 +599,7 @@ void menuModelMixOne(uint8_t event)
       case MIX_FIELD_WARNING:
         lcd_putsColumnLeft(COLUMN_X+MIXES_2ND_COLUMN, y, STR_MIXWARNING);
         if (md2->mixWarn)
-          lcd_outdezAtt(COLUMN_X+MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT);
+          lcdDrawNumber(COLUMN_X+MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT);
         else
           lcdDrawText(COLUMN_X+MIXES_2ND_COLUMN, y, STR_OFF, attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, md2->mixWarn, 3);
@@ -708,7 +708,7 @@ void displayMixInfos(coord_t y, MixData *md)
 void displayMixLine(coord_t y, MixData *md)
 {
   if (md->name[0]) {
-    lcdDrawTextWithLen(EXPO_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
+    lcdDrawSizedText(EXPO_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
   }
   else {
     displayMixInfos(y, md);
@@ -734,7 +734,7 @@ void displayExpoLine(coord_t y, ExpoData *ed)
   displayExpoInfos(y, ed);
 
   if (ed->name[0]) {
-    lcdDrawTextWithLen(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR);
+    lcdDrawSizedText(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR);
   }
 }
 #else
@@ -898,8 +898,8 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
       break;
   }
 
-  lcd_outdezAtt(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, getExpoMixCount(expo));
-  lcd_puts(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, expo ? STR_MAX(MAX_EXPOS) : STR_MAX(MAX_MIXERS));
+  lcdDrawNumber(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, getExpoMixCount(expo));
+  lcdDrawText(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, expo ? STR_MAX(MAX_EXPOS) : STR_MAX(MAX_MIXERS));
 
   SIMPLE_MENU(expo ? STR_MENUINPUTS : STR_MIXER, menuTabModel, expo ? e_InputsAll : e_MixAll, s_maxLines);
 
@@ -941,7 +941,7 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
             ed->weight = GVAR_MENU_ITEM(EXPO_LINE_WEIGHT_POS, y, ed->weight, MIN_EXPO_WEIGHT, 100, attr | (isExpoActive(i) ? BOLD : 0), 0, event);
             displayExpoLine(y, ed);
             if (ed->mode!=3) {
-              lcd_putc(EXPO_LINE_SIDE_POS, y, ed->mode == 2 ? 126 : 127);
+              lcdDrawChar(EXPO_LINE_SIDE_POS, y, ed->mode == 2 ? 126 : 127);
             }
           }
           else {
@@ -958,7 +958,7 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
               cs = 'S';
             if (md->delayUp || md->delayDown)
               cs = (cs =='S' ? '*' : 'D');
-            lcd_putc(MIX_LINE_DELAY_POS, y, cs);
+            lcdDrawChar(MIX_LINE_DELAY_POS, y, cs);
           }
           if (s_copyMode) {
             if ((s_copyMode==COPY_MODE || s_copyTgtOfs == 0) && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
diff --git a/radio/src/gui/9X/menu_model_limits.cpp b/radio/src/gui/9X/menu_model_limits.cpp
index 83c256ee6..4001b9af0 100644
--- a/radio/src/gui/9X/menu_model_limits.cpp
+++ b/radio/src/gui/9X/menu_model_limits.cpp
@@ -108,10 +108,10 @@ void menuModelLimits(uint8_t event)
 
   if (sub < NUM_CHNOUT) {
 #if defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_UNIT_US)
-    lcd_outdezAtt(13*FW, 0, PPM_CH_CENTER(sub)+channelOutputs[sub]/2, 0);
-    lcd_puts(13*FW, 0, STR_US);
+    lcdDrawNumber(13*FW, 0, PPM_CH_CENTER(sub)+channelOutputs[sub]/2, 0);
+    lcdDrawText(13*FW, 0, STR_US);
 #else
-    lcd_outdezAtt(13*FW, 0, calcRESXto1000(channelOutputs[sub]), PREC1);
+    lcdDrawNumber(13*FW, 0, calcRESXto1000(channelOutputs[sub]), PREC1);
 #endif
   }
 
@@ -155,7 +155,7 @@ void menuModelLimits(uint8_t event)
     if ((channelOutputs[k] - v) > 50) swVal = (ld->revert ? 127 : 126); // Switch to raw inputs?  - remove trim!
     if ((channelOutputs[k] - v) < -50) swVal = (ld->revert ? 126 : 127);
     putsChn(0, y, k+1, 0);
-    lcd_putc(LIMITS_DIRECTION_POS, y, swVal);
+    lcdDrawChar(LIMITS_DIRECTION_POS, y, swVal);
 #endif
 
     int8_t limit = (g_model.extendedLimits ? LIMIT_EXT_MAX : 100);
@@ -170,9 +170,9 @@ void menuModelLimits(uint8_t event)
       {
         case ITEM_LIMITS_OFFSET:
 #if defined(PPM_UNIT_US)
-          lcd_outdezAtt(LIMITS_OFFSET_POS, y, ((int32_t)ld->offset*128) / 25, attr|PREC1);
+          lcdDrawNumber(LIMITS_OFFSET_POS, y, ((int32_t)ld->offset*128) / 25, attr|PREC1);
 #else
-          lcd_outdezAtt(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1);
+          lcdDrawNumber(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1);
 #endif
           if (active) {
 #if defined(CPUARM)
@@ -188,7 +188,7 @@ void menuModelLimits(uint8_t event)
           break;
 
         case ITEM_LIMITS_MIN:
-          lcd_outdezAtt(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
+          lcdDrawNumber(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
 #if defined(CPUARM)
           if (active) ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, NULL, stops1000);
 #else
@@ -197,7 +197,7 @@ void menuModelLimits(uint8_t event)
           break;
 
         case ITEM_LIMITS_MAX:
-          lcd_outdezAtt(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
+          lcdDrawNumber(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
 #if defined(CPUARM)
           if (active) ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, NULL, stops1000);
 #else
@@ -227,7 +227,7 @@ void menuModelLimits(uint8_t event)
 
 #if defined(PPM_CENTER_ADJUSTABLE)
         case ITEM_LIMITS_PPM_CENTER:
-          lcd_outdezAtt(LIMITS_PPM_CENTER_POS, y, PPM_CENTER+ld->ppmCenter, attr);
+          lcdDrawNumber(LIMITS_PPM_CENTER_POS, y, PPM_CENTER+ld->ppmCenter, attr);
           if (active) {
             CHECK_INCDEC_MODELVAR(event, ld->ppmCenter, -PPM_CENTER_MAX, +PPM_CENTER_MAX);
           }
diff --git a/radio/src/gui/9X/menu_model_logical_switches.cpp b/radio/src/gui/9X/menu_model_logical_switches.cpp
index a66dbcd90..f51690776 100644
--- a/radio/src/gui/9X/menu_model_logical_switches.cpp
+++ b/radio/src/gui/9X/menu_model_logical_switches.cpp
@@ -73,16 +73,16 @@ enum LogicalSwitchFields {
 #if defined(CPUARM)
 void putsEdgeDelayParam(coord_t x, coord_t y, LogicalSwitchData *cs, uint8_t lattr, uint8_t rattr)
 {
-  lcd_putc(x-4, y, '[');
-  lcd_outdezAtt(x, y, lswTimerValue(cs->v2), LEFT|PREC1|lattr);
-  lcd_putc(lcdLastPos, y, ':');
+  lcdDrawChar(x-4, y, '[');
+  lcdDrawNumber(x, y, lswTimerValue(cs->v2), LEFT|PREC1|lattr);
+  lcdDrawChar(lcdLastPos, y, ':');
   if (cs->v3 < 0)
     lcdDrawText(lcdLastPos+3, y, "<<", rattr);
   else if (cs->v3 == 0)
     lcdDrawText(lcdLastPos+3, y, "--", rattr);
   else
-    lcd_outdezAtt(lcdLastPos+3, y, lswTimerValue(cs->v2+cs->v3), LEFT|PREC1|rattr);
-  lcd_putc(lcdLastPos, y, ']');
+    lcdDrawNumber(lcdLastPos+3, y, lswTimerValue(cs->v2+cs->v3), LEFT|PREC1|rattr);
+  lcdDrawChar(lcdLastPos, y, ']');
 }
 #endif
 
@@ -140,7 +140,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
           v1_min = SWSRC_OFF+1; v1_max = SWSRC_ON-1;
         }
         else if (cstate == LS_FAMILY_TIMER) {
-          lcd_outdezAtt(CSWONE_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1|attr);
+          lcdDrawNumber(CSWONE_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1|attr);
           v1_min = -128;
           v1_max = 122;
         }
@@ -164,7 +164,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
           v2_min = SWSRC_OFF+1; v2_max = SWSRC_ON-1;
         }
         else if (cstate == LS_FAMILY_TIMER) {
-          lcd_outdezAtt(CSWONE_2ND_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1|attr);
+          lcdDrawNumber(CSWONE_2ND_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1|attr);
           v2_min = -128;
           v2_max = 122;
         }
@@ -207,7 +207,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
 #endif
           {
             v2_min = -LIMIT_EXT_PERCENT; v2_max = +LIMIT_EXT_PERCENT;
-            lcd_outdezAtt(CSWONE_2ND_COLUMN, y, cs->v2, LEFT|attr);
+            lcdDrawNumber(CSWONE_2ND_COLUMN, y, cs->v2, LEFT|attr);
           }
         }
 
@@ -224,7 +224,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
       case LS_FIELD_DURATION:
         lcd_putsLeft(y, STR_DURATION);
         if (cs->duration > 0)
-          lcd_outdezAtt(CSWONE_2ND_COLUMN, y, cs->duration, attr|PREC1|LEFT);
+          lcdDrawNumber(CSWONE_2ND_COLUMN, y, cs->duration, attr|PREC1|LEFT);
         else
           lcdDrawTextAtIndex(CSWONE_2ND_COLUMN, y, STR_MMMINV, 0, attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, cs->duration, MAX_LS_DURATION);
@@ -232,7 +232,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
       case LS_FIELD_DELAY:
         lcd_putsLeft(y, STR_DELAY);
         if (cs->delay > 0)
-          lcd_outdezAtt(CSWONE_2ND_COLUMN, y, cs->delay, attr|PREC1|LEFT);
+          lcdDrawNumber(CSWONE_2ND_COLUMN, y, cs->delay, attr|PREC1|LEFT);
         else
           lcdDrawTextAtIndex(CSWONE_2ND_COLUMN, y, STR_MMMINV, 0, attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, cs->delay, MAX_LS_DELAY);
@@ -292,8 +292,8 @@ void menuModelLogicalSwitches(uint8_t event)
         putsEdgeDelayParam(CSW_3RD_COLUMN, y, cs, 0, 0);
       }
       else if (cstate == LS_FAMILY_TIMER) {
-        lcd_outdezAtt(CSW_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1);
-        lcd_outdezAtt(CSW_3RD_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1);
+        lcdDrawNumber(CSW_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1);
+        lcdDrawNumber(CSW_3RD_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1);
       }
       else {
         uint8_t v1 = cs->v1;
@@ -306,7 +306,7 @@ void menuModelLogicalSwitches(uint8_t event)
 #endif
         }
         else {
-          lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT);
+          lcdDrawNumber(CSW_3RD_COLUMN, y, cs->v2, LEFT);
         }
       }
 
@@ -388,8 +388,8 @@ void menuModelLogicalSwitches(uint8_t event)
       INCDEC_ENABLE_CHECK(isSourceAvailable);
     }
     else if (cstate == LS_FAMILY_TIMER) {
-      lcd_outdezAtt(CSW_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1|attr1);
-      lcd_outdezAtt(CSW_3RD_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1|attr2);
+      lcdDrawNumber(CSW_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1|attr1);
+      lcdDrawNumber(CSW_3RD_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1|attr2);
       v1_min = v2_min = -128;
       v1_max = v2_max = 122;
       INCDEC_SET_FLAG(EE_MODEL);
@@ -445,7 +445,7 @@ void menuModelLogicalSwitches(uint8_t event)
 #endif
       }
       else {
-        lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT|attr2);
+        lcdDrawNumber(CSW_3RD_COLUMN, y, cs->v2, LEFT|attr2);
 #if defined(CPUARM) && defined(GVARS)
         if (v1_val >= MIXSRC_GVAR1) {
           v2_min = -1024; v2_max = +1024;
@@ -462,7 +462,7 @@ void menuModelLogicalSwitches(uint8_t event)
         v2_min = -128; v2_max = 127;
       }
       else {
-        lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT|attr2);
+        lcdDrawNumber(CSW_3RD_COLUMN, y, cs->v2, LEFT|attr2);
         v2_min = -LIMIT_EXT_PERCENT; v2_max = +LIMIT_EXT_PERCENT;
       }
 #endif
@@ -482,19 +482,19 @@ void menuModelLogicalSwitches(uint8_t event)
 #if defined(CPUARM)
     // CSW duration
     if (cs->duration > 0)
-      lcd_outdezAtt(CSW_5TH_COLUMN, y, cs->duration, (horz==LS_FIELD_DURATION ? attr : 0)|PREC1|LEFT);
+      lcdDrawNumber(CSW_5TH_COLUMN, y, cs->duration, (horz==LS_FIELD_DURATION ? attr : 0)|PREC1|LEFT);
     else
       lcdDrawTextAtIndex(CSW_5TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DURATION ? attr : 0);
 
     // CSW delay
     if (cstate == LS_FAMILY_EDGE) {
-      lcd_puts(CSW_6TH_COLUMN, y, STR_NA);
+      lcdDrawText(CSW_6TH_COLUMN, y, STR_NA);
       if (attr && horz == LS_FIELD_DELAY) {
         REPEAT_LAST_CURSOR_MOVE();
       }
     }
     else if (cs->delay > 0) {
-      lcd_outdezAtt(CSW_6TH_COLUMN, y, cs->delay, (horz==LS_FIELD_DELAY ? attr : 0)|PREC1|LEFT);
+      lcdDrawNumber(CSW_6TH_COLUMN, y, cs->delay, (horz==LS_FIELD_DELAY ? attr : 0)|PREC1|LEFT);
     }
     else {
       lcdDrawTextAtIndex(CSW_6TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DELAY ? attr : 0);
diff --git a/radio/src/gui/9X/menu_model_select.cpp b/radio/src/gui/9X/menu_model_select.cpp
index 42ad8fe40..15ee589a9 100644
--- a/radio/src/gui/9X/menu_model_select.cpp
+++ b/radio/src/gui/9X/menu_model_select.cpp
@@ -318,9 +318,9 @@ void menuModelSelect(uint8_t event)
   }
 
 #if !defined(PCBSKY9X)
-  lcd_puts(9*FW-(LEN_FREE-4)*FW, 0, STR_FREE);
+  lcdDrawText(9*FW-(LEN_FREE-4)*FW, 0, STR_FREE);
   if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree();
-  lcd_outdezAtt(17*FW, 0, reusableBuffer.modelsel.eepromfree, 0);
+  lcdDrawNumber(17*FW, 0, reusableBuffer.modelsel.eepromfree, 0);
 #endif
 
 #if defined(ROTARY_ENCODER_NAVIGATION)
@@ -335,13 +335,13 @@ void menuModelSelect(uint8_t event)
     coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
     uint8_t k = i+s_pgOfs;
 
-    lcd_outdezNAtt(3*FW+2, y, k+1, LEADING0+((!s_copyMode && sub==k) ? INVERS : 0), 2);
+    lcdDrawNumber(3*FW+2, y, k+1, LEADING0+((!s_copyMode && sub==k) ? INVERS : 0), 2);
 
     if (s_copyMode == MOVE_MODE || (s_copyMode == COPY_MODE && s_copySrcRow >= 0)) {
       if (k == sub) {
         if (s_copyMode == COPY_MODE) {
           k = s_copySrcRow;
-          lcd_putc(MODELSEL_W-FW, y, '+');
+          lcdDrawChar(MODELSEL_W-FW, y, '+');
         }
         else {
           k = sub + s_copyTgtOfs;
@@ -362,10 +362,10 @@ void menuModelSelect(uint8_t event)
       char * name = reusableBuffer.modelsel.listnames[i];
       if (event) eeLoadModelName(k, name);
       putsModelName(4*FW, y, name, k, 0);
-      lcd_outdezAtt(20*FW, y, eeModelSize(k), 0);
+      lcdDrawNumber(20*FW, y, eeModelSize(k), 0);
 #endif
       if (k==g_eeGeneral.currModel && (s_copyMode!=COPY_MODE || s_copySrcRow<0 || i+s_pgOfs!=(vertpos_t)sub))
-        lcd_putc(1, y, '*');
+        lcdDrawChar(1, y, '*');
     }
 
     if (s_copyMode && (vertpos_t)sub==i+s_pgOfs) {
diff --git a/radio/src/gui/9X/menu_model_setup.cpp b/radio/src/gui/9X/menu_model_setup.cpp
index ff9a4ed3a..dd1f62353 100644
--- a/radio/src/gui/9X/menu_model_setup.cpp
+++ b/radio/src/gui/9X/menu_model_setup.cpp
@@ -541,9 +541,9 @@ void menuModelSetup(uint8_t event)
         lcd_putsLeft(y, STR_CHANNELRANGE);
         if ((int8_t)PORT_CHANNELS_ROWS(moduleIdx) >= 0) {
           lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CH, m_posHorz==0 ? attr : 0);
-          lcd_outdezAtt(lcdLastPos, y, moduleData.channelsStart+1, LEFT | (m_posHorz==0 ? attr : 0));
-          lcd_putc(lcdLastPos, y, '-');
-          lcd_outdezAtt(lcdLastPos + FW+1, y, moduleData.channelsStart+NUM_CHANNELS(moduleIdx), LEFT | (m_posHorz==1 ? attr : 0));
+          lcdDrawNumber(lcdLastPos, y, moduleData.channelsStart+1, LEFT | (m_posHorz==0 ? attr : 0));
+          lcdDrawChar(lcdLastPos, y, '-');
+          lcdDrawNumber(lcdLastPos + FW+1, y, moduleData.channelsStart+NUM_CHANNELS(moduleIdx), LEFT | (m_posHorz==1 ? attr : 0));
           if (attr && (editMode>0 || p1valdiff)) {
             switch (m_posHorz) {
               case 0:
@@ -572,10 +572,10 @@ void menuModelSetup(uint8_t event)
         ModuleData & moduleData = g_model.moduleData[moduleIdx];
         if (IS_MODULE_PPM(moduleIdx)) {
           lcd_putsLeft(y, STR_PPMFRAME);
-          lcd_puts(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
-          lcd_putc(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (moduleData.ppmDelay*50)+300, (CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0);
+          lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
+          lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (moduleData.ppmDelay*50)+300, (CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0);
           lcdDrawChar(MODEL_SETUP_2ND_COLUMN+10*FW, y, moduleData.ppmPulsePol ? '+' : '-', (CURSOR_ON_LINE() || m_posHorz==2) ? attr : 0);
 
           if (attr && (editMode>0 || p1valdiff)) {
@@ -604,7 +604,7 @@ void menuModelSetup(uint8_t event)
             lcd_putsLeft(y, STR_RXNUM);
           }
           if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx)) {
-            if (xOffsetBind) lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
+            if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
             if (attr && l_posHorz==0) {
               if (editMode>0 || p1valdiff) {
                 CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], IS_MODULE_DSM2(moduleIdx) ? 20 : 63);
@@ -706,9 +706,9 @@ void menuModelSetup(uint8_t event)
         lcd_putsLeft(y, PSTR("Port2"));
         lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VPROTOS, 0, 0);
         lcdDrawText(MODEL_SETUP_2ND_COLUMN+4*FW+3, y, STR_CH, m_posHorz<=0 ? attr : 0);
-        lcd_outdezAtt(lcdLastPos, y, g_model.moduleData[1].channelsStart+1, LEFT | (m_posHorz<=0 ? attr : 0));
-        lcd_putc(lcdLastPos, y, '-');
-        lcd_outdezAtt(lcdLastPos + FW+1, y, g_model.moduleData[1].channelsStart+8+g_model.moduleData[1].channelsCount, LEFT | (m_posHorz!=0 ? attr : 0));
+        lcdDrawNumber(lcdLastPos, y, g_model.moduleData[1].channelsStart+1, LEFT | (m_posHorz<=0 ? attr : 0));
+        lcdDrawChar(lcdLastPos, y, '-');
+        lcdDrawNumber(lcdLastPos + FW+1, y, g_model.moduleData[1].channelsStart+8+g_model.moduleData[1].channelsCount, LEFT | (m_posHorz!=0 ? attr : 0));
         if (attr && (editMode>0 || p1valdiff)) {
           switch (m_posHorz) {
             case 0:
@@ -725,10 +725,10 @@ void menuModelSetup(uint8_t event)
 
       case ITEM_MODEL_PPM2_PARAMS:
         lcd_putsLeft(y, STR_PPMFRAME);
-        lcd_puts(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
-        lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.moduleData[1].ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
-        lcd_putc(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
-        lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.moduleData[1].ppmDelay*50)+300, (m_posHorz < 0 || m_posHorz==1) ? attr : 0);
+        lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
+        lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.moduleData[1].ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
+        lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
+        lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.moduleData[1].ppmDelay*50)+300, (m_posHorz < 0 || m_posHorz==1) ? attr : 0);
         lcdDrawChar(MODEL_SETUP_2ND_COLUMN+10*FW, y, g_model.moduleData[1].ppmPulsePol ? '+' : '-', (m_posHorz < 0 || m_posHorz==2) ? attr : 0);
         if (attr && (editMode>0 || p1valdiff)) {
           switch (m_posHorz) {
@@ -750,10 +750,10 @@ void menuModelSetup(uint8_t event)
       case ITEM_MODEL_PPM1_PARAMS:
         if (IS_PPM_PROTOCOL(protocol)) {
           lcd_putsLeft(y, STR_PPMFRAME);
-          lcd_puts(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
-          lcd_putc(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.ppmDelay*50)+300, (CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0);
+          lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
+          lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.ppmDelay*50)+300, (CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0);
           lcdDrawChar(MODEL_SETUP_2ND_COLUMN+10*FW, y, g_model.pulsePol ? '+' : '-', (CURSOR_ON_LINE() || m_posHorz==2) ? attr : 0);
           if (attr && (editMode>0 || p1valdiff)) {
             switch (m_posHorz) {
@@ -775,7 +775,7 @@ void menuModelSetup(uint8_t event)
             REPEAT_LAST_CURSOR_MOVE(); // limit 3 column row to 2 colums (Rx_Num and RANGE fields)
           }
           lcd_putsLeft(y, STR_RXNUM);
-          lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[0], (m_posHorz<=0 ? attr : 0) | LEADING0|LEFT, 2);
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[0], (m_posHorz<=0 ? attr : 0) | LEADING0|LEFT, 2);
           if (attr && (m_posHorz==0 && (editMode>0 || p1valdiff))) {
             CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[0], 99);
           }
@@ -806,7 +806,7 @@ void menuModelSetup(uint8_t event)
 #if defined(CPUARM) && defined(PXX)
   if (IS_RANGECHECK_ENABLE()) {
     displayPopup("RSSI: ");
-    lcd_outdezAtt(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD);
+    lcdDrawNumber(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD);
   }
 #endif
 }
@@ -866,13 +866,13 @@ void menuModelFailsafe(uint8_t event)
       }
 #if defined(PPM_UNIT_US)
       uint8_t wbar = (longNames ? SLIDER_W-10 : SLIDER_W);
-      lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+val/2, flags);
+      lcdDrawNumber(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+val/2, flags);
 #elif defined(PPM_UNIT_PERCENT_PREC1)
       uint8_t wbar = (longNames ? SLIDER_W-16 : SLIDER_W-6);
-      lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(val), PREC1|flags);
+      lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(val), PREC1|flags);
 #else
       uint8_t wbar = (longNames ? SLIDER_W-10 : SLIDER_W);
-      lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(val)/10, flags);
+      lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(val)/10, flags);
 #endif
 
       // Gauge
diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9X/menu_model_telemetry.cpp
index 98007d3c5..734ea3a93 100644
--- a/radio/src/gui/9X/menu_model_telemetry.cpp
+++ b/radio/src/gui/9X/menu_model_telemetry.cpp
@@ -280,7 +280,7 @@ void menuModelSensor(uint8_t event)
   TelemetrySensor * sensor = & g_model.telemetrySensors[s_currIdx];
 
   SUBMENU(STR_MENUSENSOR, SENSOR_FIELD_MAX, {0, 0, sensor->type == TELEM_TYPE_CALCULATED ? (uint8_t)0 : (uint8_t)1, SENSOR_UNIT_ROWS, SENSOR_PREC_ROWS, SENSOR_PARAM1_ROWS, SENSOR_PARAM2_ROWS, SENSOR_PARAM3_ROWS, SENSOR_PARAM4_ROWS, SENSOR_AUTOOFFSET_ROWS, SENSOR_FILTER_ROWS, SENSOR_PERSISTENT_ROWS, 0 });
-  lcd_outdezAtt(PSIZE(TR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
+  lcdDrawNumber(PSIZE(TR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
 
   putsTelemetryChannelValue(SENSOR_2ND_COLUMN, 0, s_currIdx, getValue(MIXSRC_FIRST_TELEM+3*s_currIdx), LEFT);
 
@@ -318,8 +318,8 @@ void menuModelSensor(uint8_t event)
       case SENSOR_FIELD_ID:
         if (sensor->type == TELEM_TYPE_CUSTOM) {
           lcd_putsLeft(y, STR_ID);
-          lcd_outhex4(SENSOR_2ND_COLUMN, y, sensor->id, LEFT|(m_posHorz==0 ? attr : 0));
-          lcd_outdezAtt(SENSOR_3RD_COLUMN, y, sensor->instance, LEFT|(m_posHorz==1 ? attr : 0));
+          lcdDrawHexNumber(SENSOR_2ND_COLUMN, y, sensor->id, LEFT|(m_posHorz==0 ? attr : 0));
+          lcdDrawNumber(SENSOR_3RD_COLUMN, y, sensor->instance, LEFT|(m_posHorz==1 ? attr : 0));
           if (attr) {
             switch (m_posHorz) {
               case 0:
@@ -402,7 +402,7 @@ void menuModelSensor(uint8_t event)
           if (sensor->unit == UNIT_RPMS) {
             lcd_putsLeft(y, NO_INDENT(STR_BLADES));
             if (attr) CHECK_INCDEC_MODELVAR(event, sensor->custom.ratio, 1, 30000);
-            lcd_outdezAtt(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr);
+            lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr);
             break;
           }
           else {
@@ -411,7 +411,7 @@ void menuModelSensor(uint8_t event)
             if (sensor->custom.ratio == 0)
               lcdDrawChar(SENSOR_2ND_COLUMN, y, '-', attr);
             else
-              lcd_outdezAtt(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr|PREC1);
+              lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr|PREC1);
             break;
           }
         }
@@ -436,7 +436,7 @@ void menuModelSensor(uint8_t event)
           lcd_putsLeft(y, NO_INDENT(STR_OFFSET));
           if (attr) CHECK_INCDEC_MODELVAR(event, sensor->custom.offset, -30000, +30000);
           if (sensor->prec > 0) attr |= (sensor->prec == 2 ? PREC2 : PREC1);
-          lcd_outdezAtt(SENSOR_2ND_COLUMN, y, sensor->custom.offset, LEFT|attr);
+          lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.offset, LEFT|attr);
           break;
         }
         // no break
@@ -568,19 +568,19 @@ void menuModelTelemetry(uint8_t event)
 #if defined(CPUARM)
     if (k>=ITEM_TELEMETRY_SENSOR1 && k<ITEM_TELEMETRY_SENSOR1+MAX_SENSORS) {
       int index = k-ITEM_TELEMETRY_SENSOR1;
-      lcd_outdezAtt(INDENT_WIDTH, y, index+1, LEFT|attr);
+      lcdDrawNumber(INDENT_WIDTH, y, index+1, LEFT|attr);
       lcdDrawChar(lcdLastPos, y, ':', attr);
-      lcdDrawTextWithLen(3*FW, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR);
+      lcdDrawSizedText(3*FW, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR);
       if (telemetryItems[index].isFresh()) {
-        lcd_putc(16*FW, y, '*');
+        lcdDrawChar(16*FW, y, '*');
       }
       TelemetryItem & telemetryItem = telemetryItems[index];
       if (telemetryItem.isAvailable()) {
         bool isOld = telemetryItem.isOld();
         lcdNextPos = TELEM_COL2;
-        if (isOld) lcd_putc(lcdNextPos, y, '[');
+        if (isOld) lcdDrawChar(lcdNextPos, y, '[');
         putsTelemetryChannelValue(lcdNextPos, y, index, getValue(MIXSRC_FIRST_TELEM+3*index), LEFT);
-        if (isOld) lcd_putc(lcdLastPos, y, ']');
+        if (isOld) lcdDrawChar(lcdLastPos, y, ']');
       }
       else {
         lcdDrawText(TELEM_COL2, y, "---", 0); // TODO shortcut
@@ -656,7 +656,7 @@ void menuModelTelemetry(uint8_t event)
       case ITEM_TELEMETRY_A1_LABEL:
       case ITEM_TELEMETRY_A2_LABEL:
         lcd_putsLeft(y, STR_ACHANNEL);
-        lcd_outdezAtt(2*FW, y, ch+1, 0);
+        lcdDrawNumber(2*FW, y, ch+1, 0);
         putsTelemetryChannelValue(TELEM_COL2+6*FW, y, dest, frskyData.analog[ch].value, LEFT);
         break;
 
@@ -736,8 +736,8 @@ void menuModelTelemetry(uint8_t event)
         uint8_t alarm = k-ITEM_TELEMETRY_RSSI_ALARM1;
         lcd_putsLeft(y, STR_ALARM);
         lcdDrawTextAtIndex(TELEM_COL2, y, STR_VALARM, ((2+alarm+g_model.frsky.rssiAlarms[alarm].level)%4), m_posHorz<=0 ? attr : 0);
-        lcd_putc(TELEM_COL2+4*FW, y, '<');
-        lcd_outdezNAtt(TELEM_COL2+6*FW, y, getRssiAlarmValue(alarm), LEFT|(m_posHorz!=0 ? attr : 0), 3);
+        lcdDrawChar(TELEM_COL2+4*FW, y, '<');
+        lcdDrawNumber(TELEM_COL2+6*FW, y, getRssiAlarmValue(alarm), LEFT|(m_posHorz!=0 ? attr : 0), 3);
 
         if (attr && (s_editMode>0 || p1valdiff)) {
           switch (m_posHorz) {
@@ -766,7 +766,7 @@ void menuModelTelemetry(uint8_t event)
 
       case ITEM_TELEMETRY_USR_BLADES:
         lcd_putsLeft(y, STR_BLADES);
-        lcd_outdezAtt(TELEM_COL2+FWNUM, y, 2+g_model.frsky.blades, attr);
+        lcdDrawNumber(TELEM_COL2+FWNUM, y, 2+g_model.frsky.blades, attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.frsky.blades, MAX_BLADES);
         break;
 #endif
@@ -786,9 +786,9 @@ void menuModelTelemetry(uint8_t event)
 #if defined(FAS_OFFSET) || !defined(CPUM64)
       case ITEM_TELEMETRY_FAS_OFFSET:
         lcd_putsLeft(y, STR_FAS_OFFSET);
-        lcd_outdezAtt(TELEM_COL2, y, g_model.frsky.fasOffset, attr|LEFT|PREC1);
-        lcd_outdezAtt(TELEM_COL2+6*FW, y, frskyData.hub.current, LEFT|PREC1);
-        lcd_putc(TELEM_COL2+8*FW, y, 'A');
+        lcdDrawNumber(TELEM_COL2, y, g_model.frsky.fasOffset, attr|LEFT|PREC1);
+        lcdDrawNumber(TELEM_COL2+6*FW, y, frskyData.hub.current, LEFT|PREC1);
+        lcdDrawChar(TELEM_COL2+8*FW, y, 'A');
         if (attr) g_model.frsky.fasOffset = checkIncDec(event, g_model.frsky.fasOffset, -120, 120, EE_MODEL);
         break;
 #endif
@@ -815,8 +815,8 @@ void menuModelTelemetry(uint8_t event)
       case ITEM_TELEMETRY_VARIO_RANGE:
         lcd_putsLeft(y, STR_LIMIT);
 #if defined(PCBSTD)
-        lcd_outdezAtt(TELEM_COL2, y, 5+g_model.frsky.varioCenterMax, (m_posHorz==0 ? attr : 0)|PREC1|LEFT);
-        lcd_outdezAtt(TELEM_COL2+8*FW, y, 10+g_model.frsky.varioMax, (m_posHorz==1 ? attr : 0));
+        lcdDrawNumber(TELEM_COL2, y, 5+g_model.frsky.varioCenterMax, (m_posHorz==0 ? attr : 0)|PREC1|LEFT);
+        lcdDrawNumber(TELEM_COL2+8*FW, y, 10+g_model.frsky.varioMax, (m_posHorz==1 ? attr : 0));
         if (attr && (s_editMode>0 || p1valdiff)) {
           switch (m_posHorz) {
             case 0:
@@ -828,10 +828,10 @@ void menuModelTelemetry(uint8_t event)
           }
         }
 #else
-        lcd_outdezAtt(TELEM_COL2, y, -10+g_model.frsky.varioMin, (m_posHorz<=0 ? attr : 0)|LEFT);
-        lcd_outdezAtt(TELEM_COL2+7*FW-2, y, -5+g_model.frsky.varioCenterMin, ((CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0)|PREC1);
-        lcd_outdezAtt(TELEM_COL2+10*FW, y, 5+g_model.frsky.varioCenterMax, ((CURSOR_ON_LINE() || m_posHorz==2) ? attr : 0)|PREC1);
-        lcd_outdezAtt(TELEM_COL2+13*FW+2, y, 10+g_model.frsky.varioMax, ((CURSOR_ON_LINE() || m_posHorz==3) ? attr : 0));
+        lcdDrawNumber(TELEM_COL2, y, -10+g_model.frsky.varioMin, (m_posHorz<=0 ? attr : 0)|LEFT);
+        lcdDrawNumber(TELEM_COL2+7*FW-2, y, -5+g_model.frsky.varioCenterMin, ((CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0)|PREC1);
+        lcdDrawNumber(TELEM_COL2+10*FW, y, 5+g_model.frsky.varioCenterMax, ((CURSOR_ON_LINE() || m_posHorz==2) ? attr : 0)|PREC1);
+        lcdDrawNumber(TELEM_COL2+13*FW+2, y, 10+g_model.frsky.varioMax, ((CURSOR_ON_LINE() || m_posHorz==3) ? attr : 0));
         if (attr && (s_editMode>0 || p1valdiff)) {
           switch (m_posHorz) {
             case 0:
diff --git a/radio/src/gui/9X/menu_model_templates.cpp b/radio/src/gui/9X/menu_model_templates.cpp
index c150b52d7..c44303b02 100644
--- a/radio/src/gui/9X/menu_model_templates.cpp
+++ b/radio/src/gui/9X/menu_model_templates.cpp
@@ -58,7 +58,7 @@ void menuModelTemplates(uint8_t event)
   uint8_t k = 0;
   for (uint8_t i=0; i<LCD_LINES-1 && k<TMPL_COUNT; i++) {
     k = i+s_pgOfs;
-    lcd_outdezNAtt(3*FW, y, k, (sub==k ? INVERS : 0)|LEADING0, 2);
+    lcdDrawNumber(3*FW, y, k, (sub==k ? INVERS : 0)|LEADING0, 2);
     lcdDrawTextAtIndex(4*FW, y, STR_VTEMPLATES, k, (sub==k ? INVERS  : 0));
     y+=FH;
   }
diff --git a/radio/src/gui/9X/menus.h b/radio/src/gui/9X/menus.h
index bb8ddd4b9..d85ffd622 100644
--- a/radio/src/gui/9X/menus.h
+++ b/radio/src/gui/9X/menus.h
@@ -114,9 +114,9 @@ void menuTraceBuffer(uint8_t event);
   void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr);
 #elif defined(GRAPHICS)
   void display5posSlider(coord_t x, coord_t y, uint8_t value, uint8_t attr);
-  #define drawSlider(x, y, value, max, attr) lcd_outdezAtt(x, y, value, attr|LEFT)
+  #define drawSlider(x, y, value, max, attr) lcdDrawNumber(x, y, value, attr|LEFT)
 #else
-  #define drawSlider(x, y, value, max, attr) lcd_outdezAtt(x, y, value, attr|LEFT)
+  #define drawSlider(x, y, value, max, attr) lcdDrawNumber(x, y, value, attr|LEFT)
 #endif
 
 #if defined(NAVIGATION_POT1)
@@ -327,7 +327,7 @@ int8_t switchMenuItem(coord_t x, coord_t y, int8_t value, LcdFlags attr, uint8_t
   #define displayGVar(x, y, v, min, max) GVAR_MENU_ITEM(x, y, v, min, max, 0, 0, 0)
 #else
   int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event);
-  #define displayGVar(x, y, v, min, max) lcd_outdez8(x, y, v)
+  #define displayGVar(x, y, v, min, max) lcdDraw8bitsNumber(x, y, v)
 #endif
 
 void editName(coord_t x, coord_t y, char *name, uint8_t size, uint8_t event, uint8_t active);
diff --git a/radio/src/gui/9X/popups.cpp b/radio/src/gui/9X/popups.cpp
index 202d54808..82060532e 100644
--- a/radio/src/gui/9X/popups.cpp
+++ b/radio/src/gui/9X/popups.cpp
@@ -54,9 +54,9 @@ void displayBox()
   lcdDrawFilledRect(10, 16, LCD_W-20, 40, SOLID, ERASE);
   lcdDrawRect(10, 16, LCD_W-20, 40);
 #if defined(CPUARM)
-  lcd_putsn(WARNING_LINE_X, WARNING_LINE_Y, s_warning, WARNING_LINE_LEN);
+  lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, s_warning, WARNING_LINE_LEN);
 #else
-  lcd_puts(WARNING_LINE_X, WARNING_LINE_Y, s_warning);
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y, s_warning);
 #endif
   // could be a place for a s_warning_info
 }
@@ -103,9 +103,9 @@ void displayWarning(uint8_t event)
   s_warning_result = false;
   displayBox();
   if (s_warning_info) {
-    lcdDrawTextWithLen(WARNING_LINE_X, WARNING_LINE_Y+FH, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS);
+    lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS);
   }
-  lcd_puts(WARNING_LINE_X, WARNING_LINE_Y+2*FH, s_warning_type == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS);
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, s_warning_type == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS);
   switch (event) {
 #if defined(ROTARY_ENCODER_NAVIGATION)
     case EVT_ROTARY_BREAK:
diff --git a/radio/src/gui/9X/splash.cpp b/radio/src/gui/9X/splash.cpp
index 21d30a366..2c2000031 100644
--- a/radio/src/gui/9X/splash.cpp
+++ b/radio/src/gui/9X/splash.cpp
@@ -51,7 +51,7 @@ void displaySplash()
 #if MENUS_LOCK == 1
   if (readonly == false) {
     lcdDrawFilledRect((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 - 9, 50, (sizeof(TR_UNLOCKED)-1)*FW+16, 11, SOLID, ERASE|ROUND);
-    lcd_puts((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 , 53, STR_UNLOCKED);
+    lcdDrawText((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 , 53, STR_UNLOCKED);
   }
 #endif
 
diff --git a/radio/src/gui/9X/view_main.cpp b/radio/src/gui/9X/view_main.cpp
index 676adfff6..a821f8daa 100644
--- a/radio/src/gui/9X/view_main.cpp
+++ b/radio/src/gui/9X/view_main.cpp
@@ -138,7 +138,7 @@ void displayTrims(uint8_t phase)
 #if defined(CPUARM)
       if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && dir != 0) {
         if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || (trimsDisplayTimer > 0 && (trimsDisplayMask & (1<<i)))) {
-          lcd_outdezAtt(dir>0 ? 22 : 54, xm-2, -abs(dir/5), TINSIZE|VERTICAL);
+          lcdDrawNumber(dir>0 ? 22 : 54, xm-2, -abs(dir/5), TINSIZE|VERTICAL);
         }
       }
 #endif
@@ -164,7 +164,7 @@ void displayTrims(uint8_t phase)
 #if defined(CPUARM)
       if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && dir != 0) {
         if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || (trimsDisplayTimer > 0 && (trimsDisplayMask & (1<<i)))) {
-          lcd_outdezAtt((stickIndex==0 ? TRIM_LH_X : TRIM_RH_X)+(dir>0 ? -11 : 20), ym-2, -abs(dir/5), TINSIZE);
+          lcdDrawNumber((stickIndex==0 ? TRIM_LH_X : TRIM_RH_X)+(dir>0 ? -11 : 20), ym-2, -abs(dir/5), TINSIZE);
         }
       }
 #endif
@@ -191,7 +191,7 @@ void displayTimers()
     uint8_t len = zlen(g_model.timers[0].name, LEN_TIMER_NAME);
     if (len > 0) {
       xLabel += (LEN_TIMER_NAME-len)*FW;
-      lcdDrawTextWithLen(xLabel, FH*3, g_model.timers[0].name, len, ZCHAR);
+      lcdDrawSizedText(xLabel, FH*3, g_model.timers[0].name, len, ZCHAR);
     }
     else {
       putsTimerMode(xLabel, FH*3, g_model.timers[0].mode);
@@ -216,7 +216,7 @@ void displayBattVoltage()
 #else
   LcdFlags att = (IS_TXBATT_WARNING() ? BLINK|INVERS : 0) | BIGSIZE;
   putsVBat(VBATT_X-1, VBATT_Y, att|NO_UNIT);
-  lcd_putc(VBATT_X, VBATTUNIT_Y, 'V');
+  lcdDrawChar(VBATT_X, VBATTUNIT_Y, 'V');
 #endif
 }
 
@@ -434,7 +434,7 @@ void menuMainView(uint8_t event)
   {
     // Flight Mode Name
     uint8_t mode = mixerCurrentFlightMode;
-    lcdDrawTextWithLen(PHASE_X, PHASE_Y, g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|PHASE_FLAGS);
+    lcdDrawSizedText(PHASE_X, PHASE_Y, g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|PHASE_FLAGS);
 
     // Model Name
     putsModelName(MODELNAME_X, MODELNAME_Y, g_model.header.name, g_eeGeneral.currModel, BIGSIZE);
@@ -474,11 +474,11 @@ void menuMainView(uint8_t event)
           x0 = (i%4*9+3)*FW/2;
           y0 = i/4*FH+40;
 #if defined(PPM_UNIT_US)
-          lcd_outdezAtt(x0+4*FW , y0, PPM_CH_CENTER(chan)+val/2, 0);
+          lcdDrawNumber(x0+4*FW , y0, PPM_CH_CENTER(chan)+val/2, 0);
 #elif defined(PPM_UNIT_PERCENT_PREC1)
-          lcd_outdezAtt(x0+4*FW , y0, calcRESXto1000(val), PREC1);
+          lcdDrawNumber(x0+4*FW , y0, calcRESXto1000(val), PREC1);
 #else
-          lcd_outdezAtt(x0+4*FW , y0, calcRESXto1000(val)/10, 0); // G: Don't like the decimal part*
+          lcdDrawNumber(x0+4*FW , y0, calcRESXto1000(val)/10, 0); // G: Don't like the decimal part*
 #endif
           break;
 
@@ -562,7 +562,7 @@ void menuMainView(uint8_t event)
 #endif
     putsTimer(33+FW+2+10*FWNUM-4, FH*5, timersStates[1].val, DBLSIZE, DBLSIZE);
     putsTimerMode(timersStates[1].val >= 0 ? TMR2_LBL_COL : TMR2_LBL_COL-7, FH*6, g_model.timers[1].mode);
-    // lcd_outdezNAtt(33+11*FW, FH*6, s_timerVal_10ms[1], LEADING0, 2); // 1/100s
+    // lcdDrawNumber(33+11*FW, FH*6, s_timerVal_10ms[1], LEADING0, 2); // 1/100s
   }
 
   // And ! in case of unexpected shutdown
@@ -575,9 +575,9 @@ void menuMainView(uint8_t event)
     s_gvar_timer--;
     s_warning = STR_GLOBAL_VAR;
     displayBox();
-    lcdDrawTextWithLen(16, 5*FH, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR);
+    lcdDrawSizedText(16, 5*FH, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR);
     lcdDrawText(16+7*FW, 5*FH, PSTR("[\010]"), BOLD);
-    lcd_outdezAtt(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD);
+    lcdDrawNumber(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD);
     s_warning = NULL;
   }
 #endif
diff --git a/radio/src/gui/9X/view_mavlink.cpp b/radio/src/gui/9X/view_mavlink.cpp
index 935690c03..afe84c578 100644
--- a/radio/src/gui/9X/view_mavlink.cpp
+++ b/radio/src/gui/9X/view_mavlink.cpp
@@ -199,9 +199,9 @@ void print_mav_mode(uint8_t x, uint8_t y, uint32_t custom_mode, uint8_t attr) //
 void mav_title(const pm_char * s, uint8_t index)
 {
   lcdDrawText(0, 0, PSTR("MAVLINK"), INVERS);
-  lcd_puts(10 * FW, 0, s);
+  lcdDrawText(10 * FW, 0, s);
   displayScreenIndex(index, MAX_MAVLINK_MENU, INVERS);
-  lcd_putc(7 * FW, 0, (mav_heartbeat > 0) ? '*' : ' ');
+  lcdDrawChar(7 * FW, 0, (mav_heartbeat > 0) ? '*' : ' ');
   if (telemetry_data.active)
   	  lcdDrawChar(8 * FW, 0, 'A', BLINK);
 }
@@ -225,9 +225,9 @@ void menuTelemetryMavlinkInfos(void) {
 	char * ptr = mav_statustext;
 	for (uint8_t j = 0; j < LEN_STATUSTEXT; j++) {
 		if (*ptr == 0) {
-			lcd_putc(x1, y, ' ');
+			lcdDrawChar(x1, y, ' ');
 		} else {
-			lcd_putc(x1, y, *ptr++);
+			lcdDrawChar(x1, y, *ptr++);
 		}
 		x1 += FW;
 	}
@@ -236,33 +236,33 @@ void menuTelemetryMavlinkInfos(void) {
 */
 	if (telemetry_data.status) {
 
-		lcdDrawTextWithLen(x1, y, STR_MAVLINK_MODE, 4, 0);
+		lcdDrawSizedText(x1, y, STR_MAVLINK_MODE, 4, 0);
 		if (telemetry_data.active)
-			lcdDrawTextWithLen(x2, y, PSTR("A"), 1, 0);
-		lcd_outdezAtt(xnum, y, telemetry_data.mode, 0);
+			lcdDrawSizedText(x2, y, PSTR("A"), 1, 0);
+		lcdDrawNumber(xnum, y, telemetry_data.mode, 0);
 
 		y += FH;
-		lcd_puts(x1, y, PSTR("BATT"));
-		lcd_outdezNAtt(xnum, y, telemetry_data.vbat, PREC1, 5);
+		lcdDrawText(x1, y, PSTR("BATT"));
+		lcdDrawNumber(xnum, y, telemetry_data.vbat, PREC1, 5);
 
 		y += FH;
-		lcd_puts(x1, y, PSTR("DROP"));
-		lcd_outdezAtt(xnum, y, telemetry_data.packet_drop, 0);
+		lcdDrawText(x1, y, PSTR("DROP"));
+		lcdDrawNumber(xnum, y, telemetry_data.packet_drop, 0);
 /*		y += FH;
-		lcd_puts(x1, y, PSTR("FIX"));
-		lcd_outdezAtt(xnum, y, telemetry_data.packet_fixed, 0);
+		lcdDrawText(x1, y, PSTR("FIX"));
+		lcdDrawNumber(xnum, y, telemetry_data.packet_fixed, 0);
 		y += FH;
-		lcd_puts(x1, y, PSTR("MAV Comp"));
-		lcd_outdezAtt(xnum, y, telemetry_data.mav_compid, 0);
+		lcdDrawText(x1, y, PSTR("MAV Comp"));
+		lcdDrawNumber(xnum, y, telemetry_data.mav_compid, 0);
 		y += FH;
-		lcd_puts(x1, y, PSTR("MAV Sys"));
-		lcd_outdezAtt(xnum, y, telemetry_data.mav_sysid, 0);
+		lcdDrawText(x1, y, PSTR("MAV Sys"));
+		lcdDrawNumber(xnum, y, telemetry_data.mav_sysid, 0);
 		y += FH;
-		lcd_puts(x1, y, PSTR("Rad Comp"));
-		lcd_outdezAtt(xnum, y, telemetry_data.radio_compid, 0);
+		lcdDrawText(x1, y, PSTR("Rad Comp"));
+		lcdDrawNumber(xnum, y, telemetry_data.radio_compid, 0);
 		y += FH;
-		lcd_puts(x1, y, PSTR("Rad Sys"));
-		lcd_outdezAtt(xnum, y, telemetry_data.radio_sysid, 0);
+		lcdDrawText(x1, y, PSTR("Rad Sys"));
+		lcdDrawNumber(xnum, y, telemetry_data.radio_sysid, 0);
 */
 		
 	}
@@ -280,7 +280,7 @@ void menuTelemetryMavlinkFlightMode(void) {
 	x = 0;
 	y = FH;
 	
-    lcd_puts  (x, y, STR_MAVLINK_CUR_MODE);
+    lcdDrawText(x, y, STR_MAVLINK_CUR_MODE);
     y += FH;
     print_mav_mode(FW, y, telemetry_data.custom_mode, DBLSIZE);
     y += 2 * FH;
@@ -288,9 +288,9 @@ void menuTelemetryMavlinkFlightMode(void) {
 	char * ptr = mav_statustext;
 	for (uint8_t j = 0; j < LEN_STATUSTEXT; j++) {
 		if (*ptr == 0) {
-			lcd_putc(x, y, ' ');
+			lcdDrawChar(x, y, ' ');
 		} else {
-			lcd_putc(x, y, *ptr++);
+			lcdDrawChar(x, y, *ptr++);
 		}
 		x += FW;
 	}
@@ -315,29 +315,29 @@ void menuTelemetryMavlinkBattery(void) {
 	ynum = 2 * FH;
 	y = 3 * FH;
 	
-    lcd_puts(0, 1*FH, STR_MAVLINK_BATTERY_LABEL); 
+    lcdDrawText(0, 1*FH, STR_MAVLINK_BATTERY_LABEL); 
 	
-	lcd_outdezAtt(x, ynum, telemetry_data.vbat, (DBLSIZE | PREC1 | UNSIGN));
-	lcd_puts(x, y, PSTR("V"));
+	lcdDrawNumber(x, ynum, telemetry_data.vbat, (DBLSIZE | PREC1 | UNSIGN));
+	lcdDrawText(x, y, PSTR("V"));
 	x += 4 * (2 * FWNUM);
-	lcd_outdezAtt(x, ynum, telemetry_data.ibat, (DBLSIZE | PREC1 | UNSIGN));
-	lcd_puts(x, y, PSTR("A"));
+	lcdDrawNumber(x, ynum, telemetry_data.ibat, (DBLSIZE | PREC1 | UNSIGN));
+	lcdDrawText(x, y, PSTR("A"));
 	x += 4 * (2 * FWNUM);
-	lcd_outdezAtt(x, ynum, telemetry_data.rem_bat, (DBLSIZE | UNSIGN));
-	lcd_puts(x, y, PSTR("%"));
+	lcdDrawNumber(x, ynum, telemetry_data.rem_bat, (DBLSIZE | UNSIGN));
+	lcdDrawText(x, y, PSTR("%"));
 	y += FH;
 	ynum += 3 * FH;
 	
 	x = 0;	
-    lcd_puts  (x, y, STR_MAVLINK_RC_RSSI_LABEL);
-	lcd_outdezAtt(x + 7 * FWNUM, ynum, telemetry_data.rc_rssi, (DBLSIZE | UNSIGN));
-	lcd_puts(x + 7 * FWNUM, ynum + FH, PSTR("%"));
+    lcdDrawText(x, y, STR_MAVLINK_RC_RSSI_LABEL);
+	lcdDrawNumber(x + 7 * FWNUM, ynum, telemetry_data.rc_rssi, (DBLSIZE | UNSIGN));
+	lcdDrawText(x + 7 * FWNUM, ynum + FH, PSTR("%"));
 	if (g_model.mavlink.pc_rssi_en)
 	{
 		x += 8 * (2 * FWNUM);
-		lcd_puts(x, y, STR_MAVLINK_PC_RSSI_LABEL);
-		lcd_outdezAtt(x + 7 * FWNUM, ynum, telemetry_data.pc_rssi, (DBLSIZE));
-		lcd_puts(x + 7 * FWNUM, ynum + FH,  PSTR("%"));
+		lcdDrawText(x, y, STR_MAVLINK_PC_RSSI_LABEL);
+		lcdDrawNumber(x + 7 * FWNUM, ynum, telemetry_data.pc_rssi, (DBLSIZE));
+		lcdDrawText(x + 7 * FWNUM, ynum + FH,  PSTR("%"));
 	}
     
 }
@@ -360,24 +360,24 @@ void menuTelemetryMavlinkNavigation(void) {
 	
     
 	x = 0;	
-    lcd_puts  (x, y, STR_MAVLINK_COURSE);
-	lcd_outdezAtt(x + 7 * FWNUM, ynum, telemetry_data.course, (DBLSIZE | UNSIGN));
-	lcd_puts(x + 7 * FWNUM, ynum, PSTR("o"));
+    lcdDrawText(x, y, STR_MAVLINK_COURSE);
+	lcdDrawNumber(x + 7 * FWNUM, ynum, telemetry_data.course, (DBLSIZE | UNSIGN));
+	lcdDrawText(x + 7 * FWNUM, ynum, PSTR("o"));
 	x += 8 * (2 * FWNUM);
-    lcd_puts(x, y, STR_MAVLINK_HEADING);
-	lcd_outdezAtt(x + 7 * FWNUM, ynum, telemetry_data.heading, (DBLSIZE | UNSIGN));
-	lcd_puts(x + 7 * FWNUM, ynum,  PSTR("o"));
+    lcdDrawText(x, y, STR_MAVLINK_HEADING);
+	lcdDrawNumber(x + 7 * FWNUM, ynum, telemetry_data.heading, (DBLSIZE | UNSIGN));
+	lcdDrawText(x + 7 * FWNUM, ynum,  PSTR("o"));
 	y += 3 * FH;
 	ynum += 3 * FH;
 	
 	x = 0;	
-    lcd_puts  (x, y, STR_MAVLINK_BEARING);
-	lcd_outdezAtt(x + 7 * FWNUM, ynum, telemetry_data.bearing, (DBLSIZE | UNSIGN));
-	lcd_puts(x + 7 * FWNUM, ynum, PSTR("o"));
+    lcdDrawText(x, y, STR_MAVLINK_BEARING);
+	lcdDrawNumber(x + 7 * FWNUM, ynum, telemetry_data.bearing, (DBLSIZE | UNSIGN));
+	lcdDrawText(x + 7 * FWNUM, ynum, PSTR("o"));
 	x += 8 * (2 * FWNUM);
-    lcd_puts(x, y, STR_MAVLINK_ALTITUDE);
+    lcdDrawText(x, y, STR_MAVLINK_ALTITUDE);
 	lcd_outdezFloat(x + 4 * FWNUM - 1, ynum, telemetry_data.loc_current.rel_alt, 1, (DBLSIZE));
-	lcd_puts(x + 7 * FWNUM, ynum + FH,  PSTR("m"));
+	lcdDrawText(x + 7 * FWNUM, ynum + FH,  PSTR("m"));
  
 }
 
@@ -400,39 +400,39 @@ void menuTelemetryMavlinkGPS(void) {
 	xnum2 = xnum + 11 * FWNUM;
 	y = FH;
 
-	lcdDrawTextWithLen(x1, y, STR_MAVLINK_GPS, 3, 0);
+	lcdDrawSizedText(x1, y, STR_MAVLINK_GPS, 3, 0);
 	if (telemetry_data.fix_type < 2) {
-		lcdDrawTextWithLen(xnum, y, STR_MAVLINK_NO_FIX, 6, 0);
+		lcdDrawSizedText(xnum, y, STR_MAVLINK_NO_FIX, 6, 0);
 	} else {
-		lcd_outdezNAtt(xnum, y, telemetry_data.fix_type, 0, 3);
-		lcd_puts(xnum, y, PSTR("D"));
+		lcdDrawNumber(xnum, y, telemetry_data.fix_type, 0, 3);
+		lcdDrawText(xnum, y, PSTR("D"));
 	}
-	lcd_puts(x2, y, STR_MAVLINK_SAT);
-	lcd_outdezNAtt(xnum2, y, telemetry_data.satellites_visible, 0, 2);
+	lcdDrawText(x2, y, STR_MAVLINK_SAT);
+	lcdDrawNumber(xnum2, y, telemetry_data.satellites_visible, 0, 2);
 
 //	if (telemetry_data.fix_type > 0) {
 	y += FH;
-	lcd_puts(x1, y, STR_MAVLINK_HDOP);
+	lcdDrawText(x1, y, STR_MAVLINK_HDOP);
 	lcd_outdezFloat(xnum, y, telemetry_data.eph, 2);
 
 	y += FH;
-	lcd_puts(x1, y, STR_MAVLINK_LAT);
+	lcdDrawText(x1, y, STR_MAVLINK_LAT);
 	lcd_outdezFloat(xnum, y, telemetry_data.loc_current.lat, 2);
 
-	lcdDrawTextWithLen(x2, y, STR_MAVLINK_LON, 3, 0);
+	lcdDrawSizedText(x2, y, STR_MAVLINK_LON, 3, 0);
 	lcd_outdezFloat(xnum2, y, telemetry_data.loc_current.lon, 2);
 
 	y += FH;
-	lcdDrawTextWithLen(x1, y, STR_MAVLINK_ALTITUDE, 3, 0);
-	lcd_outdezAtt(xnum, y, telemetry_data.loc_current.gps_alt, 0);
+	lcdDrawSizedText(x1, y, STR_MAVLINK_ALTITUDE, 3, 0);
+	lcdDrawNumber(xnum, y, telemetry_data.loc_current.gps_alt, 0);
 
 	y += FH;
-	lcdDrawTextWithLen(x1, y, STR_MAVLINK_COURSE, 6, 0);
+	lcdDrawSizedText(x1, y, STR_MAVLINK_COURSE, 6, 0);
 	lcd_outdezFloat(xnum, y, telemetry_data.course, 2);
 
 	y += FH;
-	lcdDrawTextWithLen(x1, y, PSTR("V"), 1, 0);
-	lcd_outdezAtt(xnum, y, telemetry_data.v, 0);
+	lcdDrawSizedText(x1, y, PSTR("V"), 1, 0);
+	lcdDrawNumber(xnum, y, telemetry_data.v, 0);
 	//}
 }
 
@@ -512,8 +512,8 @@ void menuTelemetryMavlinkSetup(uint8_t event) {
 		switch(k) {	
 		case ITEM_MAVLINK_RC_RSSI_SCALE:
 			lcd_putsLeft(y, STR_MAVLINK_RC_RSSI_SCALE_LABEL);
-			lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, (25 + g_model.mavlink.rc_rssi_scale * 5), attr|LEFT);
-			lcd_putc(lcdLastPos, y, '%');
+			lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, (25 + g_model.mavlink.rc_rssi_scale * 5), attr|LEFT);
+			lcdDrawChar(lcdLastPos, y, '%');
 			if (attr) CHECK_INCDEC_MODELVAR(event, g_model.mavlink.rc_rssi_scale, 0, 15);
 			break;
 		case ITEM_MAVLINK_PC_RSSI_EN:
diff --git a/radio/src/gui/9X/view_statistics.cpp b/radio/src/gui/9X/view_statistics.cpp
index 4ea6dd3a1..e937aa28b 100644
--- a/radio/src/gui/9X/view_statistics.cpp
+++ b/radio/src/gui/9X/view_statistics.cpp
@@ -59,7 +59,7 @@ void menuStatisticsView(uint8_t event)
       break;
   }
 
-  lcd_puts(  1*FW, FH*0, STR_TOTTM1TM2THRTHP);
+  lcdDrawText(  1*FW, FH*0, STR_TOTTM1TM2THRTHP);
   putsTimer(    5*FW+5*FWNUM+1, FH*1, timersStates[0].val, 0, 0);
   putsTimer(   12*FW+5*FWNUM+1, FH*1, timersStates[1].val, 0, 0);
 
@@ -144,10 +144,10 @@ void menuStatisticsDebug(uint8_t event)
 
 #if defined(PCBSKY9X)
   if ((ResetReason&RSTC_SR_RSTTYP) == (2<<8)) {
-    lcd_puts(LCD_W-8*FW, 0*FH, "WATCHDOG");
+    lcdDrawText(LCD_W-8*FW, 0*FH, "WATCHDOG");
   }
   else if (unexpectedShutdown) {
-    lcd_puts(LCD_W-13*FW, 0*FH, "UNEXP.SHTDOWN");
+    lcdDrawText(LCD_W-13*FW, 0*FH, "UNEXP.SHTDOWN");
   }
 #endif
 
@@ -156,7 +156,7 @@ void menuStatisticsDebug(uint8_t event)
   lcd_putsLeft(MENU_DEBUG_Y_CURRENT, STR_CPU_CURRENT);
   putsValueWithUnit(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_CURRENT, getCurrent(), UNIT_MILLIAMPS, LEFT);
   uint32_t current_scale = 488 + g_eeGeneral.txCurrentCalibration;
-  lcd_putc(MENU_DEBUG_COL2_OFS, MENU_DEBUG_Y_CURRENT, '>');
+  lcdDrawChar(MENU_DEBUG_COL2_OFS, MENU_DEBUG_Y_CURRENT, '>');
   putsValueWithUnit(MENU_DEBUG_COL2_OFS+FW+1, MENU_DEBUG_Y_CURRENT, Current_max*10*current_scale/8192, UNIT_RAW, LEFT);
   // consumption
   lcd_putsLeft(MENU_DEBUG_Y_MAH, STR_CPU_MAH);
@@ -166,7 +166,7 @@ void menuStatisticsDebug(uint8_t event)
 #if defined(PCBSKY9X)
   lcd_putsLeft(MENU_DEBUG_Y_CPU_TEMP, STR_CPU_TEMP);
   putsValueWithUnit(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_CPU_TEMP, getTemperature(), UNIT_TEMPERATURE, LEFT);
-  lcd_putc(MENU_DEBUG_COL2_OFS, MENU_DEBUG_Y_CPU_TEMP, '>');
+  lcdDrawChar(MENU_DEBUG_COL2_OFS, MENU_DEBUG_Y_CPU_TEMP, '>');
   putsValueWithUnit(MENU_DEBUG_COL2_OFS+FW+1, MENU_DEBUG_Y_CPU_TEMP, maxTemperature+g_eeGeneral.temperatureCalib, UNIT_TEMPERATURE, LEFT);
 #endif
 
@@ -190,32 +190,32 @@ void menuStatisticsDebug(uint8_t event)
 
 #if defined(CPUARM)
   lcd_putsLeft(MENU_DEBUG_Y_MIXMAX, STR_TMIXMAXMS);
-  lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_MIXMAX, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT);
-  lcd_puts(lcdLastPos, MENU_DEBUG_Y_MIXMAX, "ms");
+  lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_MIXMAX, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT);
+  lcdDrawText(lcdLastPos, MENU_DEBUG_Y_MIXMAX, "ms");
 #endif
 
 #if defined(CPUARM)
   lcd_putsLeft(MENU_DEBUG_Y_RTOS, STR_FREESTACKMINB);
-  lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS+2, menusStack.available(), UNSIGN|LEFT|TINSIZE);
-  lcd_puts(lcdLastPos, MENU_DEBUG_Y_RTOS, "/");
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS+2, mixerStack.available(), UNSIGN|LEFT|TINSIZE);
-  lcd_puts(lcdLastPos, MENU_DEBUG_Y_RTOS, "/");
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS+2, audioStack.available(), UNSIGN|LEFT|TINSIZE);
+  lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS+2, menusStack.available(), UNSIGN|LEFT|TINSIZE);
+  lcdDrawText(lcdLastPos, MENU_DEBUG_Y_RTOS, "/");
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_RTOS+2, mixerStack.available(), UNSIGN|LEFT|TINSIZE);
+  lcdDrawText(lcdLastPos, MENU_DEBUG_Y_RTOS, "/");
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_RTOS+2, audioStack.available(), UNSIGN|LEFT|TINSIZE);
 #endif
 
 #if !defined(CPUARM)
   lcd_putsLeft(1*FH, STR_TMR1LATMAXUS);
-  lcd_outdez8(MENU_DEBUG_COL1_OFS , 1*FH, g_tmr1Latency_max/2 );
+  lcdDraw8bitsNumber(MENU_DEBUG_COL1_OFS , 1*FH, g_tmr1Latency_max/2 );
   lcd_putsLeft(2*FH, STR_TMR1LATMINUS);
-  lcd_outdez8(MENU_DEBUG_COL1_OFS , 2*FH, g_tmr1Latency_min/2 );
+  lcdDraw8bitsNumber(MENU_DEBUG_COL1_OFS , 2*FH, g_tmr1Latency_min/2 );
   lcd_putsLeft(3*FH, STR_TMR1JITTERUS);
-  lcd_outdez8(MENU_DEBUG_COL1_OFS , 3*FH, (g_tmr1Latency_max - g_tmr1Latency_min) /2 );
+  lcdDraw8bitsNumber(MENU_DEBUG_COL1_OFS , 3*FH, (g_tmr1Latency_max - g_tmr1Latency_min) /2 );
   lcd_putsLeft(4*FH, STR_TMIXMAXMS);
-  lcd_outdezAtt(MENU_DEBUG_COL1_OFS, 4*FH, DURATION_MS_PREC2(maxMixerDuration), PREC2);
+  lcdDrawNumber(MENU_DEBUG_COL1_OFS, 4*FH, DURATION_MS_PREC2(maxMixerDuration), PREC2);
   lcd_putsLeft(5*FH, STR_FREESTACKMINB);
-  lcd_outdezAtt(14*FW, 5*FH, stackAvailable(), UNSIGN) ;
+  lcdDrawNumber(14*FW, 5*FH, stackAvailable(), UNSIGN) ;
 #endif
 
-  lcd_puts(4*FW, 7*FH+1, STR_MENUTORESET);
+  lcdDrawText(4*FW, 7*FH+1, STR_MENUTORESET);
   lcdInvertLastLine();
 }
diff --git a/radio/src/gui/9X/view_telemetry.cpp b/radio/src/gui/9X/view_telemetry.cpp
index b8e100392..eab3a0859 100644
--- a/radio/src/gui/9X/view_telemetry.cpp
+++ b/radio/src/gui/9X/view_telemetry.cpp
@@ -55,12 +55,12 @@ void displayRssiLine()
     uint8_t rssi;
 #if !defined(CPUARM)
     rssi = min((uint8_t)99, frskyData.rssi[1].value);
-    lcd_putsLeft(STATUS_BAR_Y, STR_TX); lcd_outdezNAtt(4*FW+1, STATUS_BAR_Y, rssi, LEADING0, 2);
+    lcd_putsLeft(STATUS_BAR_Y, STR_TX); lcdDrawNumber(4*FW+1, STATUS_BAR_Y, rssi, LEADING0, 2);
     lcdDrawRect(BAR_LEFT+1, 57, 38, 7);
     lcdDrawFilledRect(BAR_LEFT+1, 58, 4*rssi/11, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
 #endif
     rssi = min((uint8_t)99, TELEMETRY_RSSI());
-    lcd_puts(104, STATUS_BAR_Y, STR_RX); lcd_outdezNAtt(105+4*FW, STATUS_BAR_Y, rssi, LEADING0, 2);
+    lcdDrawText(104, STATUS_BAR_Y, STR_RX); lcdDrawNumber(105+4*FW, STATUS_BAR_Y, rssi, LEADING0, 2);
     lcdDrawRect(65, 57, 38, 7);
     uint8_t v = 4*rssi/11;
     lcdDrawFilledRect(66+36-v, 58, v, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
@@ -75,11 +75,11 @@ void displayRssiLine()
 void displayGpsTime()
 {
   uint8_t att = (TELEMETRY_STREAMING() ? LEFT|LEADING0 : LEFT|LEADING0|BLINK);
-  lcd_outdezNAtt(CENTER_OFS+6*FW+7, STATUS_BAR_Y, frskyData.hub.hour, att, 2);
+  lcdDrawNumber(CENTER_OFS+6*FW+7, STATUS_BAR_Y, frskyData.hub.hour, att, 2);
   lcdDrawChar(CENTER_OFS+8*FW+4, STATUS_BAR_Y, ':', att);
-  lcd_outdezNAtt(CENTER_OFS+9*FW+2, STATUS_BAR_Y, frskyData.hub.min, att, 2);
+  lcdDrawNumber(CENTER_OFS+9*FW+2, STATUS_BAR_Y, frskyData.hub.min, att, 2);
   lcdDrawChar(CENTER_OFS+11*FW-1, STATUS_BAR_Y, ':', att);
-  lcd_outdezNAtt(CENTER_OFS+12*FW-3, STATUS_BAR_Y, frskyData.hub.sec, att, 2);
+  lcdDrawNumber(CENTER_OFS+12*FW-3, STATUS_BAR_Y, frskyData.hub.sec, att, 2);
   lcdInvertLastLine();
 }
 
@@ -87,30 +87,30 @@ void displayGpsCoord(uint8_t y, char direction, int16_t bp, int16_t ap)
 {
   if (frskyData.hub.gpsFix >= 0) {
     if (!direction) direction = '-';
-    lcd_outdezAtt(TELEM_2ND_COLUMN, y, bp / 100, LEFT); // ddd before '.'
-    lcd_putc(lcdLastPos, y, '@');
+    lcdDrawNumber(TELEM_2ND_COLUMN, y, bp / 100, LEFT); // ddd before '.'
+    lcdDrawChar(lcdLastPos, y, '@');
     uint8_t mn = bp % 100; // TODO div_t
     if (g_eeGeneral.gpsFormat == 0) {
-      lcd_putc(lcdLastPos+FWNUM, y, direction);
-      lcd_outdezNAtt(lcdLastPos+FW+FW+1, y, mn, LEFT|LEADING0, 2); // mm before '.'
+      lcdDrawChar(lcdLastPos+FWNUM, y, direction);
+      lcdDrawNumber(lcdLastPos+FW+FW+1, y, mn, LEFT|LEADING0, 2); // mm before '.'
       lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
       uint16_t ss = ap * 6;
-      lcd_outdezNAtt(lcdLastPos+3, y, ss / 1000, LEFT|LEADING0, 2); // ''
+      lcdDrawNumber(lcdLastPos+3, y, ss / 1000, LEFT|LEADING0, 2); // ''
       lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
-      lcd_outdezNAtt(lcdLastPos+2, y, ss % 1000, LEFT|LEADING0, 3); // ''
+      lcdDrawNumber(lcdLastPos+2, y, ss % 1000, LEFT|LEADING0, 3); // ''
       lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
       lcdDrawSolidVerticalLine(lcdLastPos+2, y, 2);
     }
     else {
-      lcd_outdezNAtt(lcdLastPos+FW, y, mn, LEFT|LEADING0, 2); // mm before '.'
+      lcdDrawNumber(lcdLastPos+FW, y, mn, LEFT|LEADING0, 2); // mm before '.'
       lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
-      lcd_outdezNAtt(lcdLastPos+2, y, ap, LEFT|UNSIGN|LEADING0, 4); // after '.'
-      lcd_putc(lcdLastPos+1, y, direction);
+      lcdDrawNumber(lcdLastPos+2, y, ap, LEFT|UNSIGN|LEADING0, 4); // after '.'
+      lcdDrawChar(lcdLastPos+1, y, direction);
     }
   }
   else {
     // no fix
-    lcd_puts(TELEM_2ND_COLUMN, y, STR_VCSWFUNC+1/*----*/);
+    lcdDrawText(TELEM_2ND_COLUMN, y, STR_VCSWFUNC+1/*----*/);
   }
 }
 #elif !defined(CPUARM)
@@ -129,8 +129,8 @@ void displayVoltageScreenLine(uint8_t y, uint8_t index)
   putsStrIdx(0, y, STR_A, index+1, 0);
   if (TELEMETRY_STREAMING()) {
     putsTelemetryChannelValue(3*FW+6*FW+4, y-FH, index+TELEM_A1-1, frskyData.analog[index].value, DBLSIZE);
-    lcd_putc(12*FW-1, y-FH, '<'); putsTelemetryChannelValue(17*FW, y-FH, index+TELEM_A1-1, frskyData.analog[index].min, NO_UNIT);
-    lcd_putc(12*FW, y, '>');      putsTelemetryChannelValue(17*FW, y, index+TELEM_A1-1, frskyData.analog[index].max, NO_UNIT);
+    lcdDrawChar(12*FW-1, y-FH, '<'); putsTelemetryChannelValue(17*FW, y-FH, index+TELEM_A1-1, frskyData.analog[index].min, NO_UNIT);
+    lcdDrawChar(12*FW, y, '>');      putsTelemetryChannelValue(17*FW, y, index+TELEM_A1-1, frskyData.analog[index].max, NO_UNIT);
   }
 }
 #endif
@@ -203,7 +203,7 @@ void displayVoltagesScreen()
 #else
       uint8_t attr = PREC2;
 #endif
-      lcd_outdezNAtt(LCD_W, y, TELEMETRY_CELL_VOLTAGE(k), attr, 4);
+      lcdDrawNumber(LCD_W, y, TELEMETRY_CELL_VOLTAGE(k), attr, 4);
       y += 1*FH;
     }
     lcdDrawSolidVerticalLine(LCD_W-3*FW-2, 8, 47);
@@ -229,10 +229,10 @@ void displayAfterFlightScreen()
   }
   // Rssi
   lcd_putsLeft(line, STR_MINRSSI);
-  lcd_puts(TELEM_2ND_COLUMN, line, STR_TX);
-  lcd_outdezNAtt(TELEM_2ND_COLUMN+3*FW, line, frskyData.rssi[1].min, LEFT|LEADING0, 2);
-  lcd_puts(TELEM_2ND_COLUMN+6*FW, line, STR_RX);
-  lcd_outdezNAtt(TELEM_2ND_COLUMN+9*FW, line, frskyData.rssi[0].min, LEFT|LEADING0, 2);
+  lcdDrawText(TELEM_2ND_COLUMN, line, STR_TX);
+  lcdDrawNumber(TELEM_2ND_COLUMN+3*FW, line, frskyData.rssi[1].min, LEFT|LEADING0, 2);
+  lcdDrawText(TELEM_2ND_COLUMN+6*FW, line, STR_RX);
+  lcdDrawNumber(TELEM_2ND_COLUMN+9*FW, line, frskyData.rssi[0].min, LEFT|LEADING0, 2);
 }
 #endif
 
@@ -393,9 +393,9 @@ bool displayNumbersTelemetryScreen(FrSkyScreenData & screen)
 #if defined(FRSKY_HUB)
           if (field == TELEM_ACC) {
             lcd_putsLeft(STATUS_BAR_Y, STR_ACCEL);
-            lcd_outdezNAtt(4*FW, STATUS_BAR_Y, frskyData.hub.accelX, LEFT|PREC2);
-            lcd_outdezNAtt(10*FW, STATUS_BAR_Y, frskyData.hub.accelY, LEFT|PREC2);
-            lcd_outdezNAtt(16*FW, STATUS_BAR_Y, frskyData.hub.accelZ, LEFT|PREC2);
+            lcdDrawNumber(4*FW, STATUS_BAR_Y, frskyData.hub.accelX, LEFT|PREC2);
+            lcdDrawNumber(10*FW, STATUS_BAR_Y, frskyData.hub.accelY, LEFT|PREC2);
+            lcdDrawNumber(16*FW, STATUS_BAR_Y, frskyData.hub.accelZ, LEFT|PREC2);
             break;
           }
 #endif
@@ -555,7 +555,7 @@ void menuTelemetryFrsky(uint8_t event)
   }
 
   lcdDrawTelemetryTopBar();
-  lcd_puts(8*FW, 3*FH, "No Telemetry Screens");
+  lcdDrawText(8*FW, 3*FH, "No Telemetry Screens");
   displayRssiLine();
 #else
   if (!displayTelemetryScreen()) {
diff --git a/radio/src/gui/9X/view_text.cpp b/radio/src/gui/9X/view_text.cpp
index 7c36f6cb9..7871bbdbb 100644
--- a/radio/src/gui/9X/view_text.cpp
+++ b/radio/src/gui/9X/view_text.cpp
@@ -147,7 +147,7 @@ void menuTextView(uint8_t event)
 #else
   // TODO?
 #endif
-  lcd_puts(LCD_W/2-strlen(title)*FW/2, 0, title);
+  lcdDrawText(LCD_W/2-strlen(title)*FW/2, 0, title);
   lcdInvertLine(0);
 
   if (lines_count > LCD_LINES-1) {
diff --git a/radio/src/gui/9X/widgets.cpp b/radio/src/gui/9X/widgets.cpp
index 5fddc8e27..9b73dd438 100644
--- a/radio/src/gui/9X/widgets.cpp
+++ b/radio/src/gui/9X/widgets.cpp
@@ -52,7 +52,7 @@ void menu_lcd_onoff(coord_t x, coord_t y, uint8_t value, LcdFlags attr)
 {
 #if defined(GRAPHICS)
   if (value)
-    lcd_putc(x+1, y, '#');
+    lcdDrawChar(x+1, y, '#');
   if (attr)
     lcdDrawFilledRect(x, y, 7, 7);
   else
@@ -65,10 +65,10 @@ void menu_lcd_onoff(coord_t x, coord_t y, uint8_t value, LcdFlags attr)
 
 void displayScreenIndex(uint8_t index, uint8_t count, uint8_t attr)
 {
-  lcd_outdezAtt(LCD_W, 0, count, attr);
+  lcdDrawNumber(LCD_W, 0, count, attr);
   coord_t x = 1+LCD_W-FW*(count>9 ? 3 : 2);
   lcdDrawChar(x, 0, '/', attr);
-  lcd_outdezAtt(x, 0, index+1, attr);
+  lcdDrawNumber(x, 0, index+1, attr);
 }
 
 #if !defined(CPUM64)
@@ -117,14 +117,14 @@ int8_t switchMenuItem(coord_t x, coord_t y, int8_t value, LcdFlags attr, uint8_t
 #if !defined(CPUM64)
 void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr)
 {
-  lcd_putc(x+(value*4*FW)/max, y, '$');
+  lcdDrawChar(x+(value*4*FW)/max, y, '$');
   lcdDrawSolidHorizontalLine(x, y+3, 5*FW-1, FORCE);
   if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawFilledRect(x, y, 5*FW-1, FH-1);
 }
 #elif defined(GRAPHICS)
 void display5posSlider(coord_t x, coord_t y, uint8_t value, uint8_t attr)
 {
-  lcd_putc(x+2*FW+(value*FW), y, '$');
+  lcdDrawChar(x+2*FW+(value*FW), y, '$');
   lcdDrawSolidHorizontalLine(x, y+3, 5*FW-1, SOLID);
   if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawFilledRect(x, y, 5*FW-1, FH-1);
 }
@@ -177,7 +177,7 @@ int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t m
     putsStrIdx(x, y, STR_GV, idx, attr);
   }
   else {
-    lcd_outdezAtt(x, y, value, attr);
+    lcdDrawNumber(x, y, value, attr);
     if (invers) value = checkIncDec(event, value, min, max, EE_MODEL | editflags);
   }
   return value;
@@ -217,7 +217,7 @@ int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t m
     putsStrIdx(x, y, STR_GV, idx, attr);
   }
   else {
-    lcd_outdezAtt(x, y, value, attr);
+    lcdDrawNumber(x, y, value, attr);
     if (invers) value = checkIncDec(event, value, min, max, EE_MODEL);
   }
   return value;
@@ -225,7 +225,7 @@ int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t m
 #else
 int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event)
 {
-  lcd_outdezAtt(x, y, value, attr);
+  lcdDrawNumber(x, y, value, attr);
   if (attr&INVERS) value = checkIncDec(event, value, min, max, EE_MODEL);
   return value;
 }
diff --git a/radio/src/gui/Horus/lcd.cpp b/radio/src/gui/Horus/lcd.cpp
index e2638b3ee..131ab586b 100644
--- a/radio/src/gui/Horus/lcd.cpp
+++ b/radio/src/gui/Horus/lcd.cpp
@@ -184,7 +184,7 @@ int getTextWidth(const pm_char * s, int len, LcdFlags flags)
   return result;
 }
 
-void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags flags)
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags flags)
 {
   int width = getTextWidth(s, len, flags);
   int height = getFontHeight(flags);
@@ -249,7 +249,7 @@ void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, uint8_t len, Lc
 
 void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags flags)
 {
-  lcdDrawTextWithLen(x, y, s, 255, flags);
+  lcdDrawSizedText(x, y, s, 255, flags);
 }
 
 void lcd_putsCenter(coord_t y, const pm_char * s, LcdFlags attr)
@@ -262,10 +262,10 @@ void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s,uint8_t idx, Lcd
 {
   uint8_t length;
   length = pgm_read_byte(s++);
-  lcdDrawTextWithLen(x, y, s+length*idx, length, flags & ~ZCHAR);
+  lcdDrawSizedText(x, y, s+length*idx, length, flags & ~ZCHAR);
 }
 
-void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
+void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
 {
   char s[5];
   for (int i=0; i<4; i++) {
@@ -487,7 +487,7 @@ void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
     if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
       lcdDrawChar(x+2, y+1, '1'+qr.quot, TINSIZE);
       lcdDrawSolidFilledRect(x, y, 7, 7);
-      lcdDrawTextWithLen(x+8, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
+      lcdDrawSizedText(x+8, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
     }
     else
 #endif
@@ -499,14 +499,14 @@ void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
   else if (idx <= MIXSRC_LAST_POT) {
     idx = idx-MIXSRC_Rud;
     if (ZEXIST(g_eeGeneral.anaNames[idx]))
-      lcdDrawTextWithLen(x, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, ZCHAR|att);
+      lcdDrawSizedText(x, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, ZCHAR|att);
     else
       lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx+1, att);
   }
   else if (idx >= MIXSRC_FIRST_SWITCH && idx < MIXSRC_FIRST_LOGICAL_SWITCH) {
     idx = idx-MIXSRC_FIRST_SWITCH;
     if (ZEXIST(g_eeGeneral.switchNames[idx]))
-      lcdDrawTextWithLen(x, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, ZCHAR|att);
+      lcdDrawSizedText(x, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, ZCHAR|att);
     else
       lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx+MIXSRC_FIRST_SWITCH-MIXSRC_Rud+1, att);
   }
@@ -521,7 +521,7 @@ void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
 #if 0
     if (ZEXIST(g_model.limitData[idx-MIXSRC_CH1].name) && (att & STREXPANDED)) {
       lcdDrawChar(lcdNextPos, y, ' ', att);
-      lcdDrawTextWithLen(lcdNextPos+3, y, g_model.limitData[idx-MIXSRC_CH1].name, LEN_CHANNEL_NAME, ZCHAR|att);
+      lcdDrawSizedText(lcdNextPos+3, y, g_model.limitData[idx-MIXSRC_CH1].name, LEN_CHANNEL_NAME, ZCHAR|att);
     }
 #endif
   }
@@ -554,7 +554,7 @@ void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att)
     putsStrIdx(x, y, STR_MODEL, id+1, att|LEADING0);
   }
   else {
-    lcdDrawTextWithLen(x, y, name, sizeof(g_model.header.name), ZCHAR|att);
+    lcdDrawSizedText(x, y, name, sizeof(g_model.header.name), ZCHAR|att);
   }
 }
 
@@ -607,7 +607,7 @@ void putsSwitches(coord_t x, coord_t y, int8_t idx, LcdFlags att)
     lcdDrawText(x, y, "Tele", att);
   }
   else {
-    lcdDrawTextWithLen(x, y, g_model.telemetrySensors[idx-SWSRC_FIRST_SENSOR].label, TELEM_LABEL_LEN, ZCHAR|att);
+    lcdDrawSizedText(x, y, g_model.telemetrySensors[idx-SWSRC_FIRST_SENSOR].label, TELEM_LABEL_LEN, ZCHAR|att);
   }
 }
 
@@ -690,7 +690,7 @@ void putsTrimMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, LcdFlags att
     char s[2];
     s[0] = (mode % 2 == 0) ? ':' : '+';
     s[1] = '0'+p;
-    lcdDrawTextWithLen(x, y, s, 2, att);
+    lcdDrawSizedText(x, y, s, 2, att);
   }
 }
 
diff --git a/radio/src/gui/Horus/lcd.h b/radio/src/gui/Horus/lcd.h
index e54e06ea8..e1c6ea084 100644
--- a/radio/src/gui/Horus/lcd.h
+++ b/radio/src/gui/Horus/lcd.h
@@ -189,10 +189,10 @@ extern coord_t lcdNextPos;
 void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags attr=TEXT_COLOR);
 void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags attr=TEXT_COLOR);
 void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s, uint8_t idx, LcdFlags attr=TEXT_COLOR);
-void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags attr=TEXT_COLOR);
-void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, unsigned char len);
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags attr=TEXT_COLOR);
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, unsigned char len);
 void lcd_putsCenter(coord_t y, const pm_char * s, LcdFlags attr=0);
-void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0);
+void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0);
 void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags flags=0, uint8_t len=0, const char * prefix=NULL, const char * suffix=NULL);
 
 void putsStrIdx(coord_t x, coord_t y, const pm_char *str, int idx, LcdFlags att=0, const char *prefix="");
@@ -284,7 +284,7 @@ inline void lcdDrawSolidRect(coord_t x, scoord_t y, coord_t w, coord_t h, LcdFla
   lcdDrawSolidHorizontalLine(x, y+h-1, w, att);
 }
 
-void lcdDrawFilledRect(coord_t x, scoord_t y, coord_t w, coord_t h, LcdFlags att);
+void lcdDrawFilledRect(coord_t x, scoord_t y, coord_t w, coord_t h, uint8_t pat, LcdFlags att);
 void lcdDrawBlackOverlay();
 void lcdDrawRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t pat=SOLID, LcdFlags att=0);
 void lcdDrawCircle(int x0, int y0, int radius);
diff --git a/radio/src/gui/Horus/menu_model.cpp b/radio/src/gui/Horus/menu_model.cpp
index 5bb55467d..c5a6022a7 100644
--- a/radio/src/gui/Horus/menu_model.cpp
+++ b/radio/src/gui/Horus/menu_model.cpp
@@ -125,10 +125,10 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, evt_t event, uint
       uint8_t len = zlen(name, size);
       if (len == 0) {
         char tmp[] = "---";
-        lcdDrawTextWithLen(x, y, tmp, size, flags-ZCHAR);
+        lcdDrawSizedText(x, y, tmp, size, flags-ZCHAR);
       }
       else {
-        lcdDrawTextWithLen(x, y, name, len, flags);
+        lcdDrawSizedText(x, y, name, len, flags);
       }
     }
     else {
@@ -204,7 +204,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, evt_t event, uint
         storageDirty(g_menuPos[0] == 0 ? EE_MODEL : EE_GENERAL);
       }
 
-      lcdDrawTextWithLen(x, y, name, size, flags);
+      lcdDrawSizedText(x, y, name, size, flags);
       coord_t left = (editNameCursorPos == 0 ? 0 : getTextWidth(name, editNameCursorPos, flags));
       char s[] = { (flags & ZCHAR) ? idx2char(name[editNameCursorPos]) : name[editNameCursorPos], '\0' };
       lcdDrawSolidFilledRect(x+left-1, y-INVERT_VERT_MARGIN, getTextWidth(s, 1)+1, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
diff --git a/radio/src/gui/Horus/menu_model_custom_functions.cpp b/radio/src/gui/Horus/menu_model_custom_functions.cpp
index e92b39e24..eabf3ff03 100644
--- a/radio/src/gui/Horus/menu_model_custom_functions.cpp
+++ b/radio/src/gui/Horus/menu_model_custom_functions.cpp
@@ -244,7 +244,7 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
           else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) {
             coord_t x = MODEL_CUSTOM_FUNC_3RD_COLUMN;
             if (ZEXIST(cfn->play.name))
-              lcdDrawTextWithLen(x, y, cfn->play.name, sizeof(cfn->play.name), attr);
+              lcdDrawSizedText(x, y, cfn->play.name, sizeof(cfn->play.name), attr);
             else
               lcdDrawTextAtIndex(x, y, STR_VCSWFUNC, 0, attr);
             if (active && event==EVT_KEY_BREAK(KEY_ENTER)) {
diff --git a/radio/src/gui/Horus/menu_model_inputs_mixes.cpp b/radio/src/gui/Horus/menu_model_inputs_mixes.cpp
index 8e3cb0980..93dfcc8dc 100644
--- a/radio/src/gui/Horus/menu_model_inputs_mixes.cpp
+++ b/radio/src/gui/Horus/menu_model_inputs_mixes.cpp
@@ -650,7 +650,7 @@ void displayHeaderChannelName(uint8_t ch)
 {
   uint8_t len = zlen(g_model.limitData[ch-1].name, sizeof(g_model.limitData[ch-1].name));
   if (len) {
-    lcdDrawTextWithLen(COLUMN_HEADER_X, MENU_FOOTER_TOP, g_model.limitData[ch-1].name, len, HEADER_COLOR|ZCHAR);
+    lcdDrawSizedText(COLUMN_HEADER_X, MENU_FOOTER_TOP, g_model.limitData[ch-1].name, len, HEADER_COLOR|ZCHAR);
   }
 }
 
@@ -666,7 +666,7 @@ void displayMixInfos(coord_t y, MixData *md)
 void displayMixLine(coord_t y, MixData *md)
 {
   if (md->name[0])
-    lcdDrawTextWithLen(EXPO_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
+    lcdDrawSizedText(EXPO_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
   displayMixInfos(y, md);
   displayFlightModes(MIX_LINE_FM_POS, y, md->flightModes, 0);
 }
@@ -690,7 +690,7 @@ void displayExpoLine(coord_t y, ExpoData *ed)
   displayFlightModes(EXPO_LINE_FM_POS, y, ed->flightModes, 0);
 
   if (ed->name[0]) {
-    lcdDrawTextWithLen(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR);
+    lcdDrawSizedText(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR);
   }
 }
 
diff --git a/radio/src/gui/Horus/menu_model_select.cpp b/radio/src/gui/Horus/menu_model_select.cpp
index 4454d4700..71617df88 100644
--- a/radio/src/gui/Horus/menu_model_select.cpp
+++ b/radio/src/gui/Horus/menu_model_select.cpp
@@ -71,7 +71,7 @@ void drawModel(coord_t x, coord_t y, const char * name, bool selected)
     lcdDrawBitmapPattern(x+5, y+23, LBM_LIBRARY_SLOT, TEXT_COLOR);
   }
   else {
-    lcdDrawTextWithLen(x+5, y+2, header.name, LEN_MODEL_NAME, ZCHAR|TEXT_COLOR);
+    lcdDrawSizedText(x+5, y+2, header.name, LEN_MODEL_NAME, ZCHAR|TEXT_COLOR);
     putsTimer(x+104, y+41, 0, TEXT_COLOR|LEFT);
     for (int i=0; i<4; i++) {
       lcdDrawBitmapPattern(x+104+i*11, y+25, LBM_SCORE0, TITLE_BGCOLOR);
diff --git a/radio/src/gui/Horus/menu_model_setup.cpp b/radio/src/gui/Horus/menu_model_setup.cpp
index 4a21cbea9..7b840b4a1 100644
--- a/radio/src/gui/Horus/menu_model_setup.cpp
+++ b/radio/src/gui/Horus/menu_model_setup.cpp
@@ -226,7 +226,7 @@ bool menuModelSetup(evt_t event)
       case ITEM_MODEL_BITMAP:
         lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BITMAP);
         if (ZEXIST(g_model.header.bitmap))
-          lcdDrawTextWithLen(MODEL_SETUP_2ND_COLUMN, y, g_model.header.bitmap, sizeof(g_model.header.bitmap), attr);
+          lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.header.bitmap, sizeof(g_model.header.bitmap), attr);
         else
           lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VCSWFUNC, 0, attr);
         if (attr && event==EVT_KEY_BREAK(KEY_ENTER) && READ_ONLY_UNLOCKED()) {
@@ -742,7 +742,7 @@ bool menuModelFailsafe(evt_t event)
       }
 
       if (lenLabel > 0)
-        lcdDrawTextWithLen(x+1-ofs, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE);
+        lcdDrawSizedText(x+1-ofs, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE);
       else
         putsChn(x+1-ofs, y, ch+1, SMLSIZE);
 
diff --git a/radio/src/gui/Horus/menu_model_telemetry.cpp b/radio/src/gui/Horus/menu_model_telemetry.cpp
index a6c297876..0e236fa26 100644
--- a/radio/src/gui/Horus/menu_model_telemetry.cpp
+++ b/radio/src/gui/Horus/menu_model_telemetry.cpp
@@ -259,7 +259,7 @@ bool menuModelSensor(evt_t event)
       case SENSOR_FIELD_ID:
         if (sensor->type == TELEM_TYPE_CUSTOM) {
           lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ID);
-          lcd_outhex4(SENSOR_2ND_COLUMN, y, sensor->id, LEFT|(m_posHorz==0 ? attr : 0));
+          lcdDrawHexNumber(SENSOR_2ND_COLUMN, y, sensor->id, LEFT|(m_posHorz==0 ? attr : 0));
           lcdDrawNumber(SENSOR_3RD_COLUMN, y, sensor->instance, LEFT|(m_posHorz==1 ? attr : 0));
           if (attr) {
             switch (m_posHorz) {
@@ -538,7 +538,7 @@ bool menuModelTelemetry(evt_t event)
     if (k>=ITEM_TELEMETRY_SENSOR1 && k<ITEM_TELEMETRY_SENSOR1+MAX_SENSORS) {
       int index = k-ITEM_TELEMETRY_SENSOR1;
       lcdDrawNumber(MENUS_MARGIN_LEFT+INDENT_WIDTH, y, index+1, LEFT|attr, 0, NULL, ":");
-      lcdDrawTextWithLen(60, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR);
+      lcdDrawSizedText(60, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR);
       if (telemetryItems[index].isFresh()) {
         lcdDrawText(100, y, "*");
       }
@@ -728,7 +728,7 @@ bool menuModelTelemetry(evt_t event)
           // TODO better function name for ---
           // TODO function for these lines
           if (ZEXIST(scriptData.file))
-            lcdDrawTextWithLen(TELEM_COL3, y, scriptData.file, sizeof(scriptData.file), (m_posHorz==1 ? attr : 0));
+            lcdDrawSizedText(TELEM_COL3, y, scriptData.file, sizeof(scriptData.file), (m_posHorz==1 ? attr : 0));
           else
             lcdDrawTextAtIndex(TELEM_COL3, y, STR_VCSWFUNC, 0, (m_posHorz==1 ? attr : 0));
 
diff --git a/radio/src/gui/Horus/popups.cpp b/radio/src/gui/Horus/popups.cpp
index c431de24a..bd18e686d 100644
--- a/radio/src/gui/Horus/popups.cpp
+++ b/radio/src/gui/Horus/popups.cpp
@@ -97,7 +97,7 @@ void message(const pm_char *title, const pm_char *t, const char *last MESSAGE_SO
 void displayPopup(const char *title)
 {
   // displayMessageBox();
-  lcdDrawTextWithLen(WARNING_LINE_X, WARNING_LINE_Y, title, WARNING_LINE_LEN, DBLSIZE|WARNING_COLOR);
+  lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, title, WARNING_LINE_LEN, DBLSIZE|WARNING_COLOR);
   lcdRefresh();
 }
 
@@ -108,9 +108,9 @@ void displayWarning(evt_t event)
     displayMessageBox();
   else
     displayWarningBox();
-  lcdDrawTextWithLen(WARNING_LINE_X, WARNING_LINE_Y, s_warning, WARNING_LINE_LEN, DBLSIZE | (s_warning_type == WARNING_TYPE_INPUT ? WARNING_COLOR : ALARM_COLOR));
+  lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, s_warning, WARNING_LINE_LEN, DBLSIZE | (s_warning_type == WARNING_TYPE_INPUT ? WARNING_COLOR : ALARM_COLOR));
   if (s_warning_info) {
-    lcdDrawTextWithLen(WARNING_LINE_X, WARNING_INFOLINE_Y, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS);
+    lcdDrawSizedText(WARNING_LINE_X, WARNING_INFOLINE_Y, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS);
   }
   lcdDrawText(WARNING_LINE_X, WARNING_INFOLINE_Y+20, s_warning_type == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS);
   switch (event) {
diff --git a/radio/src/gui/Horus/view_channels.cpp b/radio/src/gui/Horus/view_channels.cpp
index 6188085df..2cf2365af 100644
--- a/radio/src/gui/Horus/view_channels.cpp
+++ b/radio/src/gui/Horus/view_channels.cpp
@@ -78,7 +78,7 @@ bool menuChannelsView(evt_t event)
         // The label
         unsigned int lenLabel = ZLEN(g_model.limitData[ch].name);
         if (lenLabel > 0)
-          lcdDrawTextWithLen(x+CHANNEL_PADDING_HORZ, y+CHANNEL_PADDING_VERT, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR);
+          lcdDrawSizedText(x+CHANNEL_PADDING_HORZ, y+CHANNEL_PADDING_VERT, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR);
         else
           putsChn(x+CHANNEL_PADDING_HORZ, y+CHANNEL_PADDING_VERT, ch+1, 0);
 
diff --git a/radio/src/gui/Horus/view_main.cpp b/radio/src/gui/Horus/view_main.cpp
index 2c551ecf1..f057f220a 100644
--- a/radio/src/gui/Horus/view_main.cpp
+++ b/radio/src/gui/Horus/view_main.cpp
@@ -178,7 +178,7 @@ void drawTimer(coord_t x, coord_t y, int index)
   }
   putsTimer(x+76, y+31, abs(timerState.val), TEXT_COLOR|DBLSIZE|LEFT);
   if (ZLEN(timerData.name) > 0) {
-    lcdDrawTextWithLen(x+78, y+20, timerData.name, LEN_TIMER_NAME, ZCHAR|SMLSIZE|TEXT_COLOR);
+    lcdDrawSizedText(x+78, y+20, timerData.name, LEN_TIMER_NAME, ZCHAR|SMLSIZE|TEXT_COLOR);
   }
   putsStrIdx(x+137, y+17, "TMR", index+1, SMLSIZE|TEXT_COLOR);
 }
@@ -374,7 +374,7 @@ bool menuMainView(evt_t event)
   }
   drawTrimSquare(LCD_W/2-25+5*mixerCurrentFlightMode, 253);
   lcdDrawChar(LCD_W/2-23+5*mixerCurrentFlightMode, 254, '0'+mixerCurrentFlightMode, SMLSIZE|TEXT_INVERTED_COLOR);
-  lcdDrawTextWithLen(LCD_W/2-getTextWidth(g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|SMLSIZE)/2, 237, g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|SMLSIZE);
+  lcdDrawSizedText(LCD_W/2-getTextWidth(g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|SMLSIZE)/2, 237, g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|SMLSIZE);
 
   // Sticks
   drawSticks();
@@ -384,11 +384,11 @@ bool menuMainView(evt_t event)
 
   // Model panel
   TIME_MEASURE_START(filledRect);
-  lcdDrawFilledRect(MODELPANEL_LEFT, MODELPANEL_TOP, MODELPANEL_WIDTH, MODELPANEL_HEIGHT, TEXT_BGCOLOR | OPACITY(5));
+  lcdDrawFilledRect(MODELPANEL_LEFT, MODELPANEL_TOP, MODELPANEL_WIDTH, MODELPANEL_HEIGHT, SOLID, TEXT_BGCOLOR | OPACITY(5));
   TIME_MEASURE_STOP(filledRect); // 9ms !
 
   lcdDrawBitmapPattern(MODELPANEL_LEFT+6, MODELPANEL_TOP+4, LBM_MODEL_ICON, TITLE_BGCOLOR);
-  lcdDrawTextWithLen(MODELPANEL_LEFT+45, MODELPANEL_TOP+10, g_model.header.name, LEN_MODEL_NAME, ZCHAR|SMLSIZE);
+  lcdDrawSizedText(MODELPANEL_LEFT+45, MODELPANEL_TOP+10, g_model.header.name, LEN_MODEL_NAME, ZCHAR|SMLSIZE);
   lcdDrawSolidHorizontalLine(MODELPANEL_LEFT+39, MODELPANEL_TOP+27, MODELPANEL_WIDTH-48, TITLE_BGCOLOR);
 #if 0
   int scale = getBitmapScale(modelBitmap, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT);
@@ -410,7 +410,7 @@ bool menuMainView(evt_t event)
     s_gvar_timer--;
     displayMessageBox();
     putsStrIdx(WARNING_LINE_X, WARNING_LINE_Y, STR_GV, s_gvar_last+1, DBLSIZE|YELLOW);
-    lcdDrawTextWithLen(WARNING_LINE_X+45, WARNING_LINE_Y, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, DBLSIZE|YELLOW|ZCHAR);
+    lcdDrawSizedText(WARNING_LINE_X+45, WARNING_LINE_Y, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, DBLSIZE|YELLOW|ZCHAR);
     lcdDrawNumber(WARNING_LINE_X, WARNING_INFOLINE_Y, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), DBLSIZE|LEFT);
   }
 #endif
diff --git a/radio/src/gui/Horus/view_statistics.cpp b/radio/src/gui/Horus/view_statistics.cpp
index aa1e0c4c8..f0bef6587 100644
--- a/radio/src/gui/Horus/view_statistics.cpp
+++ b/radio/src/gui/Horus/view_statistics.cpp
@@ -206,9 +206,9 @@ bool menuTraceBuffer(evt_t event)
       //event
       lcdDrawNumber(14*10, y, te->event, LEADING0|LEFT, 3);
       //data
-      lcd_putsn  (20*10, y, "0x", 2);
-      lcd_outhex4(22*10-2, y, (uint16_t)(te->data >> 16));
-      lcd_outhex4(25*10, y, (uint16_t)(te->data & 0xFFFF));
+      lcdDrawSizedText  (20*10, y, "0x", 2);
+      lcdDrawHexNumber(22*10-2, y, (uint16_t)(te->data >> 16));
+      lcdDrawHexNumber(25*10, y, (uint16_t)(te->data & 0xFFFF));
     }
 
   }
diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp
index 01d0db4c1..12b685091 100644
--- a/radio/src/gui/Taranis/lcd.cpp
+++ b/radio/src/gui/Taranis/lcd.cpp
@@ -213,12 +213,12 @@ void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags flags)
   }
 }
 
-void lcd_putc(coord_t x, coord_t y, const unsigned char c)
+void lcdDrawChar(coord_t x, coord_t y, const unsigned char c)
 {
   lcdDrawChar(x, y, c, 0);
 }
 
-void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags flags)
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags flags)
 {
   const coord_t orig_x = x;
   const uint8_t orig_len = len;
@@ -281,34 +281,34 @@ void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s, uint8_t len, Lc
     lcdLastPos += 1;
 }
 
-void lcd_putsn(coord_t x, coord_t y, const pm_char * s, uint8_t len)
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len)
 {
-  lcdDrawTextWithLen(x, y, s, len, 0);
+  lcdDrawSizedText(x, y, s, len, 0);
 }
 
 void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags flags)
 {
-  lcdDrawTextWithLen(x, y, s, 255, flags);
+  lcdDrawSizedText(x, y, s, 255, flags);
 }
 
-void lcd_puts(coord_t x, coord_t y, const pm_char * s)
+void lcdDrawText(coord_t x, coord_t y, const pm_char * s)
 {
   lcdDrawText(x, y, s, 0);
 }
 
 void lcd_putsLeft(coord_t y, const pm_char * s)
 {
-  lcd_puts(0, y, s);
+  lcdDrawText(0, y, s);
 }
 
 #if !defined(BOOT)
 void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s,uint8_t idx, LcdFlags flags)
 {
   uint8_t length = pgm_read_byte(s++);
-  lcdDrawTextWithLen(x, y, s+length*idx, length, flags & ~(BSS|ZCHAR));
+  lcdDrawSizedText(x, y, s+length*idx, length, flags & ~(BSS|ZCHAR));
 }
 
-void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
+void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
 {
   x += FWNUM*4+1;
   for (int i=0; i<4; i++) {
@@ -320,17 +320,17 @@ void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags flags)
   }
 }
 
-void lcd_outdez8(coord_t x, coord_t y, int8_t val)
+void lcdDraw8bitsNumber(coord_t x, coord_t y, int8_t val)
 {
-  lcd_outdezAtt(x, y, val);
+  lcdDrawNumber(x, y, val);
 }
 
-void lcd_outdezAtt(coord_t x, coord_t y, int32_t val, LcdFlags flags)
+void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags flags)
 {
-  lcd_outdezNAtt(x, y, val, flags);
+  lcdDrawNumber(x, y, val, flags, 0);
 }
 
-void lcd_outdezNAtt(coord_t x, coord_t y, int32_t val, LcdFlags flags, uint8_t len)
+void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags flags, uint8_t len)
 {
   uint8_t fw = FWNUM;
   int8_t mode = MODE(flags);
@@ -597,7 +597,7 @@ void putsTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
 #define separator ':'
   if (att & TIMEHOUR) {
     div_t qr2 = div(qr.quot, 60);
-    lcd_outdezNAtt(x, y, qr2.quot, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(x, y, qr2.quot, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, separator, att&att2);
     qr.quot = qr2.rem;
     if (att & MIDSIZE)
@@ -605,18 +605,18 @@ void putsTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
     else
       x += 13;
   }
-  lcd_outdezNAtt(x, y, qr.quot, att|LEADING0|LEFT, 2);
+  lcdDrawNumber(x, y, qr.quot, att|LEADING0|LEFT, 2);
   if (att&TIMEBLINK)
     lcdDrawChar(lcdLastPos, y, separator, BLINK);
   else
     lcdDrawChar(lcdLastPos, y, separator, att&att2);
-  lcd_outdezNAtt(lcdNextPos, y, qr.rem, att2|LEADING0|LEFT, 2);
+  lcdDrawNumber(lcdNextPos, y, qr.rem, att2|LEADING0|LEFT, 2);
 }
 
 // TODO to be optimized with putsValueWithUnit
 void putsVolts(coord_t x, coord_t y, uint16_t volts, LcdFlags att)
 {
-  lcd_outdezAtt(x, y, (int16_t)volts, (~NO_UNIT) & (att | ((att&PREC2)==PREC2 ? 0 : PREC1)));
+  lcdDrawNumber(x, y, (int16_t)volts, (~NO_UNIT) & (att | ((att&PREC2)==PREC2 ? 0 : PREC1)));
   if (~att & NO_UNIT) lcdDrawChar(lcdLastPos, y, 'V', att);
 }
 
@@ -628,13 +628,13 @@ void putsVBat(coord_t x, coord_t y, LcdFlags att)
 void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att)
 {
   lcdDrawText(x, y, str, att & ~LEADING0);
-  lcd_outdezNAtt(lcdNextPos, y, idx, att|LEFT, 2);
+  lcdDrawNumber(lcdNextPos, y, idx, att|LEFT, 2);
 }
 
 void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
 {
   uint8_t length = STR_VSRCRAW[0];
-  lcdDrawTextWithLen(x, y, STR_VSRCRAW+2+length*(idx+1), length-1, att);
+  lcdDrawSizedText(x, y, STR_VSRCRAW+2+length*(idx+1), length-1, att);
 }
 
 void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
@@ -646,9 +646,9 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
     lcdDrawChar(x+2, y+1, CHR_INPUT, TINSIZE);
     lcdDrawFilledRect(x, y, 7, 7);
     if (ZEXIST(g_model.inputNames[idx-MIXSRC_FIRST_INPUT]))
-      lcdDrawTextWithLen(x+8, y, g_model.inputNames[idx-MIXSRC_FIRST_INPUT], LEN_INPUT_NAME, ZCHAR|att);
+      lcdDrawSizedText(x+8, y, g_model.inputNames[idx-MIXSRC_FIRST_INPUT], LEN_INPUT_NAME, ZCHAR|att);
     else
-      lcd_outdezNAtt(x+8, y, idx, att|LEADING0|LEFT, 2);
+      lcdDrawNumber(x+8, y, idx, att|LEADING0|LEFT, 2);
   }
 
   else if (idx <= MIXSRC_LAST_LUA) {
@@ -657,7 +657,7 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
     if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
       lcdDrawChar(x+2, y+1, '1'+qr.quot, TINSIZE);
       lcdDrawFilledRect(x, y, 7, 7);
-      lcdDrawTextWithLen(x+8, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
+      lcdDrawSizedText(x+8, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
     }
     else
 #endif
@@ -676,7 +676,7 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
         lcdDrawChar(x, y, '\310', att); //pot symbol
       else 
         lcdDrawChar(x, y, '\311', att); //slider symbol
-      lcdDrawTextWithLen(lcdNextPos, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, ZCHAR|att);
+      lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, ZCHAR|att);
     }
     else
       lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx+1, att);
@@ -685,7 +685,7 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
     idx = idx-MIXSRC_FIRST_SWITCH;
     if (ZEXIST(g_eeGeneral.switchNames[idx])) {
       lcdDrawChar(x, y, '\312', att); //switch symbol
-      lcdDrawTextWithLen(lcdNextPos, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, ZCHAR|att);
+      lcdDrawSizedText(lcdNextPos, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, ZCHAR|att);
     }
     else
       lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx+MIXSRC_FIRST_SWITCH-MIXSRC_Rud+1, att);
@@ -700,7 +700,7 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
     putsStrIdx(x, y, STR_CH, idx-MIXSRC_CH1+1, att);
     if (ZEXIST(g_model.limitData[idx-MIXSRC_CH1].name) && (att & STREXPANDED)) {
       lcdDrawChar(lcdLastPos, y, ' ', att|SMLSIZE);
-      lcdDrawTextWithLen(lcdLastPos+3, y, g_model.limitData[idx-MIXSRC_CH1].name, LEN_CHANNEL_NAME, ZCHAR|att|SMLSIZE);
+      lcdDrawSizedText(lcdLastPos+3, y, g_model.limitData[idx-MIXSRC_CH1].name, LEN_CHANNEL_NAME, ZCHAR|att|SMLSIZE);
     }
   }
   else if (idx <= MIXSRC_LAST_GVAR) {
@@ -712,7 +712,7 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
   else {
     idx -= MIXSRC_FIRST_TELEM;
     div_t qr = div(idx, 3);
-    lcdDrawTextWithLen(x, y, g_model.telemetrySensors[qr.quot].label, TELEM_LABEL_LEN, ZCHAR|att);
+    lcdDrawSizedText(x, y, g_model.telemetrySensors[qr.quot].label, TELEM_LABEL_LEN, ZCHAR|att);
     if (qr.rem) lcdDrawChar(lcdLastPos, y, qr.rem==2 ? '+' : '-', att);
   }
 }
@@ -730,7 +730,7 @@ void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att)
     putsStrIdx(x, y, STR_MODEL, id+1, att|LEADING0);
   }
   else {
-    lcdDrawTextWithLen(x, y, name, sizeof(g_model.header.name), ZCHAR|att);
+    lcdDrawSizedText(x, y, name, sizeof(g_model.header.name), ZCHAR|att);
   }
 }
 
@@ -751,7 +751,7 @@ void putsSwitches(coord_t x, coord_t y, int32_t idx, LcdFlags att)
   if (idx <= SWSRC_LAST_SWITCH) {
     div_t swinfo = switchInfo(idx);
     if (ZEXIST(g_eeGeneral.switchNames[swinfo.quot])) {
-      lcdDrawTextWithLen(x, y, g_eeGeneral.switchNames[swinfo.quot], LEN_SWITCH_NAME, ZCHAR|att);
+      lcdDrawSizedText(x, y, g_eeGeneral.switchNames[swinfo.quot], LEN_SWITCH_NAME, ZCHAR|att);
     }
     else {
       lcdDrawChar(x, y, 'S', att);
@@ -786,7 +786,7 @@ void putsSwitches(coord_t x, coord_t y, int32_t idx, LcdFlags att)
     lcdDrawText(x, y, "Tele", att);
   }
   else {
-    lcdDrawTextWithLen(x, y, g_model.telemetrySensors[idx-SWSRC_FIRST_SENSOR].label, TELEM_LABEL_LEN, ZCHAR|att);
+    lcdDrawSizedText(x, y, g_model.telemetrySensors[idx-SWSRC_FIRST_SENSOR].label, TELEM_LABEL_LEN, ZCHAR|att);
   }
 }
 
@@ -796,7 +796,7 @@ void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att)
   if (idx==0) { lcdDrawTextAtIndex(x, y, STR_MMMINV, 0, att); return; }
   if (idx < 0) { lcdDrawChar(x-2, y, '!', att); idx = -idx; }
   if (att & CONDENSED)
-    lcd_outdezNAtt(x+FW*1, y, idx-1, (att & ~CONDENSED), 1);
+    lcdDrawNumber(x+FW*1, y, idx-1, (att & ~CONDENSED), 1);
   else
     putsStrIdx(x, y, STR_FP, idx-1, att);
 }
@@ -884,7 +884,7 @@ const pm_uint8_t bchunit_ar[] PROGMEM = {
 void putsValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags att)
 {
   // convertUnit(val, unit);
-  lcd_outdezAtt(x, y, val, att & (~NO_UNIT));
+  lcdDrawNumber(x, y, val, att & (~NO_UNIT));
   if (!(att & NO_UNIT) && unit != UNIT_RAW) {
     lcdDrawTextAtIndex(lcdLastPos/*+1*/, y, STR_VTELEMUNIT, unit, 0);
   }
@@ -893,27 +893,27 @@ void putsValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags
 void displayGpsCoord(coord_t x, coord_t y, char direction, int16_t bp, int16_t ap, LcdFlags att, bool seconds=true)
 {
     if (!direction) direction = '-';
-    lcd_outdezAtt(x, y, bp / 100, att); // ddd before '.'
+    lcdDrawNumber(x, y, bp / 100, att); // ddd before '.'
     lcdDrawChar(lcdLastPos, y, '@', att);
     uint8_t mn = bp % 100; // TODO div_t
     if (g_eeGeneral.gpsFormat == 0) {
-      lcd_outdezNAtt(lcdNextPos, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
+      lcdDrawNumber(lcdNextPos, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
       lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
       if (seconds) {
         uint16_t ss = ap * 6 / 10;
-        lcd_outdezNAtt(lcdLastPos+3, y, ss / 100, att|LEFT|LEADING0, 2); // ''
+        lcdDrawNumber(lcdLastPos+3, y, ss / 100, att|LEFT|LEADING0, 2); // ''
         lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
-        lcd_outdezNAtt(lcdLastPos+2, y, ss % 100, att|LEFT|LEADING0, 2); // ''
+        lcdDrawNumber(lcdLastPos+2, y, ss % 100, att|LEFT|LEADING0, 2); // ''
         lcdDrawSolidVerticalLine(lcdLastPos, y, 2);
         lcdDrawSolidVerticalLine(lcdLastPos+2, y, 2);
       }
-      lcd_putc(lcdLastPos+2, y, direction);
+      lcdDrawChar(lcdLastPos+2, y, direction);
     }
     else {
-      lcd_outdezNAtt(lcdLastPos+FW, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
+      lcdDrawNumber(lcdLastPos+FW, y, mn, att|LEFT|LEADING0, 2); // mm before '.'
       lcdDrawPoint(lcdLastPos, y+FH-2, 0); // small decimal point
-      lcd_outdezNAtt(lcdLastPos+2, y, ap, att|LEFT|UNSIGN|LEADING0, 4); // after '.'
-      lcd_putc(lcdLastPos+1, y, direction);
+      lcdDrawNumber(lcdLastPos+2, y, ap, att|LEFT|UNSIGN|LEADING0, 4); // after '.'
+      lcdDrawChar(lcdLastPos+1, y, direction);
     }
 }
 
@@ -922,29 +922,29 @@ void displayDate(coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags a
   if (att & DBLSIZE) {
     x -= 42;
     att &= ~0x0F00; // TODO constant
-    lcd_outdezNAtt(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos-1, y, '-', att);
-    lcd_outdezNAtt(lcdNextPos-1, y, telemetryItem.datetime.month, att|LEFT, 2);
+    lcdDrawNumber(lcdNextPos-1, y, telemetryItem.datetime.month, att|LEFT, 2);
     lcdDrawChar(lcdLastPos-1, y, '-', att);
-    lcd_outdezAtt(lcdNextPos-1, y, telemetryItem.datetime.year, att|LEFT);
+    lcdDrawNumber(lcdNextPos-1, y, telemetryItem.datetime.year, att|LEFT);
     y += FH;
-    lcd_outdezNAtt(x, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(x, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
   }
   else {
-    lcd_outdezNAtt(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos-1, y, '-', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.month, att|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.month, att|LEFT, 2);
     lcdDrawChar(lcdLastPos-1, y, '-', att);
-    lcd_outdezAtt(lcdNextPos, y, telemetryItem.datetime.year, att|LEFT);
-    lcd_outdezNAtt(lcdNextPos+FW+1, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.year, att|LEFT);
+    lcdDrawNumber(lcdNextPos+FW+1, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
     lcdDrawChar(lcdLastPos, y, ':', att);
-    lcd_outdezNAtt(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
+    lcdDrawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
   }
 }
 
@@ -993,20 +993,20 @@ void putsChannelValue(coord_t x, coord_t y, source_t channel, int32_t value, Lcd
     putsTimer(x, y, value, att, att);
   }
   else if (channel == MIXSRC_TX_VOLTAGE) {
-    lcd_outdezAtt(x, y, value, att|PREC1);
+    lcdDrawNumber(x, y, value, att|PREC1);
   }
   else if (channel < MIXSRC_FIRST_CH) {
-    lcd_outdezAtt(x, y, calcRESXto100(value), att);
+    lcdDrawNumber(x, y, calcRESXto100(value), att);
   }
   else if (channel <= MIXSRC_LAST_CH) {
 #if defined(PPM_UNIT_PERCENT_PREC1)
-    lcd_outdezAtt(x, y, calcRESXto1000(value), att|PREC1);
+    lcdDrawNumber(x, y, calcRESXto1000(value), att|PREC1);
 #else
-    lcd_outdezAtt(x, y, calcRESXto100(value), att);
+    lcdDrawNumber(x, y, calcRESXto100(value), att);
 #endif
   }
   else {
-    lcd_outdezAtt(x, y, value, att);
+    lcdDrawNumber(x, y, value, att);
   }
 }
 
diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/Taranis/lcd.h
index b18b83f3f..336ee4c8d 100644
--- a/radio/src/gui/Taranis/lcd.h
+++ b/radio/src/gui/Taranis/lcd.h
@@ -142,22 +142,22 @@ typedef const unsigned char pm_uchar;
 typedef const char pm_char;
 #endif
 
-void lcd_putc(coord_t x, coord_t y, const unsigned char c);
+void lcdDrawChar(coord_t x, coord_t y, const unsigned char c);
 void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags mode);
 void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags mode);
 void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s,uint8_t idx, LcdFlags mode);
-void lcdDrawTextWithLen(coord_t x, coord_t y, const pm_char * s,unsigned char len, LcdFlags mode);
-void lcd_puts(coord_t x, coord_t y, const pm_char * s);
-void lcd_putsn(coord_t x, coord_t y, const pm_char * s, unsigned char len);
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s,unsigned char len, LcdFlags mode);
+void lcdDrawText(coord_t x, coord_t y, const pm_char * s);
+void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, unsigned char len);
 void lcd_putsLeft(coord_t y, const pm_char * s);
 
-#define lcd_putsCenter(y, s) lcd_puts((LCD_W-sizeof(TR_##s)*FW+FW+1)/2, y, STR_##s)
+#define lcd_putsCenter(y, s) lcdDrawText((LCD_W-sizeof(TR_##s)*FW+FW+1)/2, y, STR_##s)
 
-void lcd_outhex4(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0);
+void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0);
 
-void lcd_outdezNAtt(coord_t x, coord_t y, int32_t val, LcdFlags mode=0, uint8_t len=0);
-void lcd_outdezAtt(coord_t x, coord_t y, int32_t val, LcdFlags mode=0);
-void lcd_outdez8(coord_t x, coord_t y, int8_t val);
+void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags mode, uint8_t len);
+void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags mode=0);
+void lcdDraw8bitsNumber(coord_t x, coord_t y, int8_t val);
 
 void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att=0);
 void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
diff --git a/radio/src/gui/Taranis/menu_general_calib.cpp b/radio/src/gui/Taranis/menu_general_calib.cpp
index 5e51bae2d..d18ef187c 100644
--- a/radio/src/gui/Taranis/menu_general_calib.cpp
+++ b/radio/src/gui/Taranis/menu_general_calib.cpp
@@ -198,7 +198,7 @@ void menuCommonCalib(uint8_t event)
       steps = calib->count + 1;
     }
     if (steps > 0 && steps <= XPOTS_MULTIPOS_COUNT) {
-      lcd_outdezAtt(LCD_W/2-2+(i-POT1)*5, LCD_H-6, steps, TINSIZE);
+      lcdDrawNumber(LCD_W/2-2+(i-POT1)*5, LCD_H-6, steps, TINSIZE);
     }
   }
 #endif
diff --git a/radio/src/gui/Taranis/menu_general_diaganas.cpp b/radio/src/gui/Taranis/menu_general_diaganas.cpp
index 05b0d9f4f..2937acea8 100644
--- a/radio/src/gui/Taranis/menu_general_diaganas.cpp
+++ b/radio/src/gui/Taranis/menu_general_diaganas.cpp
@@ -47,16 +47,16 @@ void menuGeneralDiagAna(uint8_t event)
     coord_t y = MENU_HEADER_HEIGHT + 1 + (i/3)*FH;
     const uint8_t x_coord[] = {0, 70, 154};
     uint8_t x = x_coord[i%3];
-    lcd_outdezNAtt(x, y, i+1, LEADING0|LEFT, 2);
-    lcd_putc(x+2*FW-2, y, ':');
+    lcdDrawNumber(x, y, i+1, LEADING0|LEFT, 2);
+    lcdDrawChar(x+2*FW-2, y, ':');
 #else
     coord_t y = MENU_HEADER_HEIGHT + 1 + (i/2)*FH;
     uint8_t x = i&1 ? 64+5 : 0;
     putsStrIdx(x, y, PSTR("A"), i+1);
-    lcd_putc(lcdNextPos, y, ':');
+    lcdDrawChar(lcdNextPos, y, ':');
 #endif
-    lcd_outhex4(x+3*FW-1, y, anaIn(i));
-    lcd_outdez8(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
+    lcdDrawHexNumber(x+3*FW-1, y, anaIn(i));
+    lcdDraw8bitsNumber(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
   }
 
   lcd_putsLeft(MENU_HEADER_HEIGHT+1+5*FH, STR_BATT_CALIB);
diff --git a/radio/src/gui/Taranis/menu_general_diagkeys.cpp b/radio/src/gui/Taranis/menu_general_diagkeys.cpp
index fc55e3ddc..ddbd138df 100644
--- a/radio/src/gui/Taranis/menu_general_diagkeys.cpp
+++ b/radio/src/gui/Taranis/menu_general_diagkeys.cpp
@@ -46,7 +46,7 @@ void menuGeneralDiagKeys(uint8_t event)
 {
   SIMPLE_MENU(STR_MENUDIAG, menuTabGeneral, e_Keys, 1);
 
-  lcd_puts(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM);
+  lcdDrawText(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM);
 
   for(uint8_t i=0; i<9; i++) {
     coord_t y;
diff --git a/radio/src/gui/Taranis/menu_general_sdmanager.cpp b/radio/src/gui/Taranis/menu_general_sdmanager.cpp
index c0bceee47..caf29ea52 100644
--- a/radio/src/gui/Taranis/menu_general_sdmanager.cpp
+++ b/radio/src/gui/Taranis/menu_general_sdmanager.cpp
@@ -46,25 +46,25 @@ void menuGeneralSdManagerInfo(evt_t event)
   SIMPLE_SUBMENU(STR_SD_INFO_TITLE, 1);
 
   lcd_putsLeft(2*FH, STR_SD_TYPE);
-  lcd_puts(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
+  lcdDrawText(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
 
   lcd_putsLeft(3*FH, STR_SD_SIZE);
-  lcd_outdezAtt(10*FW, 3*FH, sdGetSize(), LEFT);
-  lcd_putc(lcdLastPos, 3*FH, 'M');
+  lcdDrawNumber(10*FW, 3*FH, sdGetSize(), LEFT);
+  lcdDrawChar(lcdLastPos, 3*FH, 'M');
 
   lcd_putsLeft(4*FH, STR_SD_SECTORS);
 #if defined(SD_GET_FREE_BLOCKNR)
-  lcd_outdezAtt(10*FW, 4*FH,  SD_GET_FREE_BLOCKNR()/1000, LEFT);
-  lcd_putc(lcdLastPos, 4*FH, '/');
-  lcd_outdezAtt(lcdLastPos+FW, 4*FH, sdGetNoSectors()/1000, LEFT);
+  lcdDrawNumber(10*FW, 4*FH,  SD_GET_FREE_BLOCKNR()/1000, LEFT);
+  lcdDrawChar(lcdLastPos, 4*FH, '/');
+  lcdDrawNumber(lcdLastPos+FW, 4*FH, sdGetNoSectors()/1000, LEFT);
 #else
-  lcd_outdezAtt(10*FW, 4*FH, sdGetNoSectors()/1000, LEFT);
+  lcdDrawNumber(10*FW, 4*FH, sdGetNoSectors()/1000, LEFT);
 #endif
-  lcd_putc(lcdLastPos, 4*FH, 'k');
+  lcdDrawChar(lcdLastPos, 4*FH, 'k');
 
   lcd_putsLeft(5*FH, STR_SD_SPEED);
-  lcd_outdezAtt(10*FW, 5*FH, SD_GET_SPEED()/1000, LEFT);
-  lcd_puts(lcdLastPos, 5*FH, "kb/s");
+  lcdDrawNumber(10*FW, 5*FH, SD_GET_SPEED()/1000, LEFT);
+  lcdDrawText(lcdLastPos, 5*FH, "kb/s");
 }
 
 inline bool isFilenameGreater(bool isfile, const char * fn, const char * line)
diff --git a/radio/src/gui/Taranis/menu_general_setup.cpp b/radio/src/gui/Taranis/menu_general_setup.cpp
index 7b5260295..31a610c5f 100644
--- a/radio/src/gui/Taranis/menu_general_setup.cpp
+++ b/radio/src/gui/Taranis/menu_general_setup.cpp
@@ -141,16 +141,16 @@ void menuGeneralSetup(uint8_t event)
     switch(k) {
       case ITEM_SETUP_DATE:
         lcd_putsLeft(y, STR_DATE);
-        lcd_putc(RADIO_SETUP_DATE_COLUMN, y, '-'); lcd_putc(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-');
+        lcdDrawChar(RADIO_SETUP_DATE_COLUMN, y, '-'); lcdDrawChar(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-');
         for (uint8_t j=0; j<3; j++) {
           uint8_t rowattr = (m_posHorz==j ? attr : 0);
           switch (j) {
             case 0:
-              lcd_outdezAtt(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+1900, rowattr);
+              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+1900, rowattr);
               if (rowattr && s_editMode>0) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0);
               break;
             case 1:
-              lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0, 2);
               if (rowattr && s_editMode>0) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
               break;
             case 2:
@@ -159,7 +159,7 @@ void menuGeneralSetup(uint8_t event)
               int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0);
               static const pm_uint8_t dmon[] PROGMEM = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
               dlim += pgm_read_byte(&dmon[t.tm_mon]);
-              lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0, 2);
               if (rowattr && s_editMode>0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0);
               break;
             }
@@ -173,20 +173,20 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_TIME:
         lcd_putsLeft(y, STR_TIME);
-        lcd_putc(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcd_putc(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':');
+        lcdDrawChar(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcdDrawChar(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':');
         for (uint8_t j=0; j<3; j++) {
           uint8_t rowattr = (m_posHorz==j ? attr : 0);
           switch (j) {
             case 0:
-              lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0, 2);
               if (rowattr && s_editMode>0) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0);
               break;
             case 1:
-              lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0, 2);
               if (rowattr && s_editMode>0) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0);
               break;
             case 2:
-              lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0, 2);
+              lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0, 2);
               if (rowattr && s_editMode>0) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0);
               break;
           }
@@ -199,7 +199,7 @@ void menuGeneralSetup(uint8_t event)
       case ITEM_SETUP_BATT_RANGE:
         lcd_putsLeft(y, STR_BATTERY_RANGE);
         putsVolts(RADIO_SETUP_2ND_COLUMN, y,  90+g_eeGeneral.vBatMin, (m_posHorz==0 ? attr : 0)|LEFT|NO_UNIT);
-        lcd_putc(lcdLastPos, y, '-');
+        lcdDrawChar(lcdLastPos, y, '-');
         putsVolts(lcdLastPos+FW, y, 120+g_eeGeneral.vBatMax, (m_posHorz>0 ? attr : 0)|LEFT|NO_UNIT);
         if (attr && m_posHorz < 0) lcdDrawFilledRect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8);
         if (attr && s_editMode>0) {
@@ -252,7 +252,7 @@ void menuGeneralSetup(uint8_t event)
       case ITEM_SETUP_SPEAKER_PITCH:
         lcd_putsLeft( y, STR_SPKRPITCH);
         lcdDrawChar(RADIO_SETUP_2ND_COLUMN, y, '+', attr);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT);
         lcdDrawText(lcdLastPos, y, "Hz", attr);
         if (attr) {
           CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20);
@@ -268,19 +268,19 @@ void menuGeneralSetup(uint8_t event)
         break;
       case ITEM_SETUP_VARIO_PITCH:
         lcd_putsLeft(y, STR_PITCH_AT_ZERO);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
         lcdDrawText(lcdLastPos, y, "Hz", attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40);
         break;
       case ITEM_SETUP_VARIO_RANGE:
         lcd_putsLeft(y, STR_PITCH_AT_MAX);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
         lcdDrawText(lcdLastPos, y, "Hz", attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80);
         break;
       case ITEM_SETUP_VARIO_REPEAT:
         lcd_putsLeft(y, STR_REPEAT_AT_ZERO);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
         lcdDrawText(lcdLastPos, y, STR_MS, attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50);
         break;
@@ -306,7 +306,7 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_CONTRAST:
         lcd_putsLeft(y, STR_CONTRAST);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
         if (attr) {
           CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, CONTRAST_MIN, CONTRAST_MAX);
           lcdSetContrast();
@@ -339,8 +339,8 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_INACTIVITY_ALARM:
         lcd_putsLeft(y, STR_INACTIVITYALARM);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT);
-        lcd_putc(lcdLastPos, y, 'm');
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT);
+        lcdDrawChar(lcdLastPos, y, 'm');
         if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
         break;
 
@@ -358,14 +358,14 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_BACKLIGHT_DELAY:
         lcd_putsLeft(y, STR_BLDELAY);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT);
-        lcd_putc(lcdLastPos, y, 's');
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT);
+        lcdDrawChar(lcdLastPos, y, 's');
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5);
         break;
 
       case ITEM_SETUP_BRIGHTNESS:
         lcd_putsLeft(y, STR_BRIGHTNESS);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ;
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ;
         if (attr) {
           uint8_t b = 100 - g_eeGeneral.backlightBright;
           CHECK_INCDEC_GENVAR(event, b, 0, 100);
@@ -386,8 +386,8 @@ void menuGeneralSetup(uint8_t event)
       {
         lcd_putsLeft(y, STR_SPLASHSCREEN);
         if (SPLASH_NEEDED()) {
-          lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, SPLASH_TIMEOUT/100, attr|LEFT);
-          lcd_putc(lcdLastPos, y, 's');
+          lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, SPLASH_TIMEOUT/100, attr|LEFT);
+          lcdDrawChar(lcdLastPos, y, 's');
         }
         else {
           lcdDrawTextAtIndex(RADIO_SETUP_2ND_COLUMN, y, STR_MMMINV, 0, attr); // TODO define
@@ -404,7 +404,7 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_TIMEZONE:
         lcd_putsLeft(y, STR_TIMEZONE);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.timezone, -12, 12);
         break;
 
@@ -459,7 +459,7 @@ void menuGeneralSetup(uint8_t event)
 
       case ITEM_SETUP_SWITCHES_DELAY:
         lcd_putsLeft(y, STR_SWITCHES_DELAY);
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT);
         lcdDrawText(lcdLastPos, y, STR_MS, attr);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, 100-15);
         break;
diff --git a/radio/src/gui/Taranis/menu_general_trainer.cpp b/radio/src/gui/Taranis/menu_general_trainer.cpp
index 81e0d0ae2..3daf57e6d 100644
--- a/radio/src/gui/Taranis/menu_general_trainer.cpp
+++ b/radio/src/gui/Taranis/menu_general_trainer.cpp
@@ -46,14 +46,14 @@ void menuGeneralTrainer(uint8_t event)
   MENU(STR_MENUTRAINER, menuTabGeneral, e_Trainer, (slave ? 0 : 6), { 2, 2, 2, 2, 0/*, 0*/ });
 
   if (slave) {
-    lcd_puts(7*FW, 4*FH, STR_SLAVE);
+    lcdDrawText(7*FW, 4*FH, STR_SLAVE);
     return;
   }
 
   LcdFlags attr;
   LcdFlags blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
 
-  lcd_puts(3*FW, MENU_HEADER_HEIGHT+1, STR_MODESRC);
+  lcdDrawText(3*FW, MENU_HEADER_HEIGHT+1, STR_MODESRC);
 
   y = MENU_HEADER_HEIGHT + 1 + FH;
   int sub = m_posVert + 1;
@@ -75,7 +75,7 @@ void menuGeneralTrainer(uint8_t event)
           break;
 
         case 1:
-          lcd_outdezAtt(11*FW, y, td->studWeight, attr);
+          lcdDrawNumber(11*FW, y, td->studWeight, attr);
           if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->studWeight, -125, 125);
           break;
 
@@ -90,7 +90,7 @@ void menuGeneralTrainer(uint8_t event)
 
   attr = (sub==5) ? blink : 0;
   lcd_putsLeft(MENU_HEADER_HEIGHT+1+5*FH, STR_MULTIPLIER);
-  lcd_outdezAtt(LEN_MULTIPLIER*FW+3*FW, MENU_HEADER_HEIGHT+1+5*FH, g_eeGeneral.PPM_Multiplier+10, attr|PREC1);
+  lcdDrawNumber(LEN_MULTIPLIER*FW+3*FW, MENU_HEADER_HEIGHT+1+5*FH, g_eeGeneral.PPM_Multiplier+10, attr|PREC1);
   if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.PPM_Multiplier, -10, 40);
 
   attr = (sub==6) ? INVERS : 0;
@@ -99,9 +99,9 @@ void menuGeneralTrainer(uint8_t event)
   for (int i=0; i<4; i++) {
     uint8_t x = (i*TRAINER_CALIB_POS+16)*FW/2;
 #if defined (PPM_UNIT_PERCENT_PREC1)
-    lcd_outdezAtt(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])*2, PREC1);
+    lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])*2, PREC1);
 #else
-    lcd_outdezAtt(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])/5, 0);
+    lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])/5, 0);
 #endif
   }
 
diff --git a/radio/src/gui/Taranis/menu_model.cpp b/radio/src/gui/Taranis/menu_model.cpp
index 53516d1dc..8335585a9 100644
--- a/radio/src/gui/Taranis/menu_model.cpp
+++ b/radio/src/gui/Taranis/menu_model.cpp
@@ -91,8 +91,8 @@ void editCurveRef(coord_t x, coord_t y, CurveRef & curve, uint8_t event, uint8_t
 #if MENU_COLUMNS > 1
 uint8_t editDelay(const coord_t x, const coord_t y, const uint8_t event, const uint8_t attr, const pm_char *str, uint8_t delay)
 {
-  lcd_puts(x, y, str);
-  lcd_outdezAtt(x+MIXES_2ND_COLUMN, y, (10/DELAY_STEP)*delay, attr|PREC1|LEFT);
+  lcdDrawText(x, y, str);
+  lcdDrawNumber(x+MIXES_2ND_COLUMN, y, (10/DELAY_STEP)*delay, attr|PREC1|LEFT);
   if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, delay, DELAY_MAX);
   return delay;
 }
@@ -101,7 +101,7 @@ uint8_t editDelay(const coord_t x, const coord_t y, const uint8_t event, const u
 uint8_t editDelay(const coord_t y, const uint8_t event, const uint8_t attr, const pm_char *str, uint8_t delay)
 {
   lcd_putsLeft(y, str);
-  lcd_outdezAtt(MIXES_2ND_COLUMN, y, (10/DELAY_STEP)*delay, attr|PREC1|LEFT);
+  lcdDrawNumber(MIXES_2ND_COLUMN, y, (10/DELAY_STEP)*delay, attr|PREC1|LEFT);
   if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, delay, DELAY_MAX);
   return delay;
 }
@@ -148,7 +148,7 @@ void editName(coord_t x, coord_t y, char *name, uint8_t size, uint8_t event, uin
       mode = FIXEDWIDTH;
   }
 
-  lcdDrawTextWithLen(x, y, name, size, attr | mode);
+  lcdDrawSizedText(x, y, name, size, attr | mode);
   coord_t backupNextPos = lcdNextPos;
 
   if (active) {
diff --git a/radio/src/gui/Taranis/menu_model_curves.cpp b/radio/src/gui/Taranis/menu_model_curves.cpp
index 3b2eaec72..7f333137a 100644
--- a/radio/src/gui/Taranis/menu_model_curves.cpp
+++ b/radio/src/gui/Taranis/menu_model_curves.cpp
@@ -98,7 +98,7 @@ bool moveCurve(uint8_t index, int8_t shift)
 void displayPresetChoice(uint8_t event)
 {
   displayWarning(event);
-  lcd_outdezAtt(WARNING_LINE_X+FW*7, WARNING_LINE_Y, 45*s_warning_input_value/4, LEFT|INVERS);
+  lcdDrawNumber(WARNING_LINE_X+FW*7, WARNING_LINE_Y, 45*s_warning_input_value/4, LEFT|INVERS);
   lcdDrawChar(lcdLastPos, WARNING_LINE_Y, '@', INVERS);
 
   if (s_warning_result) {
@@ -143,11 +143,11 @@ void menuModelCurveOne(uint8_t event)
   CurveInfo & crv = g_model.curves[s_curveChan];
   int8_t * points = curveAddress(s_curveChan);
 
-  lcd_puts(9*FW, 0, TR_PT "\003X\006Y");
+  lcdDrawText(9*FW, 0, TR_PT "\003X\006Y");
   lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
 
   SIMPLE_SUBMENU(STR_MENUCURVE, 4 + 5+crv.points + (crv.type==CURVE_TYPE_CUSTOM ? 5+crv.points-2 : 0));
-  lcd_outdezAtt(PSIZE(TR_MENUCURVE)*FW+1, 0, s_curveChan+1, INVERS|LEFT);
+  lcdDrawNumber(PSIZE(TR_MENUCURVE)*FW+1, 0, s_curveChan+1, INVERS|LEFT);
 
   lcd_putsLeft(FH+1, STR_NAME);
   editName(INDENT_WIDTH, 2*FH+1, g_model.curveNames[s_curveChan], sizeof(g_model.curveNames[s_curveChan]), event, m_posVert==0);
@@ -171,7 +171,7 @@ void menuModelCurveOne(uint8_t event)
 
   attr = (m_posVert==2 ? (s_editMode>0 ? INVERS|BLINK : INVERS) : 0);
   lcd_putsLeft(5*FH+1, STR_COUNT);
-  lcd_outdezAtt(INDENT_WIDTH, 6*FH+1, 5+crv.points, LEFT|attr);
+  lcdDrawNumber(INDENT_WIDTH, 6*FH+1, 5+crv.points, LEFT|attr);
   lcdDrawText(lcdLastPos, 6*FH+1, STR_PTS, attr);
   if (attr) {
     int8_t count = checkIncDecModel(event, crv.points, -3, 12); // 2pts - 17pts
@@ -234,9 +234,9 @@ void menuModelCurveOne(uint8_t event)
     if (i>=pointsOfs && i<pointsOfs+7) {
       int8_t x = -100 + 200*i/(5+crv.points-1);
       if (crv.type==CURVE_TYPE_CUSTOM && i>0 && i<5+crv.points-1) x = points[5+crv.points+i-1];
-      lcd_outdezAtt(6+8*FW,  posY, i+1, LEFT);
-      lcd_outdezAtt(3+12*FW, posY, x, LEFT|(selectionMode==1?attr:0));
-      lcd_outdezAtt(3+16*FW, posY, points[i], LEFT|(selectionMode==2?attr:0));
+      lcdDrawNumber(6+8*FW,  posY, i+1, LEFT);
+      lcdDrawNumber(3+12*FW, posY, x, LEFT|(selectionMode==1?attr:0));
+      lcdDrawNumber(3+16*FW, posY, points[i], LEFT|(selectionMode==2?attr:0));
       posY += FH;
     }
 
@@ -312,7 +312,7 @@ void menuModelCurvesAll(uint8_t event)
       putsStrIdx(0, y, STR_CV, k+1, attr);
       editName(4*FW, y, g_model.curveNames[k], sizeof(g_model.curveNames[k]), 0, 0);
       CurveInfo & crv = g_model.curves[k];
-      lcd_outdezAtt(11*FW, y, 5+crv.points, LEFT);
+      lcdDrawNumber(11*FW, y, 5+crv.points, LEFT);
       lcdDrawText(lcdLastPos, y, STR_PTS, 0);
     }
   }
diff --git a/radio/src/gui/Taranis/menu_model_custom_functions.cpp b/radio/src/gui/Taranis/menu_model_custom_functions.cpp
index 18fb74f9e..f9e04e082 100644
--- a/radio/src/gui/Taranis/menu_model_custom_functions.cpp
+++ b/radio/src/gui/Taranis/menu_model_custom_functions.cpp
@@ -258,14 +258,14 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
             }
             else {
               TelemetrySensor * sensor = & g_model.telemetrySensors[param-FUNC_RESET_PARAM_FIRST_TELEM];
-              lcdDrawTextWithLen(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, sensor->label, TELEM_LABEL_LEN, attr|ZCHAR);
+              lcdDrawSizedText(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, sensor->label, TELEM_LABEL_LEN, attr|ZCHAR);
             }
             if (active) INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalResetSpecialFunction : isSourceAvailableInResetSpecialFunction);
           }
 #if defined(OVERRIDE_CHANNEL_FUNCTION)
           else if (func == FUNC_OVERRIDE_CHANNEL) {
             val_min = -LIMIT_EXT_PERCENT; val_max = +LIMIT_EXT_PERCENT;
-            lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
+            lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
           }
 #endif
           else if (func >= FUNC_SET_FAILSAFE && func <= FUNC_BIND) {
@@ -283,14 +283,14 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
 #if defined(HAPTIC)
           else if (func == FUNC_HAPTIC) {
             val_max = 3;
-            lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
+            lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
           }
 #endif
 #if defined(SDCARD)
           else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) {
             coord_t x = MODEL_CUSTOM_FUNC_3RD_COLUMN;
             if (ZEXIST(cfn->play.name))
-              lcdDrawTextWithLen(x, y, cfn->play.name, sizeof(cfn->play.name), attr);
+              lcdDrawSizedText(x, y, cfn->play.name, sizeof(cfn->play.name), attr);
             else
               lcdDrawTextAtIndex(x, y, STR_VCSWFUNC, 0, attr);
             if (active && event==EVT_KEY_BREAK(KEY_ENTER)) {
@@ -332,8 +332,8 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
           }
           else if (func == FUNC_LOGS) {
             if (val_displayed) {
-              lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT);
-              lcd_putc(lcdLastPos, y, 's');
+              lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT);
+              lcdDrawChar(lcdLastPos, y, 's');
             }
             else {
               lcdDrawTextAtIndex(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, STR_MMMINV, 0, attr);
@@ -353,7 +353,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
               case FUNC_ADJUST_GVAR_CONSTANT:
                 val_displayed = (int16_t)CFN_PARAM(cfn);
                 val_min = -CFN_GVAR_CST_MAX; val_max = +CFN_GVAR_CST_MAX;
-                lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
+                lcdDrawNumber(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
                 break;
               case FUNC_ADJUST_GVAR_SOURCE:
                 val_max = MIXSRC_LAST_CH;
@@ -374,7 +374,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
                   lcdDrawText(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, "-=", attr);
                 else
                   lcdDrawText(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, "+=", attr);
-                lcd_outdezAtt(lcdNextPos, y, abs(val_displayed), attr|LEFT);
+                lcdDrawNumber(lcdNextPos, y, abs(val_displayed), attr|LEFT);
 #endif
                 val_max = 1;
                 lcdDrawTextAtIndex(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, PSTR("\003-=1+=1"), val_displayed, attr);
@@ -419,7 +419,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
               lcdDrawText(MODEL_CUSTOM_FUNC_4TH_COLUMN+2, y, "1x", attr);
             }
             else {
-              lcd_outdezAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN+2+FW, y, CFN_PLAY_REPEAT(cfn)*CFN_PLAY_REPEAT_MUL, attr);
+              lcdDrawNumber(MODEL_CUSTOM_FUNC_4TH_COLUMN+2+FW, y, CFN_PLAY_REPEAT(cfn)*CFN_PLAY_REPEAT_MUL, attr);
               lcdDrawChar(MODEL_CUSTOM_FUNC_4TH_COLUMN+2+FW, y, 's', attr);
             }
             if (active) CFN_PLAY_REPEAT(cfn) = checkIncDec(event, CFN_PLAY_REPEAT(cfn)==CFN_PLAY_REPEAT_NOSTART?-1:CFN_PLAY_REPEAT(cfn), -1, 60/CFN_PLAY_REPEAT_MUL, eeFlags);
diff --git a/radio/src/gui/Taranis/menu_model_custom_scripts.cpp b/radio/src/gui/Taranis/menu_model_custom_scripts.cpp
index 0515882aa..f957bb193 100644
--- a/radio/src/gui/Taranis/menu_model_custom_scripts.cpp
+++ b/radio/src/gui/Taranis/menu_model_custom_scripts.cpp
@@ -83,7 +83,7 @@ void menuModelCustomScriptOne(uint8_t event)
     if (i == ITEM_MODEL_CUSTOMSCRIPT_FILE) {
       lcd_putsLeft(y, STR_SCRIPT);
       if (ZEXIST(sd.file))
-        lcdDrawTextWithLen(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.file, sizeof(sd.file), attr);
+        lcdDrawSizedText(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.file, sizeof(sd.file), attr);
       else
         lcdDrawTextAtIndex(SCRIPT_ONE_2ND_COLUMN_POS, y, STR_VCSWFUNC, 0, attr);
       if (attr && event==EVT_KEY_BREAK(KEY_ENTER) && !READ_ONLY()) {
@@ -106,9 +106,9 @@ void menuModelCustomScriptOne(uint8_t event)
     }
     else if (i <= ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL+scriptInputsOutputs[s_currIdx].inputsCount) {
       int inputIdx = i-ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL-1;
-      lcdDrawTextWithLen(INDENT_WIDTH, y, scriptInputsOutputs[s_currIdx].inputs[inputIdx].name, 10, 0);
+      lcdDrawSizedText(INDENT_WIDTH, y, scriptInputsOutputs[s_currIdx].inputs[inputIdx].name, 10, 0);
       if (scriptInputsOutputs[s_currIdx].inputs[inputIdx].type == 0) {
-        lcd_outdezAtt(SCRIPT_ONE_2ND_COLUMN_POS, y, g_model.scriptsData[s_currIdx].inputs[inputIdx]+scriptInputsOutputs[s_currIdx].inputs[inputIdx].def, attr|LEFT);
+        lcdDrawNumber(SCRIPT_ONE_2ND_COLUMN_POS, y, g_model.scriptsData[s_currIdx].inputs[inputIdx]+scriptInputsOutputs[s_currIdx].inputs[inputIdx].def, attr|LEFT);
         if (attr) {
           CHECK_INCDEC_MODELVAR(event, g_model.scriptsData[s_currIdx].inputs[inputIdx], scriptInputsOutputs[s_currIdx].inputs[inputIdx].min-scriptInputsOutputs[s_currIdx].inputs[inputIdx].def, scriptInputsOutputs[s_currIdx].inputs[inputIdx].max-scriptInputsOutputs[s_currIdx].inputs[inputIdx].def);
         }
@@ -125,19 +125,19 @@ void menuModelCustomScriptOne(uint8_t event)
 
   if (scriptInputsOutputs[s_currIdx].outputsCount > 0) {
     lcdDrawSolidVerticalLine(SCRIPT_ONE_3RD_COLUMN_POS-4, FH+1, LCD_H-FH-1);
-    lcd_puts(SCRIPT_ONE_3RD_COLUMN_POS, FH+1, STR_OUTPUTS);
+    lcdDrawText(SCRIPT_ONE_3RD_COLUMN_POS, FH+1, STR_OUTPUTS);
 
     for (int i=0; i<scriptInputsOutputs[s_currIdx].outputsCount; i++) {
       putsMixerSource(SCRIPT_ONE_3RD_COLUMN_POS+INDENT_WIDTH, FH+1+FH+i*FH, MIXSRC_FIRST_LUA+(s_currIdx*MAX_SCRIPT_OUTPUTS)+i, 0);
-      lcd_outdezNAtt(SCRIPT_ONE_3RD_COLUMN_POS+11*FW+3, FH+1+FH+i*FH, calcRESXto1000(scriptInputsOutputs[s_currIdx].outputs[i].value), PREC1);
+      lcdDrawNumber(SCRIPT_ONE_3RD_COLUMN_POS+11*FW+3, FH+1+FH+i*FH, calcRESXto1000(scriptInputsOutputs[s_currIdx].outputs[i].value), PREC1);
     }
   }
 }
 
 void menuModelCustomScripts(uint8_t event)
 {
-  lcd_outdezAtt(19*FW, 0, luaGetMemUsed(), 0);
-  lcd_puts(19*FW+1, 0, STR_BYTES);
+  lcdDrawNumber(19*FW, 0, luaGetMemUsed(), 0);
+  lcdDrawText(19*FW+1, 0, STR_BYTES);
 
   MENU(STR_MENUCUSTOMSCRIPTS, menuTabModel, e_CustomScripts, MAX_SCRIPTS, { NAVIGATION_LINE_BY_LINE|3/*repeated*/ });
 
@@ -159,17 +159,17 @@ void menuModelCustomScripts(uint8_t event)
 
     // LUA script
     if (ZEXIST(sd.file)) {
-      lcdDrawTextWithLen(5*FW, y, sd.file, sizeof(sd.file), 0);
+      lcdDrawSizedText(5*FW, y, sd.file, sizeof(sd.file), 0);
       switch (scriptInternalData[scriptIndex].state) {
         case SCRIPT_SYNTAX_ERROR:
-          lcd_puts(30*FW+2, y, "(error)");
+          lcdDrawText(30*FW+2, y, "(error)");
           break;
         case SCRIPT_KILLED:
-          lcd_puts(29*FW+2, y, "(killed)");
+          lcdDrawText(29*FW+2, y, "(killed)");
           break;
         default:
-          lcd_outdezAtt(34*FW, y, luaGetCpuUsed(scriptIndex));
-          lcd_putc(34*FW, y, '%');
+          lcdDrawNumber(34*FW, y, luaGetCpuUsed(scriptIndex));
+          lcdDrawChar(34*FW, y, '%');
           break;
       }
       scriptIndex++;
@@ -179,6 +179,6 @@ void menuModelCustomScripts(uint8_t event)
     }
 
     // Script name
-    lcdDrawTextWithLen(16*FW, y, sd.name, sizeof(sd.name), ZCHAR);
+    lcdDrawSizedText(16*FW, y, sd.name, sizeof(sd.name), ZCHAR);
   }
 }
diff --git a/radio/src/gui/Taranis/menu_model_flightmodes.cpp b/radio/src/gui/Taranis/menu_model_flightmodes.cpp
index a693842c6..3a3554b0d 100644
--- a/radio/src/gui/Taranis/menu_model_flightmodes.cpp
+++ b/radio/src/gui/Taranis/menu_model_flightmodes.cpp
@@ -37,10 +37,10 @@
 
 void displayFlightModes(coord_t x, coord_t y, FlightModesType value)
 {
-  lcd_puts(x, y, STR_FP);
+  lcdDrawText(x, y, STR_FP);
   x = lcdNextPos + 1;
   for (uint8_t p=0; p<MAX_FLIGHT_MODES; p++) {
-    lcd_putc(x, y, ((value & (1<<p)) ? '-' : '0'+p));
+    lcdDrawChar(x, y, ((value & (1<<p)) ? '-' : '0'+p));
     x += 5;
   }
 }
@@ -141,12 +141,12 @@ void menuModelFlightModesAll(uint8_t event)
         }
 
         case ITEM_FLIGHT_MODES_FADE_IN:
-          lcd_outdezAtt(32*FW-2, y, (10/DELAY_STEP)*p->fadeIn, attr|PREC1);
+          lcdDrawNumber(32*FW-2, y, (10/DELAY_STEP)*p->fadeIn, attr|PREC1);
           if (active) p->fadeIn = checkIncDec(event, p->fadeIn, 0, DELAY_MAX, EE_MODEL|NO_INCDEC_MARKS);
           break;
 
         case ITEM_FLIGHT_MODES_FADE_OUT:
-          lcd_outdezAtt(35*FW, y, (10/DELAY_STEP)*p->fadeOut, attr|PREC1);
+          lcdDrawNumber(35*FW, y, (10/DELAY_STEP)*p->fadeOut, attr|PREC1);
           if (active) p->fadeOut = checkIncDec(event, p->fadeOut, 0, DELAY_MAX, EE_MODEL|NO_INCDEC_MARKS);
           break;
 
diff --git a/radio/src/gui/Taranis/menu_model_gvars.cpp b/radio/src/gui/Taranis/menu_model_gvars.cpp
index f37743cbb..19e7ab521 100644
--- a/radio/src/gui/Taranis/menu_model_gvars.cpp
+++ b/radio/src/gui/Taranis/menu_model_gvars.cpp
@@ -81,7 +81,7 @@ void menuModelGVars(uint8_t event)
     int i = l+s_pgOfs;
     coord_t y = MENU_HEADER_HEIGHT + 1 + l*FH;
 
-    if (g_model.gvars[i].popup) lcd_putc(3*FW, y, '!');
+    if (g_model.gvars[i].popup) lcdDrawChar(3*FW, y, '!');
     putsStrIdx(0, y, STR_GV, i+1, (sub==i && m_posHorz<0) ? INVERS : 0);
 
     for (int j=0; j<1+MAX_FLIGHT_MODES; j++) {
@@ -107,9 +107,9 @@ void menuModelGVars(uint8_t event)
           }
           else {
             if (abs(v) >= 100)
-              lcd_outdezAtt(x, y+1, v, attr | TINSIZE);
+              lcdDrawNumber(x, y+1, v, attr | TINSIZE);
             else
-              lcd_outdezAtt(x, y, v, attr);
+              lcdDrawNumber(x, y, v, attr);
             vmin = -GVAR_MAX; vmax = GVAR_MAX;
           }
           if (attr) {
diff --git a/radio/src/gui/Taranis/menu_model_heli.cpp b/radio/src/gui/Taranis/menu_model_heli.cpp
index 680a1bc17..fc17d9445 100644
--- a/radio/src/gui/Taranis/menu_model_heli.cpp
+++ b/radio/src/gui/Taranis/menu_model_heli.cpp
@@ -68,7 +68,7 @@ void menuModelHeli(uint8_t event)
 
       case ITEM_HELI_SWASHRING:
         lcd_putsLeft(y, STR_SWASHRING);
-        lcd_outdezAtt(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.value, LEFT|attr);
+        lcdDrawNumber(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.value, LEFT|attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.swashR.value, 100);
         break;
 
@@ -79,8 +79,8 @@ void menuModelHeli(uint8_t event)
         break;
 
       case ITEM_HELI_ELE_WEIGHT:
-        lcd_puts(INDENT_WIDTH, y, STR_WEIGHT);
-        lcd_outdezAtt(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.elevatorWeight,  LEFT|attr);
+        lcdDrawText(INDENT_WIDTH, y, STR_WEIGHT);
+        lcdDrawNumber(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.elevatorWeight,  LEFT|attr);
         if (attr) CHECK_INCDEC_MODELVAR(event, g_model.swashR.elevatorWeight, -100, 100);
         break;
 
@@ -91,8 +91,8 @@ void menuModelHeli(uint8_t event)
         break;
 
       case ITEM_HELI_AIL_WEIGHT:
-        lcd_puts(INDENT_WIDTH, y, STR_WEIGHT);
-        lcd_outdezAtt(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.aileronWeight,  LEFT|attr);
+        lcdDrawText(INDENT_WIDTH, y, STR_WEIGHT);
+        lcdDrawNumber(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.aileronWeight,  LEFT|attr);
         if (attr) CHECK_INCDEC_MODELVAR(event, g_model.swashR.aileronWeight, -100, 100);
         break;
 
@@ -103,8 +103,8 @@ void menuModelHeli(uint8_t event)
         break;
 
       case ITEM_HELI_COL_WEIGHT:
-        lcd_puts(INDENT_WIDTH, y, STR_WEIGHT);
-        lcd_outdezAtt(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.collectiveWeight,  LEFT|attr);
+        lcdDrawText(INDENT_WIDTH, y, STR_WEIGHT);
+        lcdDrawNumber(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.collectiveWeight,  LEFT|attr);
         if (attr) CHECK_INCDEC_MODELVAR(event, g_model.swashR.collectiveWeight, -100, 100);
         break;
 
diff --git a/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp b/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp
index fdeef244a..eeac85e66 100644
--- a/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp
+++ b/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp
@@ -404,12 +404,12 @@ void menuModelExpoOne(uint8_t event)
     if (ed->scale > 0) x512 = (x512 * 1024) / convertTelemValue(ed->srcRaw - MIXSRC_FIRST_TELEM + 1, ed->scale);
   }
   else {
-    lcd_outdezAtt(LCD_W-8, 6*FH, calcRESXto1000(x512), PREC1);
+    lcdDrawNumber(LCD_W-8, 6*FH, calcRESXto1000(x512), PREC1);
   }
   x512 = limit(-1024, x512, 1024);
   int y512 = expoFn(x512);
   y512 = limit(-1024, y512, 1024);
-  lcd_outdezAtt(LCD_W-8-6*FW, 1*FH, calcRESXto1000(y512), PREC1);
+  lcdDrawNumber(LCD_W-8-6*FW, 1*FH, calcRESXto1000(y512), PREC1);
 
   x512 = X0+x512/(RESX/WCHART);
   y512 = (LCD_H-1) - ((y512+RESX)/2) * (LCD_H-1) / RESX;
@@ -453,8 +453,8 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
   int barMin = offset - weight;
   int barMax = offset + weight;
   if (y > 15) {
-    lcd_outdezAtt(x-((barMin >= 0) ? 2 : 3), y-6, barMin, TINSIZE|LEFT);
-    lcd_outdezAtt(x+GAUGE_WIDTH+1, y-6, barMax, TINSIZE);
+    lcdDrawNumber(x-((barMin >= 0) ? 2 : 3), y-6, barMin, TINSIZE|LEFT);
+    lcdDrawNumber(x+GAUGE_WIDTH+1, y-6, barMax, TINSIZE);
   }
   if (barMin < -101)
     barMin = -101;
@@ -574,7 +574,7 @@ void menuModelMixOne(uint8_t event)
       case MIX_FIELD_WARNING:
         lcd_putsColumnLeft(COLUMN_X+MIXES_2ND_COLUMN, y, STR_MIXWARNING);
         if (md2->mixWarn)
-          lcd_outdezAtt(COLUMN_X+MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT);
+          lcdDrawNumber(COLUMN_X+MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT);
         else
           lcdDrawText(COLUMN_X+MIXES_2ND_COLUMN, y, STR_OFF, attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, md2->mixWarn, 3);
@@ -652,7 +652,7 @@ void displayHeaderChannelName(uint8_t ch)
 {
   uint8_t len = zlen(g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name));
   if (len) {
-    lcdDrawTextWithLen(80, 1, g_model.limitData[ch].name, len, ZCHAR|SMLSIZE);
+    lcdDrawSizedText(80, 1, g_model.limitData[ch].name, len, ZCHAR|SMLSIZE);
   }
 }
 
@@ -668,7 +668,7 @@ void displayMixInfos(coord_t y, MixData *md)
 void displayMixLine(coord_t y, MixData *md)
 {
   if (md->name[0])
-    lcdDrawTextWithLen(EXPO_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
+    lcdDrawSizedText(EXPO_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
   if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1)))
     displayMixInfos(y, md);
   else
@@ -686,7 +686,7 @@ void displayExpoLine(coord_t y, ExpoData *ed)
   putsMixerSource(EXPO_LINE_SRC_POS, y, ed->srcRaw, 0);
 
   if (ed->carryTrim != TRIM_ON) {
-    lcd_putc(EXPO_LINE_TRIM_POS, y, ed->carryTrim > 0 ? '-' : STR_RETA123[-ed->carryTrim]);
+    lcdDrawChar(EXPO_LINE_TRIM_POS, y, ed->carryTrim > 0 ? '-' : STR_RETA123[-ed->carryTrim]);
   }
 
   if (!ed->flightModes || ((ed->curve.value || ed->swtch) && ((get_tmr10ms() / 200) & 1)))
@@ -695,7 +695,7 @@ void displayExpoLine(coord_t y, ExpoData *ed)
     displayFlightModes(EXPO_LINE_FM_POS, y, ed->flightModes);
 
   if (ed->name[0]) {
-    lcdDrawTextWithLen(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR);
+    lcdDrawSizedText(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR);
   }
 }
 
@@ -831,13 +831,13 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
   }
 
   if (expo) {
-    lcd_outdezAtt(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, getExpoMixCount(true));
-    lcd_puts(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, STR_MAX(MAX_EXPOS));
+    lcdDrawNumber(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, getExpoMixCount(true));
+    lcdDrawText(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, STR_MAX(MAX_EXPOS));
 
     // Value
     uint8_t index = expoAddress(s_currIdx)->chn;
     if (!s_currCh) {
-      lcd_outdezAtt(127, 2, calcRESXto1000(anas[index]), PREC1|TINSIZE);
+      lcdDrawNumber(127, 2, calcRESXto1000(anas[index]), PREC1|TINSIZE);
     }
 
     SIMPLE_MENU(STR_MENUINPUTS, menuTabModel, e_InputsAll, s_maxLines);
@@ -848,14 +848,14 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
     }
   }
   else {
-    lcd_outdezAtt(FW*sizeof(TR_MIXER)+FW+FW/2, 0, getExpoMixCount(false));
-    lcd_puts(FW*sizeof(TR_MIXER)+FW+FW/2, 0, STR_MAX(MAX_MIXERS));
+    lcdDrawNumber(FW*sizeof(TR_MIXER)+FW+FW/2, 0, getExpoMixCount(false));
+    lcdDrawText(FW*sizeof(TR_MIXER)+FW+FW/2, 0, STR_MAX(MAX_MIXERS));
 
     // Value
     uint8_t index = mixAddress(s_currIdx)->destCh;
     if (!s_currCh) {
       displayHeaderChannelName(index);
-      lcd_outdezAtt(127, 2, calcRESXto1000(ex_chans[index]), PREC1|TINSIZE);
+      lcdDrawNumber(127, 2, calcRESXto1000(ex_chans[index]), PREC1|TINSIZE);
     }
 
     SIMPLE_MENU(STR_MIXER, menuTabModel, e_MixAll, s_maxLines);
@@ -904,7 +904,7 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
             GVAR_MENU_ITEM(EXPO_LINE_WEIGHT_POS, y, ed->weight, MIN_EXPO_WEIGHT, 100, attr | (isExpoActive(i) ? BOLD : 0), 0, 0);
             displayExpoLine(y, ed);
             if (ed->mode!=3) {
-              lcd_putc(EXPO_LINE_SIDE_POS, y, ed->mode == 2 ? 126 : 127);
+              lcdDrawChar(EXPO_LINE_SIDE_POS, y, ed->mode == 2 ? 126 : 127);
             }
           }
           else {
@@ -921,7 +921,7 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
               cs = 'S';
             if (md->delayUp || md->delayDown)
               cs = (cs =='S' ? '*' : 'D');
-            lcd_putc(MIX_LINE_DELAY_POS, y, cs);
+            lcdDrawChar(MIX_LINE_DELAY_POS, y, cs);
           }
           if (s_copyMode) {
             if ((s_copyMode==COPY_MODE || s_copyTgtOfs == 0) && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
diff --git a/radio/src/gui/Taranis/menu_model_limits.cpp b/radio/src/gui/Taranis/menu_model_limits.cpp
index 0cdc8fbc3..a348d4fd6 100644
--- a/radio/src/gui/Taranis/menu_model_limits.cpp
+++ b/radio/src/gui/Taranis/menu_model_limits.cpp
@@ -119,10 +119,10 @@ void menuModelLimits(uint8_t event)
 
   if (sub < NUM_CHNOUT) {
 #if defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_UNIT_US)
-    lcd_outdezAtt(13*FW, 0, PPM_CH_CENTER(sub)+channelOutputs[sub]/2, 0);
-    lcd_puts(13*FW, 0, STR_US);
+    lcdDrawNumber(13*FW, 0, PPM_CH_CENTER(sub)+channelOutputs[sub]/2, 0);
+    lcdDrawText(13*FW, 0, STR_US);
 #else
-    lcd_outdezAtt(13*FW, 0, calcRESXto1000(channelOutputs[sub]), PREC1);
+    lcdDrawNumber(13*FW, 0, calcRESXto1000(channelOutputs[sub]), PREC1);
 #endif
   }
 
@@ -164,7 +164,7 @@ void menuModelLimits(uint8_t event)
     char swVal = '-';  // '-', '<', '>'
     if ((channelOutputs[k] - v) > 50) swVal = (ld->revert ? 127 : 126); // Switch to raw inputs?  - remove trim!
     if ((channelOutputs[k] - v) < -50) swVal = (ld->revert ? 126 : 127);
-    lcd_putc(LIMITS_DIRECTION_POS, y, swVal);
+    lcdDrawChar(LIMITS_DIRECTION_POS, y, swVal);
 
     int limit = (g_model.extendedLimits ? LIMIT_EXT_MAX : 1000);
 
@@ -194,9 +194,9 @@ void menuModelLimits(uint8_t event)
           }
 
 #if defined(PPM_UNIT_US)
-          lcd_outdezAtt(LIMITS_OFFSET_POS, y, ((int32_t)ld->offset*128) / 25, attr|PREC1);
+          lcdDrawNumber(LIMITS_OFFSET_POS, y, ((int32_t)ld->offset*128) / 25, attr|PREC1);
 #else
-          lcd_outdezAtt(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1);
+          lcdDrawNumber(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1);
 #endif
           if (active) {
             ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL, NULL, stops1000);
@@ -212,7 +212,7 @@ void menuModelLimits(uint8_t event)
             ld->min = GVAR_MENU_ITEM(LIMITS_MIN_POS, y, ld->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, MIN_MAX_ATTR, 0, event);
             break;
           }
-          lcd_outdezAtt(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
+          lcdDrawNumber(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
           if (active) ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, NULL, stops1000);
           break;
 
@@ -221,7 +221,7 @@ void menuModelLimits(uint8_t event)
             ld->max = GVAR_MENU_ITEM(LIMITS_MAX_POS, y, ld->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, MIN_MAX_ATTR, 0, event);
             break;
           }
-          lcd_outdezAtt(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
+          lcdDrawNumber(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
           if (active) ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, NULL, stops1000);
           break;
 
@@ -260,7 +260,7 @@ void menuModelLimits(uint8_t event)
 
 #if defined(PPM_CENTER_ADJUSTABLE)
         case ITEM_LIMITS_PPM_CENTER:
-          lcd_outdezAtt(LIMITS_PPM_CENTER_POS, y, PPM_CENTER+ld->ppmCenter, attr);
+          lcdDrawNumber(LIMITS_PPM_CENTER_POS, y, PPM_CENTER+ld->ppmCenter, attr);
           if (active) {
             CHECK_INCDEC_MODELVAR(event, ld->ppmCenter, -PPM_CENTER_MAX, +PPM_CENTER_MAX);
           }
diff --git a/radio/src/gui/Taranis/menu_model_logical_switches.cpp b/radio/src/gui/Taranis/menu_model_logical_switches.cpp
index 64c825047..161c24242 100644
--- a/radio/src/gui/Taranis/menu_model_logical_switches.cpp
+++ b/radio/src/gui/Taranis/menu_model_logical_switches.cpp
@@ -61,16 +61,16 @@ enum LogicalSwitchFields {
 
 void putsEdgeDelayParam(coord_t x, coord_t y, LogicalSwitchData *cs, uint8_t lattr, uint8_t rattr)
 {
-  lcd_putc(x-4, y, '[');
-  lcd_outdezAtt(x, y, lswTimerValue(cs->v2), LEFT|PREC1|lattr);
-  lcd_putc(lcdLastPos, y, ':');
+  lcdDrawChar(x-4, y, '[');
+  lcdDrawNumber(x, y, lswTimerValue(cs->v2), LEFT|PREC1|lattr);
+  lcdDrawChar(lcdLastPos, y, ':');
   if (cs->v3 < 0)
     lcdDrawText(lcdLastPos+3, y, "<<", rattr);
   else if (cs->v3 == 0)
     lcdDrawText(lcdLastPos+3, y, "--", rattr);
   else
-    lcd_outdezAtt(lcdLastPos+3, y, lswTimerValue(cs->v2+cs->v3), LEFT|PREC1|rattr);
-  lcd_putc(lcdLastPos, y, ']');
+    lcdDrawNumber(lcdLastPos+3, y, lswTimerValue(cs->v2+cs->v3), LEFT|PREC1|rattr);
+  lcdDrawChar(lcdLastPos, y, ']');
 }
 
 void onLogicalSwitchesMenu(const char *result)
@@ -170,8 +170,8 @@ void menuModelLogicalSwitches(uint8_t event)
       INCDEC_ENABLE_CHECK(isSourceAvailable);
     }
     else if (cstate == LS_FAMILY_TIMER) {
-      lcd_outdezAtt(CSW_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1|attr1);
-      lcd_outdezAtt(CSW_3RD_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1|attr2);
+      lcdDrawNumber(CSW_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1|attr1);
+      lcdDrawNumber(CSW_3RD_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1|attr2);
       v1_min = v2_min = -128;
       v1_max = v2_max = 122;
       INCDEC_SET_FLAG(EE_MODEL);
@@ -203,19 +203,19 @@ void menuModelLogicalSwitches(uint8_t event)
 
     // CSW duration
     if (cs->duration > 0)
-      lcd_outdezAtt(CSW_5TH_COLUMN, y, cs->duration, (horz==LS_FIELD_DURATION ? attr : 0)|PREC1|LEFT);
+      lcdDrawNumber(CSW_5TH_COLUMN, y, cs->duration, (horz==LS_FIELD_DURATION ? attr : 0)|PREC1|LEFT);
     else
       lcdDrawTextAtIndex(CSW_5TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DURATION ? attr : 0);
 
     // CSW delay
     if (cstate == LS_FAMILY_EDGE) {
-      lcd_puts(CSW_6TH_COLUMN, y, STR_NA);
+      lcdDrawText(CSW_6TH_COLUMN, y, STR_NA);
       if (attr && horz == LS_FIELD_DELAY) {
         REPEAT_LAST_CURSOR_MOVE();
       }
     }
     else if (cs->delay > 0) {
-      lcd_outdezAtt(CSW_6TH_COLUMN, y, cs->delay, (horz==LS_FIELD_DELAY ? attr : 0)|PREC1|LEFT);
+      lcdDrawNumber(CSW_6TH_COLUMN, y, cs->delay, (horz==LS_FIELD_DELAY ? attr : 0)|PREC1|LEFT);
     }
     else {
       lcdDrawTextAtIndex(CSW_6TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DELAY ? attr : 0);
diff --git a/radio/src/gui/Taranis/menu_model_select.cpp b/radio/src/gui/Taranis/menu_model_select.cpp
index 51fed8573..def50fb74 100644
--- a/radio/src/gui/Taranis/menu_model_select.cpp
+++ b/radio/src/gui/Taranis/menu_model_select.cpp
@@ -236,9 +236,9 @@ void menuModelSelect(uint8_t event)
         break;
   }
 
-  lcd_puts(27*FW-(LEN_FREE-4)*FW, 0, STR_FREE);
-  lcd_outdezAtt(20*FW, 0, EeFsGetFree(), 0);
-  lcd_puts(21*FW, 0, STR_BYTES);
+  lcdDrawText(27*FW-(LEN_FREE-4)*FW, 0, STR_FREE);
+  lcdDrawNumber(20*FW, 0, EeFsGetFree(), 0);
+  lcdDrawText(21*FW, 0, STR_BYTES);
 
   displayScreenIndex(e_ModelSelect, DIM(menuTabModel), 0);
   lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
@@ -249,13 +249,13 @@ void menuModelSelect(uint8_t event)
     coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
     uint8_t k = i+s_pgOfs;
 
-    lcd_outdezNAtt(3*FW+2, y, k+1, LEADING0+((!s_copyMode && sub==k) ? INVERS : 0), 2);
+    lcdDrawNumber(3*FW+2, y, k+1, LEADING0+((!s_copyMode && sub==k) ? INVERS : 0), 2);
 
     if (s_copyMode == MOVE_MODE || (s_copyMode == COPY_MODE && s_copySrcRow >= 0)) {
       if (k == sub) {
         if (s_copyMode == COPY_MODE) {
           k = s_copySrcRow;
-          lcd_putc(MODELSEL_W-FW, y, '+');
+          lcdDrawChar(MODELSEL_W-FW, y, '+');
         }
         else {
           k = sub + s_copyTgtOfs;
@@ -271,9 +271,9 @@ void menuModelSelect(uint8_t event)
 
     if (eeModelExists(k)) {
       putsModelName(4*FW, y, modelHeaders[k].name, k, 0);
-      lcd_outdezAtt(20*FW, y, eeModelSize(k), 0);
+      lcdDrawNumber(20*FW, y, eeModelSize(k), 0);
       if (k==g_eeGeneral.currModel && (s_copyMode!=COPY_MODE || s_copySrcRow<0 || i+s_pgOfs!=(vertpos_t)sub))
-        lcd_putc(1, y, '*');
+        lcdDrawChar(1, y, '*');
     }
 
     if (s_copyMode && (vertpos_t)sub==i+s_pgOfs) {
diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp
index a90afa198..29ec44e5d 100644
--- a/radio/src/gui/Taranis/menu_model_setup.cpp
+++ b/radio/src/gui/Taranis/menu_model_setup.cpp
@@ -299,7 +299,7 @@ void menuModelSetup(uint8_t event)
       case ITEM_MODEL_BITMAP:
         lcd_putsLeft(y, STR_BITMAP);
         if (ZEXIST(g_model.header.bitmap))
-          lcdDrawTextWithLen(MODEL_SETUP_2ND_COLUMN, y, g_model.header.bitmap, sizeof(g_model.header.bitmap), attr);
+          lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.header.bitmap, sizeof(g_model.header.bitmap), attr);
         else
           lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VCSWFUNC, 0, attr);
         if (attr && event==EVT_KEY_BREAK(KEY_ENTER) && READ_ONLY_UNLOCKED()) {
@@ -514,7 +514,7 @@ void menuModelSetup(uint8_t event)
             uint8_t swactive = !(g_model.switchWarningEnable & (1<<i));
             c = "\300-\301"[states & 0x03];
             lcdDrawChar(MODEL_SETUP_2ND_COLUMN+qr.rem*(2*FW+1), y+FH*qr.quot, 'A'+i, line && (m_posHorz==current) ? INVERS : 0);
-            if (swactive) lcd_putc(lcdNextPos, y+FH*qr.quot, c);
+            if (swactive) lcdDrawChar(lcdNextPos, y+FH*qr.quot, c);
             ++current;
           }
           states >>= 2;
@@ -585,7 +585,7 @@ void menuModelSetup(uint8_t event)
               }
 
               // TODO add a new function
-              lcdDrawTextWithLen(x, y, STR_VSRCRAW+2+STR_VSRCRAW[0]*(NUM_STICKS+1+i), STR_VSRCRAW[0]-1, flags & ~(BSS|ZCHAR));
+              lcdDrawSizedText(x, y, STR_VSRCRAW+2+STR_VSRCRAW[0]*(NUM_STICKS+1+i), STR_VSRCRAW[0]-1, flags & ~(BSS|ZCHAR));
               x = lcdNextPos+3;
             }
           }
@@ -723,9 +723,9 @@ void menuModelSetup(uint8_t event)
         lcd_putsLeft(y, STR_CHANNELRANGE);
         if ((int8_t)PORT_CHANNELS_ROWS(moduleIdx) >= 0) {
           lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CH, m_posHorz==0 ? attr : 0);
-          lcd_outdezAtt(lcdLastPos, y, moduleData.channelsStart+1, LEFT | (m_posHorz==0 ? attr : 0));
-          lcd_putc(lcdLastPos, y, '-');
-          lcd_outdezAtt(lcdLastPos + FW+1, y, moduleData.channelsStart+NUM_CHANNELS(moduleIdx), LEFT | (m_posHorz==1 ? attr : 0));
+          lcdDrawNumber(lcdLastPos, y, moduleData.channelsStart+1, LEFT | (m_posHorz==0 ? attr : 0));
+          lcdDrawChar(lcdLastPos, y, '-');
+          lcdDrawNumber(lcdLastPos + FW+1, y, moduleData.channelsStart+NUM_CHANNELS(moduleIdx), LEFT | (m_posHorz==1 ? attr : 0));
           if (attr && s_editMode>0) {
             switch (m_posHorz) {
               case 0:
@@ -758,10 +758,10 @@ void menuModelSetup(uint8_t event)
         ModuleData & moduleData = g_model.moduleData[moduleIdx];
         if (IS_MODULE_PPM(moduleIdx)) {
           lcd_putsLeft(y, STR_PPMFRAME);
-          lcd_puts(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
-          lcd_putc(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (moduleData.ppmDelay*50)+300, (CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0);
+          lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
+          lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
+          lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (moduleData.ppmDelay*50)+300, (CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0);
           lcdDrawChar(MODEL_SETUP_2ND_COLUMN+10*FW, y, moduleData.ppmPulsePol ? '+' : '-', (CURSOR_ON_LINE() || m_posHorz==2) ? attr : 0);
 
           if (attr && s_editMode>0) {
@@ -790,7 +790,7 @@ void menuModelSetup(uint8_t event)
             lcd_putsLeft(y, STR_RXNUM);
           }
           if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx)) {
-            if (xOffsetBind) lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
+            if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
             if (attr && l_posHorz==0) {
               if (s_editMode>0) {
                 CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], IS_MODULE_DSM2(moduleIdx) ? 20 : 63);
@@ -857,7 +857,7 @@ void menuModelSetup(uint8_t event)
 #if defined(PXX)
   if (IS_RANGECHECK_ENABLE()) {
     displayPopup("RSSI: ");
-    lcd_outdezAtt(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD);
+    lcdDrawNumber(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD);
   }
 #endif
 }
@@ -931,7 +931,7 @@ void menuModelFailsafe(uint8_t event)
         }
 
         if (lenLabel > 0)
-          lcdDrawTextWithLen(x+1-ofs, y, g_model.limitData[ch+channelStart].name, sizeof(g_model.limitData[ch+channelStart].name), ZCHAR | SMLSIZE);
+          lcdDrawSizedText(x+1-ofs, y, g_model.limitData[ch+channelStart].name, sizeof(g_model.limitData[ch+channelStart].name), ZCHAR | SMLSIZE);
         else
           putsChn(x+1-ofs, y, ch+1, SMLSIZE);
 
@@ -966,11 +966,11 @@ void menuModelFailsafe(uint8_t event)
         }
         else {
 #if defined(PPM_UNIT_US)
-          lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+failsafeValue/2, flags);
+          lcdDrawNumber(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+failsafeValue/2, flags);
 #elif defined(PPM_UNIT_PERCENT_PREC1)
-          lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue), PREC1|flags);
+          lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue), PREC1|flags);
 #else
-          lcd_outdezAtt(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue)/10, flags);
+          lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue)/10, flags);
 #endif
         }
   
diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp
index 0c48ef463..0cd2d810b 100644
--- a/radio/src/gui/Taranis/menu_model_telemetry.cpp
+++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp
@@ -220,7 +220,7 @@ void menuModelSensor(uint8_t event)
   TelemetrySensor * sensor = &g_model.telemetrySensors[s_currIdx];
 
   SUBMENU(STR_MENUSENSOR, SENSOR_FIELD_MAX, { 0, 0, sensor->type == TELEM_TYPE_CALCULATED ? (uint8_t)0 : (uint8_t)1, SENSOR_UNIT_ROWS, SENSOR_PREC_ROWS, SENSOR_PARAM1_ROWS, SENSOR_PARAM2_ROWS, SENSOR_PARAM3_ROWS, SENSOR_PARAM4_ROWS, SENSOR_AUTOOFFSET_ROWS, SENSOR_ONLYPOS_ROWS, SENSOR_FILTER_ROWS, SENSOR_PERSISTENT_ROWS, 0 });
-  lcd_outdezAtt(PSIZE(TR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
+  lcdDrawNumber(PSIZE(TR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
 
   putsTelemetryChannelValue(SENSOR_2ND_COLUMN, 0, s_currIdx, getValue(MIXSRC_FIRST_TELEM+3*s_currIdx), LEFT);
 
@@ -261,8 +261,8 @@ void menuModelSensor(uint8_t event)
       case SENSOR_FIELD_ID:
         if (sensor->type == TELEM_TYPE_CUSTOM) {
           lcd_putsLeft(y, STR_ID);
-          lcd_outhex4(SENSOR_2ND_COLUMN, y, sensor->id, LEFT|(m_posHorz==0 ? attr : 0));
-          lcd_outdezAtt(SENSOR_3RD_COLUMN, y, sensor->instance, LEFT|(m_posHorz==1 ? attr : 0));
+          lcdDrawHexNumber(SENSOR_2ND_COLUMN, y, sensor->id, LEFT|(m_posHorz==0 ? attr : 0));
+          lcdDrawNumber(SENSOR_3RD_COLUMN, y, sensor->instance, LEFT|(m_posHorz==1 ? attr : 0));
           if (attr) {
             switch (m_posHorz) {
               case 0:
@@ -356,7 +356,7 @@ void menuModelSensor(uint8_t event)
           if (sensor->unit == UNIT_RPMS) {
             lcd_putsLeft(y, NO_INDENT(STR_BLADES));
             if (attr) sensor->custom.ratio = checkIncDec(event, sensor->custom.ratio, 1, 30000, EE_MODEL|NO_INCDEC_MARKS|INCDEC_REP10);
-            lcd_outdezAtt(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr);
+            lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr);
             break;
           }
           else {
@@ -365,7 +365,7 @@ void menuModelSensor(uint8_t event)
             if (sensor->custom.ratio == 0)
               lcdDrawChar(SENSOR_2ND_COLUMN, y, '-', attr);
             else
-              lcd_outdezAtt(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr|PREC1);
+              lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.ratio, LEFT|attr|PREC1);
             break;
           }
         }
@@ -389,14 +389,14 @@ void menuModelSensor(uint8_t event)
         else if (sensor->unit == UNIT_RPMS) {
           lcd_putsLeft(y, STR_MULTIPLIER);
           if (attr) sensor->custom.offset = checkIncDec(event, sensor->custom.offset, 1, 30000, EE_MODEL|NO_INCDEC_MARKS|INCDEC_REP10);
-          lcd_outdezAtt(SENSOR_2ND_COLUMN, y, sensor->custom.offset, LEFT|attr);
+          lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.offset, LEFT|attr);
           break;
         }
         else {
           lcd_putsLeft(y, NO_INDENT(STR_OFFSET));
           if (attr) sensor->custom.offset = checkIncDec(event, sensor->custom.offset, -30000, +30000, EE_MODEL|NO_INCDEC_MARKS|INCDEC_REP10);
           if (sensor->prec > 0) attr |= (sensor->prec == 2 ? PREC2 : PREC1);
-          lcd_outdezAtt(SENSOR_2ND_COLUMN, y, sensor->custom.offset, LEFT|attr);
+          lcdDrawNumber(SENSOR_2ND_COLUMN, y, sensor->custom.offset, LEFT|attr);
           break;
         }
         // no break
@@ -530,26 +530,26 @@ void menuModelTelemetry(uint8_t event)
 
     if (k>=ITEM_TELEMETRY_SENSOR1 && k<ITEM_TELEMETRY_SENSOR1+MAX_SENSORS) {
       int index = k-ITEM_TELEMETRY_SENSOR1;
-      lcd_outdezAtt(INDENT_WIDTH, y, index+1, LEFT|attr);
+      lcdDrawNumber(INDENT_WIDTH, y, index+1, LEFT|attr);
       lcdDrawChar(lcdLastPos, y, ':', attr);
-      lcdDrawTextWithLen(3*FW, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR);
+      lcdDrawSizedText(3*FW, y, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN, ZCHAR);
       if (telemetryItems[index].isFresh()) {
-        lcd_putc(10*FW, y, '*');
+        lcdDrawChar(10*FW, y, '*');
       }
       TelemetryItem & telemetryItem = telemetryItems[index];
       if (telemetryItem.isAvailable()) {
         bool isOld = telemetryItem.isOld();
         lcdNextPos = TELEM_COL2;
-        if (isOld) lcd_putc(lcdNextPos, y, '[');
+        if (isOld) lcdDrawChar(lcdNextPos, y, '[');
         putsTelemetryChannelValue(lcdNextPos, y, index, getValue(MIXSRC_FIRST_TELEM+3*index), LEFT);
-        if (isOld) lcd_putc(lcdLastPos, y, ']');
+        if (isOld) lcdDrawChar(lcdLastPos, y, ']');
       }
       else {
         lcdDrawText(TELEM_COL2, y, "---", 0); // TODO shortcut
       }
       TelemetrySensor * sensor = & g_model.telemetrySensors[index];
       if (sensor->type == TELEM_TYPE_CUSTOM && !g_model.ignoreSensorIds) {
-        lcd_outdezAtt(TELEM_COL3, y, sensor->instance, LEFT);
+        lcdDrawNumber(TELEM_COL3, y, sensor->instance, LEFT);
       }
       if (attr) {
         s_editMode = 0;
@@ -626,7 +626,7 @@ void menuModelTelemetry(uint8_t event)
       case ITEM_TELEMETRY_RSSI_ALARM2: {
         uint8_t alarm = k-ITEM_TELEMETRY_RSSI_ALARM1;
         lcd_putsLeft(y, (alarm==0 ? STR_LOWALARM : STR_CRITICALALARM));
-        lcd_outdezNAtt(TELEM_COL2, y, getRssiAlarmValue(alarm), LEFT|attr, 3);
+        lcdDrawNumber(TELEM_COL2, y, getRssiAlarmValue(alarm), LEFT|attr, 3);
         if (attr && s_editMode>0) {
           CHECK_INCDEC_MODELVAR(event, g_model.frsky.rssiAlarms[alarm].value, -30, 30);
         }
@@ -648,8 +648,8 @@ void menuModelTelemetry(uint8_t event)
 
       case ITEM_TELEMETRY_VARIO_RANGE:
         lcd_putsLeft(y, STR_RANGE);
-        lcd_outdezAtt(TELEM_COL2, y, -10+g_model.frsky.varioMin, (m_posHorz==0 ? attr : 0)|LEFT);
-        lcd_outdezAtt(TELEM_COL2+7*FW, y, 10+g_model.frsky.varioMax, (m_posHorz==1 ? attr : 0)|LEFT);
+        lcdDrawNumber(TELEM_COL2, y, -10+g_model.frsky.varioMin, (m_posHorz==0 ? attr : 0)|LEFT);
+        lcdDrawNumber(TELEM_COL2+7*FW, y, 10+g_model.frsky.varioMax, (m_posHorz==1 ? attr : 0)|LEFT);
         if (attr && s_editMode>0) {
           switch (m_posHorz) {
             case 0:
@@ -664,8 +664,8 @@ void menuModelTelemetry(uint8_t event)
 
       case ITEM_TELEMETRY_VARIO_CENTER:
         lcd_putsLeft(y, STR_CENTER);
-        lcd_outdezAtt(TELEM_COL2, y, -5+g_model.frsky.varioCenterMin, (m_posHorz==0 ? attr : 0)|PREC1|LEFT);
-        lcd_outdezAtt(TELEM_COL2+7*FW, y, 5+g_model.frsky.varioCenterMax, (m_posHorz==1 ? attr : 0)|PREC1|LEFT);
+        lcdDrawNumber(TELEM_COL2, y, -5+g_model.frsky.varioCenterMin, (m_posHorz==0 ? attr : 0)|PREC1|LEFT);
+        lcdDrawNumber(TELEM_COL2+7*FW, y, 5+g_model.frsky.varioCenterMax, (m_posHorz==1 ? attr : 0)|PREC1|LEFT);
         lcdDrawTextAtIndex(TELEM_COL3, y, STR_VVARIOCENTER, g_model.frsky.varioCenterSilent, (m_posHorz==2 ? attr : 0));
         if (attr && s_editMode>0) {
           switch (m_posHorz) {
@@ -723,7 +723,7 @@ void menuModelTelemetry(uint8_t event)
           // TODO better function name for ---
           // TODO function for these lines
           if (ZEXIST(scriptData.file))
-            lcdDrawTextWithLen(TELEM_SCRTYPE_COL+7*FW, y, scriptData.file, sizeof(scriptData.file), (m_posHorz==1 ? attr : 0));
+            lcdDrawSizedText(TELEM_SCRTYPE_COL+7*FW, y, scriptData.file, sizeof(scriptData.file), (m_posHorz==1 ? attr : 0));
           else
             lcdDrawTextAtIndex(TELEM_SCRTYPE_COL+7*FW, y, STR_VCSWFUNC, 0, (m_posHorz==1 ? attr : 0));
 
diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h
index 4e601145d..8a7717a65 100644
--- a/radio/src/gui/Taranis/menus.h
+++ b/radio/src/gui/Taranis/menus.h
@@ -47,7 +47,7 @@
 
 #define MENUS_SCROLLBAR_WIDTH          2
 #define MENU_COLUMN2_X                 (8 + LCD_W / 2)
-#define lcd_putsColumnLeft(x, y, str)  lcd_puts((x > (LCD_W-10*FW-MENUS_SCROLLBAR_WIDTH)) ? MENU_COLUMN2_X : 0, y, str)
+#define lcd_putsColumnLeft(x, y, str)  lcdDrawText((x > (LCD_W-10*FW-MENUS_SCROLLBAR_WIDTH)) ? MENU_COLUMN2_X : 0, y, str)
 
 // Menus related stuff ...
 typedef uint16_t vertpos_t;
@@ -260,7 +260,7 @@ swsrc_t switchMenuItem(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, uint8
   #define displayGVar(x, y, v, min, max) GVAR_MENU_ITEM(x, y, v, min, max, 0, 0, 0)
 #else
   int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event);
-  #define displayGVar(x, y, v, min, max) lcd_outdez8(x, y, v)
+  #define displayGVar(x, y, v, min, max) lcdDraw8bitsNumber(x, y, v)
 #endif
 
 void editName(coord_t x, coord_t y, char *name, uint8_t size, uint8_t event, uint8_t active, uint8_t attr=ZCHAR);
diff --git a/radio/src/gui/Taranis/popups.cpp b/radio/src/gui/Taranis/popups.cpp
index 959f81545..51cf37a5a 100644
--- a/radio/src/gui/Taranis/popups.cpp
+++ b/radio/src/gui/Taranis/popups.cpp
@@ -58,7 +58,7 @@ void displayBox(const char *title)
 {
   lcdDrawFilledRect(10, 16, LCD_W-20, 40, SOLID, ERASE);
   lcdDrawRect(10, 16, LCD_W-20, 40);
-  lcd_putsn(WARNING_LINE_X, WARNING_LINE_Y, title, WARNING_LINE_LEN);
+  lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, title, WARNING_LINE_LEN);
   // could be a place for a s_warning_info
 }
 
@@ -84,9 +84,9 @@ void message(const pm_char *title, const pm_char *t, const char *last MESSAGE_SO
 #endif
 
   lcdDrawFilledRect(MESSAGE_LCD_OFFSET, 0, LCD_W-MESSAGE_LCD_OFFSET, 32);
-  if (t) lcd_puts(MESSAGE_LCD_OFFSET, 5*FH, t);
+  if (t) lcdDrawText(MESSAGE_LCD_OFFSET, 5*FH, t);
   if (last) {
-    lcd_puts(MESSAGE_LCD_OFFSET, 7*FH, last);
+    lcdDrawText(MESSAGE_LCD_OFFSET, 7*FH, last);
     AUDIO_ERROR_MESSAGE(sound);
   }
 
@@ -102,9 +102,9 @@ void displayWarning(uint8_t event)
   s_warning_result = false;
   displayBox(s_warning);
   if (s_warning_info) {
-    lcdDrawTextWithLen(WARNING_LINE_X, WARNING_LINE_Y+FH, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS);
+    lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS);
   }
-  lcd_puts(WARNING_LINE_X, WARNING_LINE_Y+2*FH, s_warning_type == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS);
+  lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, s_warning_type == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS);
   switch (event) {
     case EVT_KEY_BREAK(KEY_ENTER):
       if (s_warning_type == WARNING_TYPE_ASTERISK)
diff --git a/radio/src/gui/Taranis/splash.cpp b/radio/src/gui/Taranis/splash.cpp
index 9468a449e..45b5548a7 100644
--- a/radio/src/gui/Taranis/splash.cpp
+++ b/radio/src/gui/Taranis/splash.cpp
@@ -51,7 +51,7 @@ void displaySplash()
 #if MENUS_LOCK == 1
   if (readonly == false) {
     lcdDrawFilledRect((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 - 9, 50, (sizeof(TR_UNLOCKED)-1)*FW+16, 11, SOLID, ERASE|ROUND);
-    lcd_puts((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 , 53, STR_UNLOCKED);
+    lcdDrawText((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 , 53, STR_UNLOCKED);
   }
 #endif
 
diff --git a/radio/src/gui/Taranis/view_channels.cpp b/radio/src/gui/Taranis/view_channels.cpp
index a2012c505..7b0dd7784 100644
--- a/radio/src/gui/Taranis/view_channels.cpp
+++ b/radio/src/gui/Taranis/view_channels.cpp
@@ -100,20 +100,20 @@ void menuChannelsView(uint8_t event)
       }
 
       if (lenLabel > 0)
-        lcdDrawTextWithLen(x+1-ofs, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE);
+        lcdDrawSizedText(x+1-ofs, y, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR | SMLSIZE);
       else
         putsChn(x+1-ofs, y, ch+1, SMLSIZE);
 
       // Value
 #if defined(PPM_UNIT_US)
       uint8_t wbar = (longNames ? 54 : 64);
-      lcd_outdezAtt(x+LCD_W/2-3-wbar-ofs, y+1, PPM_CH_CENTER(ch)+val/2, TINSIZE);
+      lcdDrawNumber(x+LCD_W/2-3-wbar-ofs, y+1, PPM_CH_CENTER(ch)+val/2, TINSIZE);
 #elif defined(PPM_UNIT_PERCENT_PREC1)
       uint8_t wbar = (longNames ? 48 : 58);
-      lcd_outdezAtt(x+LCD_W/2-3-wbar-ofs, y+1, calcRESXto1000(val), PREC1|TINSIZE);
+      lcdDrawNumber(x+LCD_W/2-3-wbar-ofs, y+1, calcRESXto1000(val), PREC1|TINSIZE);
 #else
       uint8_t wbar = (longNames ? 54 : 64);
-      lcd_outdezAtt(x+LCD_W/2-3-wbar-ofs, y+1, calcRESXto1000(val)/10, TINSIZE); // G: Don't like the decimal part*
+      lcdDrawNumber(x+LCD_W/2-3-wbar-ofs, y+1, calcRESXto1000(val)/10, TINSIZE); // G: Don't like the decimal part*
 #endif
 
       // Gauge
diff --git a/radio/src/gui/Taranis/view_main.cpp b/radio/src/gui/Taranis/view_main.cpp
index 8ac66dabb..935cc3e1a 100644
--- a/radio/src/gui/Taranis/view_main.cpp
+++ b/radio/src/gui/Taranis/view_main.cpp
@@ -146,7 +146,7 @@ void displayTrims(uint8_t phase)
       }
       if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && trim != 0) {
         if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || (trimsDisplayTimer > 0 && (trimsDisplayMask & (1<<i)))) {
-          lcd_outdezAtt(trim>0 ? 22 : 54, xm-2, -abs(trim), TINSIZE|VERTICAL);
+          lcdDrawNumber(trim>0 ? 22 : 54, xm-2, -abs(trim), TINSIZE|VERTICAL);
         }
       }
     }
@@ -168,7 +168,7 @@ void displayTrims(uint8_t phase)
       }
       if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && trim != 0) {
         if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || (trimsDisplayTimer > 0 && (trimsDisplayMask & (1<<i)))) {
-          lcd_outdezAtt((stickIndex==0 ? TRIM_LH_X : TRIM_RH_X)+(trim>0 ? -11 : 20), ym-2, -abs(trim), TINSIZE);
+          lcdDrawNumber((stickIndex==0 ? TRIM_LH_X : TRIM_RH_X)+(trim>0 ? -11 : 20), ym-2, -abs(trim), TINSIZE);
         }
       }
     }
@@ -322,7 +322,7 @@ void displayTimers()
       TimerData & timerData = g_model.timers[i];
       uint8_t y = TIMERS_Y + i*TIMERS_H;
       if (ZLEN(timerData.name) > 0) {
-        lcdDrawTextWithLen(TIMERS_X, y-7, timerData.name, LEN_TIMER_NAME, ZCHAR|SMLSIZE);
+        lcdDrawSizedText(TIMERS_X, y-7, timerData.name, LEN_TIMER_NAME, ZCHAR|SMLSIZE);
       }
       else {
         putsTimerMode(TIMERS_X, y-7, timerData.mode, SMLSIZE);
@@ -515,7 +515,7 @@ void menuMainView(uint8_t event)
 
   // Flight Mode Name
   int mode = mixerCurrentFlightMode;
-  lcdDrawTextWithLen(PHASE_X, PHASE_Y, g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|PHASE_FLAGS);
+  lcdDrawSizedText(PHASE_X, PHASE_Y, g_model.flightModeData[mode].name, sizeof(g_model.flightModeData[mode].name), ZCHAR|PHASE_FLAGS);
 
   // Model Name
   putsModelName(MODELNAME_X, MODELNAME_Y, g_model.header.name, g_eeGeneral.currModel, BIGSIZE);
@@ -568,7 +568,7 @@ void menuMainView(uint8_t event)
   }
   else {
     // Logical Switches
-    lcd_puts(TRIM_RH_X - TRIM_LEN/2 + 5, 6*FH-1, "LS 1-32");
+    lcdDrawText(TRIM_RH_X - TRIM_LEN/2 + 5, 6*FH-1, "LS 1-32");
     for (int sw=0; sw<NUM_LOGICAL_SWITCH; ++sw) {
       div_t qr = div(sw, 10);
       uint8_t y = 13 + 11 * qr.quot;
@@ -593,9 +593,9 @@ void menuMainView(uint8_t event)
     lcdDrawFilledRect(BITMAP_X, BITMAP_Y, 64, 32, SOLID, ERASE);
     lcdDrawRect(BITMAP_X, BITMAP_Y, 64, 32);
     putsStrIdx(BITMAP_X+FW, BITMAP_Y+FH-1, STR_GV, s_gvar_last+1);
-    lcdDrawTextWithLen(BITMAP_X+4*FW+FW/2, BITMAP_Y+FH-1, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR);
+    lcdDrawSizedText(BITMAP_X+4*FW+FW/2, BITMAP_Y+FH-1, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR);
     lcdDrawText(BITMAP_X+FW, BITMAP_Y+2*FH+3, PSTR("[\010]"), BOLD);
-    lcd_outdezAtt(BITMAP_X+5*FW+FW/2, BITMAP_Y+2*FH+3, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD);
+    lcdDrawNumber(BITMAP_X+5*FW+FW/2, BITMAP_Y+2*FH+3, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD);
   }
 #endif
 }
diff --git a/radio/src/gui/Taranis/view_statistics.cpp b/radio/src/gui/Taranis/view_statistics.cpp
index b446fdffa..b239a2f1d 100644
--- a/radio/src/gui/Taranis/view_statistics.cpp
+++ b/radio/src/gui/Taranis/view_statistics.cpp
@@ -58,7 +58,7 @@ void menuStatisticsView(uint8_t event)
       break;
   }
 
-  lcd_puts(  1*FW, FH*0, STR_TOTTM1TM2THRTHP);
+  lcdDrawText(  1*FW, FH*0, STR_TOTTM1TM2THRTHP);
   putsTimer(    5*FW+5*FWNUM+1, FH*1, timersStates[0].val, 0, 0);
   putsTimer(   12*FW+5*FWNUM+1, FH*1, timersStates[1].val, 0, 0);
 
@@ -67,11 +67,11 @@ void menuStatisticsView(uint8_t event)
 
   putsTimer(   12*FW+5*FWNUM+1, FH*0, sessionTimer, 0, 0);
   
-  lcd_puts(    24*FW, FH*0, "TOT");
+  lcdDrawText(    24*FW, FH*0, "TOT");
   putsTimer(   28*FW+5*FWNUM+1, FH*0, g_eeGeneral.globalTimer + sessionTimer, TIMEHOUR, 0);
   
   if (TIMERS == 3) {
-    lcd_puts(    24*FW, FH*1, "TM3");
+    lcdDrawText(    24*FW, FH*1, "TM3");
     putsTimer(   28*FW+5*FWNUM+1, FH*1, timersStates[2].val, TIMEHOUR, 0);
   }
 
@@ -163,41 +163,41 @@ void menuStatisticsDebug(uint8_t event)
   }
 
   lcd_putsLeft(MENU_DEBUG_Y_FREE_RAM, "Free Mem");
-  lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_FREE_RAM, availableMemory(), LEFT);
-  lcd_puts(lcdLastPos, MENU_DEBUG_Y_FREE_RAM, "b");
+  lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_FREE_RAM, availableMemory(), LEFT);
+  lcdDrawText(lcdLastPos, MENU_DEBUG_Y_FREE_RAM, "b");
 
 #if defined(LUA)
   lcd_putsLeft(MENU_DEBUG_Y_LUA, "Lua scripts");
   lcdDrawText(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_LUA+1, "[Duration]", SMLSIZE);
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_LUA, 10*maxLuaDuration, LEFT);
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_LUA, 10*maxLuaDuration, LEFT);
   lcdDrawText(lcdLastPos+2, MENU_DEBUG_Y_LUA+1, "[Interval]", SMLSIZE);
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_LUA, 10*maxLuaInterval, LEFT);
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_LUA, 10*maxLuaInterval, LEFT);
 #endif
 
   lcd_putsLeft(MENU_DEBUG_Y_MIXMAX, STR_TMIXMAXMS);
-  lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_MIXMAX, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT);
-  lcd_puts(lcdLastPos, MENU_DEBUG_Y_MIXMAX, "ms");
+  lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_MIXMAX, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT);
+  lcdDrawText(lcdLastPos, MENU_DEBUG_Y_MIXMAX, "ms");
 
 #if defined(USB_SERIAL)
   lcd_putsLeft(MENU_DEBUG_Y_USB, "Usb");
-  lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_USB, charsWritten, LEFT);
-  lcd_puts(lcdLastPos, MENU_DEBUG_Y_USB, " ");
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_USB, APP_Rx_ptr_in, LEFT);
-  lcd_puts(lcdLastPos, MENU_DEBUG_Y_USB, " ");
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_USB, usbWraps, LEFT);
+  lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_USB, charsWritten, LEFT);
+  lcdDrawText(lcdLastPos, MENU_DEBUG_Y_USB, " ");
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_USB, APP_Rx_ptr_in, LEFT);
+  lcdDrawText(lcdLastPos, MENU_DEBUG_Y_USB, " ");
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_USB, usbWraps, LEFT);
 #endif
 
   lcd_putsLeft(MENU_DEBUG_Y_RTOS, STR_FREESTACKMINB);
   lcdDrawText(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS+1, "[M]", SMLSIZE);
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, menusStack.available(), UNSIGN|LEFT);
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_RTOS, menusStack.available(), UNSIGN|LEFT);
   lcdDrawText(lcdLastPos+2, MENU_DEBUG_Y_RTOS+1, "[X]", SMLSIZE);
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, mixerStack.available(), UNSIGN|LEFT);
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_RTOS, mixerStack.available(), UNSIGN|LEFT);
   lcdDrawText(lcdLastPos+2, MENU_DEBUG_Y_RTOS+1, "[A]", SMLSIZE);
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, audioStack.available(), UNSIGN|LEFT);
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_RTOS, audioStack.available(), UNSIGN|LEFT);
   lcdDrawText(lcdLastPos+2, MENU_DEBUG_Y_RTOS+1, "[I]", SMLSIZE);
-  lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, stackAvailable(), UNSIGN|LEFT);
+  lcdDrawNumber(lcdLastPos, MENU_DEBUG_Y_RTOS, stackAvailable(), UNSIGN|LEFT);
 
-  lcd_puts(3*FW, 7*FH+1, STR_MENUTORESET);
+  lcdDrawText(3*FW, 7*FH+1, STR_MENUTORESET);
   lcdInvertLastLine();
 }
 
@@ -225,17 +225,17 @@ void menuTraceBuffer(uint8_t event)
   uint8_t k = 0;
   int8_t sub = m_posVert;
 
-  lcd_putc(0, FH, '#');
-  lcd_puts(4*FW, FH, "Time");
-  lcd_puts(14*FW, FH, "Event");
-  lcd_puts(20*FW, FH, "Data");
+  lcdDrawChar(0, FH, '#');
+  lcdDrawText(4*FW, FH, "Time");
+  lcdDrawText(14*FW, FH, "Event");
+  lcdDrawText(20*FW, FH, "Data");
 
   for (uint8_t i=0; i<LCD_LINES-2; i++) {
     y = 1 + (i+2)*FH;
     k = i+s_pgOfs;
 
     //item
-    lcd_outdezAtt(0, y, k, LEFT | (sub==k ? INVERS : 0));
+    lcdDrawNumber(0, y, k, LEFT | (sub==k ? INVERS : 0));
 
     const struct TraceElement * te = getTraceElement(k);
     if (te) {
@@ -243,11 +243,11 @@ void menuTraceBuffer(uint8_t event)
       putstime_t tme = te->time % SECS_PER_DAY;
       putsTimer(4*FW, y, tme, TIMEHOUR|LEFT, TIMEHOUR|LEFT);
       //event
-      lcd_outdezNAtt(14*FW, y, te->event, LEADING0|LEFT, 3);
+      lcdDrawNumber(14*FW, y, te->event, LEADING0|LEFT, 3);
       //data
-      lcd_putsn  (20*FW, y, "0x", 2);
-      lcd_outhex4(22*FW-2, y, (uint16_t)(te->data >> 16));
-      lcd_outhex4(25*FW, y, (uint16_t)(te->data & 0xFFFF));
+      lcdDrawSizedText  (20*FW, y, "0x", 2);
+      lcdDrawHexNumber(22*FW-2, y, (uint16_t)(te->data >> 16));
+      lcdDrawHexNumber(25*FW, y, (uint16_t)(te->data & 0xFFFF));
     }
 
   }
diff --git a/radio/src/gui/Taranis/view_telemetry.cpp b/radio/src/gui/Taranis/view_telemetry.cpp
index 4f00a47ea..9bfc87d9e 100644
--- a/radio/src/gui/Taranis/view_telemetry.cpp
+++ b/radio/src/gui/Taranis/view_telemetry.cpp
@@ -53,7 +53,7 @@ void displayRssiLine()
   if (TELEMETRY_STREAMING()) {
     lcdDrawSolidHorizontalLine(0, 55, 212, 0); // separator
     uint8_t rssi = min((uint8_t)99, TELEMETRY_RSSI());
-    lcd_putsn(0, STATUS_BAR_Y, STR_RX, 2); lcd_outdezNAtt(4*FW, STATUS_BAR_Y, rssi, LEADING0, 2);
+    lcdDrawSizedText(0, STATUS_BAR_Y, STR_RX, 2); lcdDrawNumber(4*FW, STATUS_BAR_Y, rssi, LEADING0, 2);
     lcdDrawRect(BAR_LEFT, 57, 78, 7);
     lcdDrawFilledRect(BAR_LEFT+1, 58, 19*rssi/25, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
   }
@@ -273,6 +273,6 @@ void menuTelemetryFrsky(uint8_t event)
   }
 
   lcdDrawTelemetryTopBar();
-  lcd_puts(8*FW, 3*FH, "No Telemetry Screens");
+  lcdDrawText(8*FW, 3*FH, "No Telemetry Screens");
   displayRssiLine();
 }
diff --git a/radio/src/gui/Taranis/view_text.cpp b/radio/src/gui/Taranis/view_text.cpp
index 38ae28dea..d27f8d1f3 100644
--- a/radio/src/gui/Taranis/view_text.cpp
+++ b/radio/src/gui/Taranis/view_text.cpp
@@ -145,7 +145,7 @@ void menuTextView(uint8_t event)
 #else
   // TODO?
 #endif
-  lcd_puts(LCD_W/2-strlen(title)*FW/2, 0, title);
+  lcdDrawText(LCD_W/2-strlen(title)*FW/2, 0, title);
   lcdInvertLine(0);
 
   if (lines_count > LCD_LINES-1) {
diff --git a/radio/src/gui/Taranis/widgets.cpp b/radio/src/gui/Taranis/widgets.cpp
index 1df0b9857..c737d44d6 100644
--- a/radio/src/gui/Taranis/widgets.cpp
+++ b/radio/src/gui/Taranis/widgets.cpp
@@ -67,7 +67,7 @@ void displayColumnHeader(const char * const *headers, uint8_t index)
 void menu_lcd_onoff(coord_t x, coord_t y, uint8_t value, LcdFlags attr)
 {
   if (value)
-    lcd_putc(x+1, y, '#');
+    lcdDrawChar(x+1, y, '#');
   if (attr)
     lcdDrawFilledRect(x, y, 7, 7);
   else
@@ -76,10 +76,10 @@ void menu_lcd_onoff(coord_t x, coord_t y, uint8_t value, LcdFlags attr)
 
 void displayScreenIndex(uint8_t index, uint8_t count, uint8_t attr)
 {
-  lcd_outdezAtt(LCD_W, 0, count, attr);
+  lcdDrawNumber(LCD_W, 0, count, attr);
   coord_t x = 1+LCD_W-FW*(count>9 ? 3 : 2);
   lcdDrawChar(x, 0, '/', attr);
-  lcd_outdezAtt(x, 0, index+1, attr);
+  lcdDrawNumber(x, 0, index+1, attr);
 }
 
 void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible)
@@ -150,7 +150,7 @@ swsrc_t switchMenuItem(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, uint8
 
 void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr)
 {
-  lcd_putc(x+(value*4*FW)/max, y, '$');
+  lcdDrawChar(x+(value*4*FW)/max, y, '$');
   lcdDrawSolidHorizontalLine(x, y+3, 5*FW-1, FORCE);
   if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawFilledRect(x, y, 5*FW-1, FH-1);
 }
@@ -202,7 +202,7 @@ int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t m
     putsStrIdx(x, y, STR_GV, idx, attr);
   }
   else {
-    lcd_outdezAtt(x, y, value, attr);
+    lcdDrawNumber(x, y, value, attr);
     if (invers) value = checkIncDec(event, value, min, max, EE_MODEL | editflags);
   }
   return value;
@@ -210,7 +210,7 @@ int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t m
 #else
 int16_t gvarMenuItem(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event)
 {
-  lcd_outdezAtt(x, y, value, attr);
+  lcdDrawNumber(x, y, value, attr);
   if (attr&INVERS) value = checkIncDec(event, value, min, max, EE_MODEL);
   return value;
 }
diff --git a/radio/src/lua/api_lcd.cpp b/radio/src/lua/api_lcd.cpp
index 681067646..ec66608ef 100644
--- a/radio/src/lua/api_lcd.cpp
+++ b/radio/src/lua/api_lcd.cpp
@@ -233,7 +233,7 @@ static int luaLcdDrawNumber(lua_State *L)
     n = val * 10;
   else
     n = val;
-  lcd_outdezAtt(x, y, n, att);
+  lcdDrawNumber(x, y, n, att);
   return 0;
 }
 
diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp
index 5ee2460b8..bbd98e4cb 100644
--- a/radio/src/lua/interface.cpp
+++ b/radio/src/lua/interface.cpp
@@ -470,11 +470,11 @@ void displayLuaError(const char * title)
   if (lua_warning_info[0]) {
     char * split = strstr(lua_warning_info, ": ");
     if (split) {
-      lcdDrawTextWithLen(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, split-lua_warning_info, SMLSIZE);
-      lcdDrawTextWithLen(WARNING_LINE_X, WARNING_LINE_Y+2*FH+2, split+2, lua_warning_info+LUA_WARNING_INFO_LEN-split, SMLSIZE);
+      lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, split-lua_warning_info, SMLSIZE);
+      lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+2*FH+2, split+2, lua_warning_info+LUA_WARNING_INFO_LEN-split, SMLSIZE);
     }
     else {
-      lcdDrawTextWithLen(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, 40, SMLSIZE);
+      lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, 40, SMLSIZE);
     }
   }
 }
@@ -586,9 +586,9 @@ void luaDoOneRunStandalone(uint8_t evt)
 #if defined(COLORLCD)
 #else
           lcdDrawSolidHorizontalLine(0, 7*FH-1, lcdLastPos+6, ERASE);
-          lcd_puts(0, 7*FH, "GV Use: ");
-          lcd_outdezAtt(lcdLastPos, 7*FH, luaGetMemUsed(), LEFT);
-          lcd_putc(lcdLastPos, 7*FH, 'b');
+          lcdDrawText(0, 7*FH, "GV Use: ");
+          lcdDrawNumber(lcdLastPos, 7*FH, luaGetMemUsed(), LEFT);
+          lcdDrawChar(lcdLastPos, 7*FH, 'b');
           lcdDrawSolidHorizontalLine(0, 7*FH-2, lcdLastPos+6, FORCE);
           lcdDrawVerticalLine(lcdLastPos+6, 7*FH-2, FH+2, SOLID, FORCE);
 #endif
diff --git a/radio/src/targets/Taranis/bootloader/boot.cpp b/radio/src/targets/Taranis/bootloader/boot.cpp
index 31a2a2116..9d361b4f8 100644
--- a/radio/src/targets/Taranis/bootloader/boot.cpp
+++ b/radio/src/targets/Taranis/bootloader/boot.cpp
@@ -404,7 +404,7 @@ int main()
   backlightInit();
 
   lcdClear();
-  lcd_putsn(0, 0, (const char *)bootloaderVersion, 0); // trick to avoid bootloaderVersion to be optimized out ...
+  lcdDrawSizedText(0, 0, (const char *)bootloaderVersion, 0); // trick to avoid bootloaderVersion to be optimized out ...
   lcd_putsLeft(0, BOOTLOADER_TITLE);
   lcdInvertLine(0);
   lcdRefresh();
@@ -540,7 +540,7 @@ int main()
           else {
             x = 0;
           }
-          lcdDrawTextWithLen(INDENT_WIDTH, 16 + FH * i, &Filenames[i][x], DISPLAY_CHAR_WIDTH, 0);
+          lcdDrawSizedText(INDENT_WIDTH, 16 + FH * i, &Filenames[i][x], DISPLAY_CHAR_WIDTH, 0);
         }
 
         if (event == EVT_KEY_REPT(BOOT_KEY_DOWN) || event == EVT_KEY_FIRST(BOOT_KEY_DOWN)) {
diff --git a/radio/src/telemetry/ardupilot.cpp b/radio/src/telemetry/ardupilot.cpp
index dc21e1c80..093f7950e 100644
--- a/radio/src/telemetry/ardupilot.cpp
+++ b/radio/src/telemetry/ardupilot.cpp
@@ -512,10 +512,10 @@ void menuTelemetryArduPilot1(uint8_t event)
     initval (1, PACK_POS, LON);
 // title of the screen
     title ('1');
-    lcd_puts  (5*FW, 1*FH, PSTR(" Latitude"));   // line 1 column 5
+    lcdDrawText(5*FW, 1*FH, PSTR(" Latitude"));   // line 1 column 5
 // first buffer into line 2 column 2
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (5*FW, 4*FH, PSTR(" Longitude"));  // line 4 column 5
+    lcdDrawText(5*FW, 4*FH, PSTR(" Longitude"));  // line 4 column 5
 // second buffer into line 5 column 2
     lcdDrawText (1*FW, 5*FH, VALSTR(1), APSIZE);
 }
@@ -538,9 +538,9 @@ void menuTelemetryArduPilot2(uint8_t event)
     initval (0, PACK_POS, SPD);
     initval (1, PACK_POS, CRT);
     title ('2');  
-    lcd_puts  (1*FW, 1*FH, PSTR(" Ground speed"));    
+    lcdDrawText(1*FW, 1*FH, PSTR(" Ground speed"));    
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (1*FW, 4*FH, PSTR(" Climb rate") );
+    lcdDrawText(1*FW, 4*FH, PSTR(" Climb rate") );
     lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
 }
 
@@ -562,9 +562,9 @@ void menuTelemetryArduPilot3(uint8_t event)
     initval (0, PACK_POS, ALT);
     initval (1, PACK_POS, ALH);
     title ('3');  
-    lcd_puts  (1*FW, 1*FH, PSTR(" Altitude"));    
+    lcdDrawText(1*FW, 1*FH, PSTR(" Altitude"));    
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (1*FW, 4*FH, PSTR(" Altitude Hold") );
+    lcdDrawText(1*FW, 4*FH, PSTR(" Altitude Hold") );
     lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
 }
 
@@ -586,9 +586,9 @@ void menuTelemetryArduPilot4(uint8_t event)
     initval (0, PACK_POS, CRS);
     initval (1, PACK_POS, BER);
     title ('4'); 
-    lcd_puts  (1*FW, 1*FH, PSTR(" Course"));    
+    lcdDrawText(1*FW, 1*FH, PSTR(" Course"));    
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (1*FW, 4*FH, PSTR(" Bearing"));
+    lcdDrawText(1*FW, 4*FH, PSTR(" Bearing"));
     lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
 }
 
@@ -612,9 +612,9 @@ void menuTelemetryArduPilot5(uint8_t event)
     initval (0, PACK_POS, WPN);
     initval (1, PACK_POS, DST);
     title ('5'); 
-    lcd_puts  (1*FW, 1*FH, PSTR(" Way Point # "));    
+    lcdDrawText(1*FW, 1*FH, PSTR(" Way Point # "));    
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (1*FW, 4*FH, PSTR(" Distance "));
+    lcdDrawText(1*FW, 4*FH, PSTR(" Distance "));
     lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
 }
 
@@ -638,9 +638,9 @@ void menuTelemetryArduPilot6(uint8_t event)
     initval (0, PACK_ATT, ASP);
     initval (1, PACK_ATT, THH);
     title ('6'); 
-    lcd_puts  (1*FW, 1*FH, PSTR(" Air Speed "));    
+    lcdDrawText(1*FW, 1*FH, PSTR(" Air Speed "));    
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (1*FW, 4*FH, PSTR(" Climb Rate "));
+    lcdDrawText(1*FW, 4*FH, PSTR(" Climb Rate "));
     lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
 }
 
@@ -664,9 +664,9 @@ void menuTelemetryArduPilot7(uint8_t event)
     initval (0, PACK_ATT, RLL);
     initval (1, PACK_ATT, PCH);
     title ('7'); 
-    lcd_puts  (1*FW, 1*FH, PSTR(" Roll Angle"));   
+    lcdDrawText(1*FW, 1*FH, PSTR(" Roll Angle"));   
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (1*FW, 4*FH, PSTR(" Pitch Angle"));
+    lcdDrawText(1*FW, 4*FH, PSTR(" Pitch Angle"));
     lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
 }
 
@@ -690,9 +690,9 @@ void menuTelemetryArduPilot8(uint8_t event)
     initval (0, PACK_MOD, MOD);
     initval (1, PACK_WPC, WPC);
     title ('8');
-    lcd_puts  (1*FW, 1*FH, PSTR(" ArduPilot Mode"));
+    lcdDrawText(1*FW, 1*FH, PSTR(" ArduPilot Mode"));
     lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
-    lcd_puts  (1*FW, 4*FH, PSTR(" RTL Distance"));
+    lcdDrawText(1*FW, 4*FH, PSTR(" RTL Distance"));
     lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
 }
 
diff --git a/radio/src/telemetry/nmea.cpp b/radio/src/telemetry/nmea.cpp
index 64b3c39f9..47349345b 100644
--- a/radio/src/telemetry/nmea.cpp
+++ b/radio/src/telemetry/nmea.cpp
@@ -464,11 +464,11 @@ void menuTelemetryNMEA1(uint8_t event)
 
     if (rbuf[0][0]) {								// show always if data have been received
 	  lcdDrawChar   (  19*FW,   1*FH, sbuf[2], 0);				// satellites in view
-        lcdDrawTextWithLen  (   2*FW,   2*FH, &rbuf[0][0], 2, APSIZE);		// hours
+        lcdDrawSizedText  (   2*FW,   2*FH, &rbuf[0][0], 2, APSIZE);		// hours
         lcdDrawChar   (   6*FW,   2*FH, ':', DBLSIZE);			// ":"
-        lcdDrawTextWithLen  (   8*FW,   2*FH, &rbuf[0][2], 2, APSIZE);		// minutes
+        lcdDrawSizedText  (   8*FW,   2*FH, &rbuf[0][2], 2, APSIZE);		// minutes
         lcdDrawChar   (  12*FW,   2*FH, ':', DBLSIZE);			// ":"
-        lcdDrawTextWithLen  (  14*FW,   2*FH, &rbuf[0][4], 2, APSIZE);		// seconds
+        lcdDrawSizedText  (  14*FW,   2*FH, &rbuf[0][4], 2, APSIZE);		// seconds
     }
     else
         lcdDrawText   (   2*FW,   2*FH, val_unknown, APSIZE);		// "?"
@@ -483,11 +483,11 @@ void menuTelemetryNMEA1(uint8_t event)
         lcd_puts      ( 2*FW,   4*FH, PSTR("Date"));			// show the UTC Date	
 
         if (rbuf[1][0])	{
-            lcdDrawTextWithLen( 2*FW,   5*FH, &rbuf[1][0], 2, APSIZE);		// year
+            lcdDrawSizedText( 2*FW,   5*FH, &rbuf[1][0], 2, APSIZE);		// year
             lcdDrawChar ( 6*FW,   5*FH, '/', DBLSIZE);			// "/" 
-            lcdDrawTextWithLen( 8*FW,   5*FH, &rbuf[1][2], 2, APSIZE);		// month
+            lcdDrawSizedText( 8*FW,   5*FH, &rbuf[1][2], 2, APSIZE);		// month
             lcdDrawChar (12*FW,   5*FH, '/', DBLSIZE);			// "/"
-            lcdDrawTextWithLen(14*FW,   5*FH, &rbuf[1][4], 2, APSIZE);		// day
+            lcdDrawSizedText(14*FW,   5*FH, &rbuf[1][4], 2, APSIZE);		// day
         }
         else
             lcdDrawText   (   2*FW,   5*FH, val_unknown, APSIZE);		// "?"
@@ -593,7 +593,7 @@ void menuTelemetryNMEA2(uint8_t event)
         lcd_puts         (   17*FW,   6*FH, PSTR("OFF") );
 
 
-    lcd_outdezNAtt(  20*FW,   4*FH, home_alt, PREC1, 6);		// display home_alt, small characters 
+    lcdDrawNumber(  20*FW,   4*FH, home_alt, PREC1, 6);		// display home_alt, small characters 
 
     if (xpack[0] != PACK_GGA)
         ggareceived = 0;
@@ -635,17 +635,17 @@ void menuTelemetryNMEA2(uint8_t event)
 	  if (sbuf[1]>0x30)	 {							// & GGA has FIX > 0
 
 
-	        lcd_outdezNAtt(  10*FW,   2*FH, rel_alt, DBLSIZE|PREC1, 7);	// altitude
+	        lcdDrawNumber(  10*FW,   2*FH, rel_alt, DBLSIZE|PREC1, 7);	// altitude
 	
 		  if (home_alt >= 0) 
-			  lcd_outdezNAtt(  20*FW,   2*FH, (max_alt-home_alt), PREC1, 6);	// display small characters
+			  lcdDrawNumber(  20*FW,   2*FH, (max_alt-home_alt), PREC1, 6);	// display small characters
 		  else
-			  lcd_outdezNAtt(  20*FW,   2*FH, max_alt, PREC1, 6);			// display small characters
+			  lcdDrawNumber(  20*FW,   2*FH, max_alt, PREC1, 6);			// display small characters
 	
 
 	        lcdDrawChar   (  11*FW,   3*FH, sbuf[0], 0);				// dimension [m]
 
-      	  lcd_outdezNAtt(  10*FW,   5*FH, lift_alt, DBLSIZE|PREC1, 6);	// lift
+      	  lcdDrawNumber(  10*FW,   5*FH, lift_alt, DBLSIZE|PREC1, 6);	// lift
 	        lcdDrawChar   (  11*FW,   6*FH, sbuf[0], 0);				// dimension [m/S]
       	  lcd_puts    (  12*FW,   6*FH, PSTR("/S") );
 		}
@@ -741,7 +741,7 @@ void menuTelemetryNMEA4(uint8_t event)
     {
         lcdDrawChar   (  13*FW,   1*FH, sbuf[0], 0);          // N or S
 	  lcdDrawChar   (  19*FW,   1*FH, sbuf[2], 0);				// satellites in view
-        lcdDrawTextWithLen  (   1*FW,   2*FH, rbuf[0], 2, APSIZE);
+        lcdDrawSizedText  (   1*FW,   2*FH, rbuf[0], 2, APSIZE);
         lcdDrawChar   (   5*FW,   2*FH, '@',0);
         lcdDrawText   (   6*FW,   2*FH, &rbuf[0][2], APSIZE);	// minutes with small decimal point
     }
@@ -752,7 +752,7 @@ void menuTelemetryNMEA4(uint8_t event)
     if (rbuf[0][0])
     {
         lcdDrawChar   (  13*FW,   4*FH, sbuf[1], 0);          // E or W
-        lcdDrawTextWithLen  (   0*FW,   5*FH, rbuf[1], 3, APSIZE);
+        lcdDrawSizedText  (   0*FW,   5*FH, rbuf[1], 3, APSIZE);
         lcdDrawChar   (   6*FW,   5*FH, '@',0);
         lcdDrawText   (   7*FW,   5*FH, &rbuf[1][3], APSIZE);	// minutes with small decimal point
 
diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp
index 42a722b9e..45115e7d9 100644
--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -115,7 +115,7 @@ bool checkScreenshot(const QString & test)
 TEST(outdezNAtt, test_unsigned)
 {
   lcdClear();
-  lcd_outdezNAtt(0, 0, 65530, LEFT|UNSIGN);
+  lcdDrawNumber(0, 0, 65530, LEFT|UNSIGN);
   EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed";
 }
 
@@ -123,8 +123,8 @@ TEST(outdezNAtt, test_unsigned)
 TEST(outdezNAtt, testBigNumbers)
 {
   lcdClear();
-  lcd_outdezNAtt(0, 0, 1234567, LEFT);
-  lcd_outdezNAtt(0, FH, -1234567, LEFT);
+  lcdDrawNumber(0, 0, 1234567, LEFT);
+  lcdDrawNumber(0, FH, -1234567, LEFT);
   EXPECT_TRUE(checkScreenshot("big_numbers"));
 }
 #endif // #if defined(CPUARM)
@@ -147,14 +147,14 @@ TEST(Lcd, Invers_0_1)
 TEST(Lcd, Prec2_Left)
 {
   lcdClear();
-  lcd_outdezAtt(0, 0, 2, PREC2|LEFT);
+  lcdDrawNumber(0, 0, 2, PREC2|LEFT);
   EXPECT_TRUE(checkScreenshot("prec2_left"));
 }
 
 TEST(Lcd, Prec2_Right)
 {
   lcdClear();
-  lcd_outdezAtt(LCD_W, LCD_H-FH, 2, PREC2);
+  lcdDrawNumber(LCD_W, LCD_H-FH, 2, PREC2);
   EXPECT_TRUE(checkScreenshot("prec2_right"));
 }
 
@@ -162,7 +162,7 @@ TEST(Lcd, Prec2_Right)
 TEST(Lcd, Prec1_Dblsize_Invers)
 {
   lcdClear();
-  lcd_outdezAtt(LCD_W, 10, 51, PREC1|DBLSIZE|INVERS);
+  lcdDrawNumber(LCD_W, 10, 51, PREC1|DBLSIZE|INVERS);
   EXPECT_TRUE(checkScreenshot("prec1_dblsize_invers"));
 }
 #endif
@@ -170,7 +170,7 @@ TEST(Lcd, Prec1_Dblsize_Invers)
 TEST(Lcd, Line_Wrap)
 {
   lcdClear();
-  lcd_puts(LCD_W-10, 0, "TEST");
+  lcdDrawText(LCD_W-10, 0, "TEST");
   EXPECT_TRUE(checkScreenshot("line_wrap"));
 }