diff --git a/src/DebugConfiguration.h b/src/DebugConfiguration.h
index ebe9da8d4..f5b3fa25a 100644
--- a/src/DebugConfiguration.h
+++ b/src/DebugConfiguration.h
@@ -3,8 +3,8 @@
 #include "configuration.h"
 
 // DEBUG LED
-#ifndef LED_INVERTED
-#define LED_INVERTED 0 // define as 1 if LED is active low (on)
+#ifndef LED_STATE_ON
+#define LED_STATE_ON 1
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/src/main.cpp b/src/main.cpp
index 561b24a34..64fe04f00 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -583,7 +583,7 @@ void setup()
 
 #ifdef LED_PIN
     pinMode(LED_PIN, OUTPUT);
-    digitalWrite(LED_PIN, 1 ^ LED_INVERTED); // turn on for now
+    digitalWrite(LED_PIN, LED_STATE_ON); // turn on for now
 #endif
 
     // Hello
@@ -728,7 +728,7 @@ void setup()
 #ifdef LED_PIN
     // Turn LED off after boot, if heartbeat by config
     if (config.device.led_heartbeat_disabled)
-        digitalWrite(LED_PIN, LOW ^ LED_INVERTED);
+        digitalWrite(LED_PIN, HIGH ^ LED_STATE_ON);
 #endif
 
 // Do this after service.init (because that clears error_code)
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index 26ddab0db..8287f8a00 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -372,7 +372,7 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
 #ifdef LED_PIN
         // Turn LED off if heartbeat by config
         if (c.payload_variant.device.led_heartbeat_disabled) {
-            digitalWrite(LED_PIN, LOW ^ LED_INVERTED);
+            digitalWrite(LED_PIN, HIGH ^ LED_STATE_ON);
         }
 #endif
         if (config.device.button_gpio == c.payload_variant.device.button_gpio &&
diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index 2b285ec2e..d5685d611 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -75,16 +75,16 @@
 #ifdef ARDUINO_NRF52840_PCA10056
 
 // This board uses 0 to be mean LED on
-#undef LED_INVERTED
-#define LED_INVERTED 1
+#undef LED_STATE_ON
+#define LED_STATE_ON 0 // State when LED is lit
 
 #endif
 
 #ifdef _SEEED_XIAO_NRF52840_SENSE_H_
 
 // This board uses 0 to be mean LED on
-#undef LED_INVERTED
-#define LED_INVERTED 1
+#undef LED_STATE_ON
+#define LED_STATE_ON 0 // State when LED is lit
 
 #endif
 
@@ -116,4 +116,4 @@
 #if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
 // No serial ports on this board - ONLY use segger in memory console
 #define USE_SEGGER
-#endif
+#endif
\ No newline at end of file
diff --git a/src/sleep.cpp b/src/sleep.cpp
index 4e685563a..486d22dfe 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -90,7 +90,7 @@ void setLed(bool ledOn)
 
 #ifdef LED_PIN
     // toggle the led so we can get some rough sense of how often loop is pausing
-    digitalWrite(LED_PIN, ledOn ^ LED_INVERTED);
+    digitalWrite(LED_PIN, ledOn ^ LED_STATE_ON ^ HIGH);
 #endif
 
 #ifdef HAS_PMU
@@ -519,4 +519,4 @@ void enableLoraInterrupt()
     }
 #endif
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/variants/EBYTE_ESP32-S3/variant.h b/variants/EBYTE_ESP32-S3/variant.h
index 10b39617b..80fb26434 100644
--- a/variants/EBYTE_ESP32-S3/variant.h
+++ b/variants/EBYTE_ESP32-S3/variant.h
@@ -101,7 +101,7 @@
 
 // Status
 #define LED_PIN 1
-#define LED_INVERTED 0
+#define LED_STATE_ON 1 // State when LED is lit
 // External notification
 // FIXME: Check if EXT_NOTIFY_OUT actualy has any effect and removes the need for setting the external notication pin in the
 // app/preferences
