diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 93572e07a..b4ed1941d 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -266,7 +266,9 @@ void generalDefault()
 
 #if defined(PCBHORUS)
   g_eeGeneral.blOffBright = 20;
-#else
+#endif
+
+#if defined(LCD_CONTRAST_DEFAULT)
   g_eeGeneral.contrast = LCD_CONTRAST_DEFAULT;
 #endif
 
@@ -2041,7 +2043,7 @@ int main()
   // important to disable it before commencing with system initialisation (or
   // we could put a bunch more WDG_RESET()s in. But I don't like that approach
   // during boot up.)
-#if defined(PCBTARANIS)
+#if defined(LCD_CONTRAST_DEFAULT)
   g_eeGeneral.contrast = LCD_CONTRAST_DEFAULT;
 #endif
 
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 5a0b2fbdf..2b3f9db75 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -847,7 +847,7 @@ void ledBlue();
 #define IS_LCD_RESET_NEEDED()           true
 #define LCD_CONTRAST_MIN                10
 #define LCD_CONTRAST_MAX                30
-#define LCD_CONTRAST_DEFAULT            20
+#define LCD_CONTRAST_DEFAULT            15
 #endif
 
 #if defined(PCBX9D) || defined(PCBX9E) || (defined(PCBX9DP) && PCBREV < 2019)
diff --git a/radio/src/targets/taranis/lcd_driver_spi.cpp b/radio/src/targets/taranis/lcd_driver_spi.cpp
index ca66dc1a7..6936ae85f 100644
--- a/radio/src/targets/taranis/lcd_driver_spi.cpp
+++ b/radio/src/targets/taranis/lcd_driver_spi.cpp
@@ -144,9 +144,9 @@ void lcdStart()
   lcdWriteCommand(0xE9); // Set bias=1/10
   lcdWriteCommand(0x81); // Set Vop
 #if defined(BOOT)
-  lcdWriteCommand(LCD_CONTRAST_OFFSET+LCD_CONTRAST_DEFAULT);
+  lcdWriteCommand(LCD_CONTRAST_OFFSET + LCD_CONTRAST_DEFAULT);
 #else
-  lcdWriteCommand(LCD_CONTRAST_OFFSET+g_eeGeneral.contrast);
+  lcdWriteCommand(LCD_CONTRAST_OFFSET + g_eeGeneral.contrast);
 #endif
   lcdWriteCommand(0xA2); // Set line rate: 28KLPS
   lcdWriteCommand(0x28); // Set panel loading
@@ -173,11 +173,11 @@ void lcdStart()
 
 void lcdWriteAddress(uint8_t x, uint8_t y)
 {
-  lcdWriteCommand(x & 0x0F); // Set Column Address LSB CA[3:0]
-  lcdWriteCommand((x>>4) | 0x10); // Set Column Address MSB CA[7:4]
+  lcdWriteCommand(x & 0x0Fu); // Set Column Address LSB CA[3:0]
+  lcdWriteCommand((x >> 4u) | 0x10u); // Set Column Address MSB CA[7:4]
 
-  lcdWriteCommand((y&0x0F) | 0x60); // Set Row Address LSB RA [3:0]
-  lcdWriteCommand(((y>>4) & 0x0F) | 0x70); // Set Row Address MSB RA [7:4]
+  lcdWriteCommand((y & 0x0Fu) | 0x60u); // Set Row Address LSB RA [3:0]
+  lcdWriteCommand(((y >> 4u) & 0x0Fu) | 0x70u); // Set Row Address MSB RA [7:4]
 }
 #endif