diff --git a/variants/canaryone/variant.h b/variants/canaryone/variant.h
index d283f08f6..140b605ad 100644
--- a/variants/canaryone/variant.h
+++ b/variants/canaryone/variant.h
@@ -56,7 +56,6 @@ extern "C" {
 #define LED_CONN PIN_LED3
 
 #define LED_STATE_ON 0 // State when LED is lit
-#define LED_INVERTED 1
 
 /*
  * Buttons
diff --git a/variants/heltec_esp32c3/variant.h b/variants/heltec_esp32c3/variant.h
index 360d9bf1f..ca00c43fa 100644
--- a/variants/heltec_esp32c3/variant.h
+++ b/variants/heltec_esp32c3/variant.h
@@ -3,8 +3,8 @@
 // LED pin on HT-DEV-ESP_V2 and HT-DEV-ESP_V3
 // https://resource.heltec.cn/download/HT-CT62/HT-CT62_Reference_Design.pdf
 // https://resource.heltec.cn/download/HT-DEV-ESP/HT-DEV-ESP_V3_Sch.pdf
-#define LED_PIN 2 // LED
-#define LED_INVERTED 0
+#define LED_PIN 2      // LED
+#define LED_STATE_ON 1 // State when LED is lit
 
 #define HAS_SCREEN 0
 #define HAS_GPS 0
@@ -26,4 +26,4 @@
 #define SX126X_BUSY LORA_BUSY
 #define SX126X_RESET LORA_RESET
 #define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
\ No newline at end of file
diff --git a/variants/heltec_mesh_node_t114/variant.h b/variants/heltec_mesh_node_t114/variant.h
index 615526b22..8df59e394 100644
--- a/variants/heltec_mesh_node_t114/variant.h
+++ b/variants/heltec_mesh_node_t114/variant.h
@@ -80,7 +80,6 @@ extern "C" {
 #define LED_CONN PIN_GREEN
 
 #define LED_STATE_ON 0 // State when LED is lit
-#define LED_INVERTED 1
 
 /*
  * Buttons
diff --git a/variants/m5stack_coreink/variant.h b/variants/m5stack_coreink/variant.h
index f19da2696..ecd93b7be 100644
--- a/variants/m5stack_coreink/variant.h
+++ b/variants/m5stack_coreink/variant.h
@@ -10,7 +10,7 @@
 // #define GPS_TX_PIN 32 (now used by SX1262 BUSY as GPS works with just RX)
 
 // Green LED
-#define LED_INVERTED 0
+#define LED_STATE_ON 1 // State when LED is lit
 #define LED_PIN 10
 
 #include "pcf8563.h"
@@ -106,4 +106,4 @@
 //  GND
 // https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58
 #define ADC_MULTIPLIER 5
-// https://embeddedexplorer.com/esp32-adc-esp-idf-tutorial/
+// https://embeddedexplorer.com/esp32-adc-esp-idf-tutorial/
\ No newline at end of file
diff --git a/variants/nano-g2-ultra/variant.h b/variants/nano-g2-ultra/variant.h
index 4d8aa5784..fd51cf9a1 100644
--- a/variants/nano-g2-ultra/variant.h
+++ b/variants/nano-g2-ultra/variant.h
@@ -54,7 +54,6 @@ extern "C" {
 #define LED_CONN PIN_GREEN
 
 #define LED_STATE_ON 0 // State when LED is lit
-// #define LED_INVERTED 1
 
 /*
  * Buttons
diff --git a/variants/t-echo/variant.h b/variants/t-echo/variant.h
index 1c263a61a..9abb4ea69 100644
--- a/variants/t-echo/variant.h
+++ b/variants/t-echo/variant.h
@@ -56,7 +56,6 @@ extern "C" {
 #define LED_CONN PIN_GREEN
 
 #define LED_STATE_ON 0 // State when LED is lit
-#define LED_INVERTED 1
 
 /*
  * Buttons
diff --git a/variants/tbeam-s3-core/variant.h b/variants/tbeam-s3-core/variant.h
index 0fa9f8fe8..cc706459f 100644
--- a/variants/tbeam-s3-core/variant.h
+++ b/variants/tbeam-s3-core/variant.h
@@ -11,7 +11,7 @@
 //  anywhere.
 //  #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
 
-#define LED_INVERTED 1
+#define LED_STATE_ON 0 // State when LED is lit
 
 // TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
 // not found then probe for SX1262
@@ -66,4 +66,4 @@
 // has 32768 Hz crystal
 #define HAS_32768HZ
 
-#define USE_SH1106
+#define USE_SH1106
\ No newline at end of file
diff --git a/variants/tbeam/variant.h b/variants/tbeam/variant.h
index d237f542b..8771c20d2 100644
--- a/variants/tbeam/variant.h
+++ b/variants/tbeam/variant.h
@@ -8,8 +8,8 @@
 //  anywhere.
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
 
-#define LED_INVERTED 1
-#define LED_PIN 4 // Newer tbeams (1.1) have an extra led on GPIO4
+#define LED_STATE_ON 0 // State when LED is lit
+#define LED_PIN 4      // Newer tbeams (1.1) have an extra led on GPIO4
 
 // TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
 // not found then probe for SX1262
diff --git a/variants/unphone/variant.h b/variants/unphone/variant.h
index 7d5c30f79..0a94c5987 100644
--- a/variants/unphone/variant.h
+++ b/variants/unphone/variant.h
@@ -51,8 +51,8 @@
 // #define HAS_SDCARD 1 // causes hang if defined
 #define SDCARD_CS 43
 
-#define LED_PIN 13 // the red part of the RGB LED
-#define LED_INVERTED 1
+#define LED_PIN 13     // the red part of the RGB LED
+#define LED_STATE_ON 0 // State when LED is lit
 
 #define BUTTON_PIN 21      // Button 3 - square - top button in landscape mode
 #define BUTTON_NEED_PULLUP // we do need a helping hand up