diff --git a/src/Led.cpp b/src/Led.cpp
deleted file mode 100644
index 6406cd2f7..000000000
--- a/src/Led.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "Led.h"
-#include "PowerMon.h"
-#include "main.h"
-#include "power.h"
-
-GpioVirtPin ledForceOn, ledBlink;
-
-#if defined(LED_PIN)
-// Most boards have a GPIO for LED control
-static GpioHwPin ledRawHwPin(LED_PIN);
-#else
-static GpioVirtPin ledRawHwPin; // Dummy pin for no hardware
-#endif
-
-#if LED_STATE_ON == 0
-static GpioVirtPin ledHwPin;
-static GpioNotTransformer ledInverter(&ledHwPin, &ledRawHwPin);
-#else
-static GpioPin &ledHwPin = ledRawHwPin;
-#endif
-
-#if defined(HAS_PMU)
-/**
- * A GPIO controlled by the PMU
- */
-class GpioPmuPin : public GpioPin
-{
-  public:
-    void set(bool value)
-    {
-        if (pmu_found && PMU) {
-            // blink the axp led
-            PMU->setChargingLedMode(value ? XPOWERS_CHG_LED_ON : XPOWERS_CHG_LED_OFF);
-        }
-    }
-} ledPmuHwPin;
-
-// In some cases we need to drive a PMU LED and a normal LED
-static GpioSplitter ledFinalPin(&ledHwPin, &ledPmuHwPin);
-#else
-static GpioPin &ledFinalPin = ledHwPin;
-#endif
-
-#ifdef USE_POWERMON
-/**
- * We monitor changes to the LED drive output because we use that as a sanity test in our power monitor stuff.
- */
-class MonitoredLedPin : public GpioPin
-{
-  public:
-    void set(bool value)
-    {
-        if (powerMon) {
-            if (value)
-                powerMon->setState(meshtastic_PowerMon_State_LED_On);
-            else
-                powerMon->clearState(meshtastic_PowerMon_State_LED_On);
-        }
-        ledFinalPin.set(value);
-    }
-} monitoredLedPin;
-#else
-static GpioPin &monitoredLedPin = ledFinalPin;
-#endif
-
-static GpioBinaryTransformer ledForcer(&ledForceOn, &ledBlink, &monitoredLedPin, GpioBinaryTransformer::Or);
\ No newline at end of file
diff --git a/src/Led.h b/src/Led.h
deleted file mode 100644
index 68833e041..000000000
--- a/src/Led.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GpioLogic.h"
-#include "configuration.h"
-
-/**
- * ledForceOn and ledForceOff both override the normal ledBlinker behavior (which is controlled by main)
- */
-extern GpioVirtPin ledForceOn, ledBlink;
\ No newline at end of file
diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp
index 9f8097b84..2153dbfd5 100644
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -9,13 +9,13 @@
  */
 #include "PowerFSM.h"
 #include "Default.h"
-#include "Led.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerMon.h"
 #include "configuration.h"
 #include "graphics/Screen.h"
 #include "main.h"
+#include "modules/StatusLEDModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 
@@ -103,7 +103,7 @@ static void lsIdle()
             uint32_t sleepTime = SLEEP_TIME;
 
             powerMon->setState(meshtastic_PowerMon_State_CPU_LightSleep);
-            ledBlink.set(false); // Never leave led on while in light sleep
+            statusLEDModule->setPowerLED(false);
             esp_sleep_source_t wakeCause2 = doLightSleep(sleepTime * 1000LL);
             powerMon->clearState(meshtastic_PowerMon_State_CPU_LightSleep);
 
@@ -111,7 +111,7 @@ static void lsIdle()
             case ESP_SLEEP_WAKEUP_TIMER:
                 // Normal case: timer expired, we should just go back to sleep ASAP
 
-                ledBlink.set(true);             // briefly turn on led
+                statusLEDModule->setPowerLED(true);
                 wakeCause2 = doLightSleep(100); // leave led on for 1ms
 
                 secsSlept += sleepTime;
@@ -146,7 +146,7 @@ static void lsIdle()
         }
     } else {
         // Time to stop sleeping!
-        ledBlink.set(false);
+        statusLEDModule->setPowerLED(false);
         LOG_INFO("Reached ls_secs, service loop()");
         powerFSM.trigger(EVENT_WAKE_TIMER);
     }
diff --git a/src/main.cpp b/src/main.cpp
index 08b6707fb..20efb955c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,7 +14,6 @@
 #include "power/PowerHAL.h"
 
 #include "FSCommon.h"
-#include "Led.h"
 #include "RTC.h"
 #include "SPILock.h"
 #include "Throttle.h"
@@ -245,26 +244,8 @@ const char *getDeviceName()
     return name;
 }
 
-// TODO remove from main.cpp
-static int32_t ledBlinker()
-{
-    // Still set up the blinking (heartbeat) interval but skip code path below, so LED will blink if
-    // config.device.led_heartbeat_disabled is changed
-    if (config.device.led_heartbeat_disabled)
-        return 1000;
-
-    static bool ledOn;
-    ledOn ^= 1;
-
-    ledBlink.set(ledOn);
-
-    // have a very sparse duty cycle of LED being on, unless charging, then blink 0.5Hz square wave rate to indicate that
-    return powerStatus->getIsCharging() ? 1000 : (ledOn ? 1 : 1000);
-}
-
 uint32_t timeLastPowered = 0;
 
-static Periodic *ledPeriodic;
 static OSThread *powerFSMthread;
 static OSThread *ambientLightingThread;
 
@@ -302,21 +283,16 @@ void earlyInitVariant() {}
 // blink user led in 3 flashes sequence to indicate what is happening
 void waitUntilPowerLevelSafe()
 {
-
-#ifdef LED_PIN
-    pinMode(LED_PIN, OUTPUT);
-#endif
-
     while (powerHAL_isPowerLevelSafe() == false) {
 
-#ifdef LED_PIN
+#ifdef LED_POWER
 
         // 3x: blink for 300 ms, pause for 300 ms
 
         for (int i = 0; i < 3; i++) {
-            digitalWrite(LED_PIN, LED_STATE_ON);
+            digitalWrite(LED_POWER, LED_STATE_ON);
             delay(300);
-            digitalWrite(LED_PIN, LED_STATE_OFF);
+            digitalWrite(LED_POWER, LED_STATE_OFF);
             delay(300);
         }
 #endif
@@ -340,6 +316,11 @@ void setup()
     // initialize power HAL layer as early as possible
     powerHAL_init();
 
+#ifdef LED_POWER
+    pinMode(LED_POWER, OUTPUT);
+    digitalWrite(LED_POWER, LED_STATE_ON);
+#endif
+
     // prevent booting if device is in power failure mode
     // boot sequence will follow when battery level raises to safe mode
     waitUntilPowerLevelSafe();
@@ -352,11 +333,6 @@ void setup()
     digitalWrite(PIN_POWER_EN, HIGH);
 #endif
 
-#ifdef LED_POWER
-    pinMode(LED_POWER, OUTPUT);
-    digitalWrite(LED_POWER, LED_STATE_ON);
-#endif
-
 #ifdef LED_NOTIFICATION
     pinMode(LED_NOTIFICATION, OUTPUT);
     digitalWrite(LED_NOTIFICATION, HIGH ^ LED_STATE_ON);
@@ -487,16 +463,6 @@ void setup()
 
     OSThread::setup();
 
-    // TODO make this ifdef based on defined pins and move from main.cpp
-#if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
-    // The ThinkNodes have their own blink logic
-    // ledPeriodic = new Periodic("Blink", elecrowLedBlinker);
-#else
-
-    ledPeriodic = new Periodic("Blink", ledBlinker);
-
-#endif
-
     fsInit();
 
 #if !MESHTASTIC_EXCLUDE_I2C
@@ -721,13 +687,6 @@ void setup()
     setupSDCard();
 #endif
 
-    // LED init
-
-#ifdef LED_PIN
-    pinMode(LED_PIN, OUTPUT);
-    digitalWrite(LED_PIN, LED_STATE_ON); // turn on for now
-#endif
-
     // Hello
     printInfo();
 #ifdef BUILD_EPOCH
@@ -961,12 +920,6 @@ void setup()
     setupNicheGraphics();
 #endif
 
-#ifdef LED_PIN
-    // Turn LED off after boot, if heartbeat by config
-    if (config.device.led_heartbeat_disabled)
-        digitalWrite(LED_PIN, HIGH ^ LED_STATE_ON);
-#endif
-
 // Do this after service.init (because that clears error_code)
 #ifdef HAS_PMU
     if (!pmu_found)
diff --git a/src/mesh/http/ContentHandler.cpp b/src/mesh/http/ContentHandler.cpp
index ea8d6af8e..912cb467e 100644
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@@ -9,7 +9,6 @@
 #if HAS_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
-#include "Led.h"
 #include "SPILock.h"
 #include "power.h"
 #include "serialization/JSON.h"
@@ -92,7 +91,6 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     ResourceNode *nodeFormUpload = new ResourceNode("/upload", "POST", &handleFormUpload);
 
     ResourceNode *nodeJsonScanNetworks = new ResourceNode("/json/scanNetworks", "GET", &handleScanNetworks);
-    ResourceNode *nodeJsonBlinkLED = new ResourceNode("/json/blink", "POST", &handleBlinkLED);
     ResourceNode *nodeJsonReport = new ResourceNode("/json/report", "GET", &handleReport);
     ResourceNode *nodeJsonNodes = new ResourceNode("/json/nodes", "GET", &handleNodes);
     ResourceNode *nodeJsonFsBrowseStatic = new ResourceNode("/json/fs/browse/static", "GET", &handleFsBrowseStatic);
@@ -110,7 +108,6 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     secureServer->registerNode(nodeRestart);
     secureServer->registerNode(nodeFormUpload);
     secureServer->registerNode(nodeJsonScanNetworks);
-    secureServer->registerNode(nodeJsonBlinkLED);
     secureServer->registerNode(nodeJsonFsBrowseStatic);
     secureServer->registerNode(nodeJsonDelete);
     secureServer->registerNode(nodeJsonReport);
@@ -133,7 +130,6 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     insecureServer->registerNode(nodeRestart);
     insecureServer->registerNode(nodeFormUpload);
     insecureServer->registerNode(nodeJsonScanNetworks);
-    insecureServer->registerNode(nodeJsonBlinkLED);
     insecureServer->registerNode(nodeJsonFsBrowseStatic);
     insecureServer->registerNode(nodeJsonDelete);
     insecureServer->registerNode(nodeJsonReport);
@@ -904,45 +900,6 @@ void handleRestart(HTTPRequest *req, HTTPResponse *res)
     webServerThread->requestRestart = (millis() / 1000) + 5;
 }
 
-void handleBlinkLED(HTTPRequest *req, HTTPResponse *res)
-{
-    res->setHeader("Content-Type", "application/json");
-    res->setHeader("Access-Control-Allow-Origin", "*");
-    res->setHeader("Access-Control-Allow-Methods", "POST");
-
-    ResourceParameters *params = req->getParams();
-    std::string blink_target;
-
-    if (!params->getQueryParameter("blink_target", blink_target)) {
-        // if no blink_target was supplied in the URL parameters of the
-        // POST request, then assume we should blink the LED
-        blink_target = "LED";
-    }
-
-    if (blink_target == "LED") {
-        uint8_t count = 10;
-        while (count > 0) {
-            ledBlink.set(true);
-            delay(50);
-            ledBlink.set(false);
-            delay(50);
-            count = count - 1;
-        }
-    } else {
-#if HAS_SCREEN
-        if (screen)
-            screen->blink();
-#endif
-    }
-
-    JSONObject jsonObjOuter;
-    jsonObjOuter["status"] = new JSONValue("ok");
-    JSONValue *value = new JSONValue(jsonObjOuter);
-    std::string jsonString = value->Stringify();
-    res->print(jsonString.c_str());
-    delete value;
-}
-
 void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
 {
     res->setHeader("Content-Type", "application/json");
diff --git a/src/mesh/http/ContentHandler.h b/src/mesh/http/ContentHandler.h
index 91cad3359..6efdb59b7 100644
--- a/src/mesh/http/ContentHandler.h
+++ b/src/mesh/http/ContentHandler.h
@@ -11,7 +11,6 @@ void handleFormUpload(HTTPRequest *req, HTTPResponse *res);
 void handleScanNetworks(HTTPRequest *req, HTTPResponse *res);
 void handleFsBrowseStatic(HTTPRequest *req, HTTPResponse *res);
 void handleFsDeleteStatic(HTTPRequest *req, HTTPResponse *res);
-void handleBlinkLED(HTTPRequest *req, HTTPResponse *res);
 void handleReport(HTTPRequest *req, HTTPResponse *res);
 void handleNodes(HTTPRequest *req, HTTPResponse *res);
 void handleUpdateFs(HTTPRequest *req, HTTPResponse *res);
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index 61dbc0b92..a4869f708 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -643,12 +643,6 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
             accelerometerThread->enabled = true;
             accelerometerThread->start();
         }
-#endif
-#ifdef LED_PIN
-        // Turn LED off if heartbeat by config
-        if (c.payload_variant.device.led_heartbeat_disabled) {
-            digitalWrite(LED_PIN, HIGH ^ LED_STATE_ON);
-        }
 #endif
         if (config.device.button_gpio == c.payload_variant.device.button_gpio &&
             config.device.buzzer_gpio == c.payload_variant.device.buzzer_gpio &&
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index a73e59ac9..0708afe82 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -1,9 +1,9 @@
 #include "configuration.h"
 #if !MESHTASTIC_EXCLUDE_INPUTBROKER
 #include "buzz/BuzzerFeedbackThread.h"
-#include "modules/StatusLEDModule.h"
 #include "modules/SystemCommandsModule.h"
 #endif
+#include "modules/StatusLEDModule.h"
 #if !MESHTASTIC_EXCLUDE_REPLYBOT
 #include "ReplyBotModule.h"
 #endif
@@ -112,9 +112,7 @@ void setupModules()
         buzzerFeedbackThread = new BuzzerFeedbackThread();
     }
 #endif
-#if defined(LED_CHARGE) || defined(LED_PAIRING)
     statusLEDModule = new StatusLEDModule();
-#endif
 #if !MESHTASTIC_EXCLUDE_REPLYBOT
     new ReplyBotModule();
 #endif
diff --git a/src/modules/PowerStressModule.cpp b/src/modules/PowerStressModule.cpp
index d487fe6fc..1c073a10a 100644
--- a/src/modules/PowerStressModule.cpp
+++ b/src/modules/PowerStressModule.cpp
@@ -1,5 +1,4 @@
 #include "PowerStressModule.h"
-#include "Led.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerMon.h"
@@ -78,10 +77,12 @@ int32_t PowerStressModule::runOnce()
 
             switch (p.cmd) {
             case meshtastic_PowerStressMessage_Opcode_LED_ON:
-                ledForceOn.set(true);
+                // FIXME - implement
+                // ledForceOn.set(true);
                 break;
             case meshtastic_PowerStressMessage_Opcode_LED_OFF:
-                ledForceOn.set(false);
+                // FIXME - implement
+                // ledForceOn.set(false);
                 break;
             case meshtastic_PowerStressMessage_Opcode_GPS_ON:
                 // FIXME - implement
diff --git a/src/modules/StatusLEDModule.cpp b/src/modules/StatusLEDModule.cpp
index e7a405bdf..644799c9b 100644
--- a/src/modules/StatusLEDModule.cpp
+++ b/src/modules/StatusLEDModule.cpp
@@ -13,8 +13,10 @@ StatusLEDModule::StatusLEDModule() : concurrency::OSThread("StatusLEDModule")
 {
     bluetoothStatusObserver.observe(&bluetoothStatus->onNewStatus);
     powerStatusObserver.observe(&powerStatus->onNewStatus);
+#if !MESHTASTIC_EXCLUDE_INPUTBROKER
     if (inputBroker)
         inputObserver.observe(inputBroker);
+#endif
 }
 
 int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
@@ -62,19 +64,22 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
     }
     return 0;
 };
-
+#if !MESHTASTIC_EXCLUDE_INPUTBROKER
 int StatusLEDModule::handleInputEvent(const InputEvent *event)
 {
     lastUserbuttonTime = millis();
     return 0;
 }
+#endif
 
 int32_t StatusLEDModule::runOnce()
 {
     my_interval = 1000;
 
     if (power_state == charging) {
+#ifndef POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING
         CHARGE_LED_state = !CHARGE_LED_state;
+#endif
     } else if (power_state == charged) {
         CHARGE_LED_state = LED_STATE_ON;
     } else if (power_state == critical) {
@@ -94,7 +99,15 @@ int32_t StatusLEDModule::runOnce()
         }
 
     } else {
-        CHARGE_LED_state = LED_STATE_OFF;
+        if (doing_fast_blink) {
+            CHARGE_LED_state = LED_STATE_OFF;
+            doing_fast_blink = false;
+            my_interval = 999;
+        } else {
+            CHARGE_LED_state = LED_STATE_ON;
+            doing_fast_blink = true;
+            my_interval = 1;
+        }
     }
 
     if (!config.bluetooth.enabled || PAIRING_LED_starttime + 30 * 1000 < millis() || doing_fast_blink) {
@@ -112,6 +125,11 @@ int32_t StatusLEDModule::runOnce()
         PAIRING_LED_state = LED_STATE_ON;
     }
 
+    // Override if disabled in config
+    if (config.device.led_heartbeat_disabled) {
+        CHARGE_LED_state = LED_STATE_OFF;
+    }
+#ifdef Battery_LED_1
     bool chargeIndicatorLED1 = LED_STATE_OFF;
     bool chargeIndicatorLED2 = LED_STATE_OFF;
     bool chargeIndicatorLED3 = LED_STATE_OFF;
@@ -126,9 +144,23 @@ int32_t StatusLEDModule::runOnce()
         if (powerStatus && powerStatus->getBatteryChargePercent() >= 75)
             chargeIndicatorLED4 = LED_STATE_ON;
     }
+#endif
 
-#ifdef LED_CHARGE
-    digitalWrite(LED_CHARGE, CHARGE_LED_state);
+#if defined(HAS_PMU)
+    if (pmu_found && PMU) {
+        // blink the axp led
+        PMU->setChargingLedMode(CHARGE_LED_state ? XPOWERS_CHG_LED_ON : XPOWERS_CHG_LED_OFF);
+    }
+#endif
+
+#ifdef PCA_LED_POWER
+    io.digitalWrite(PCA_LED_POWER, CHARGE_LED_state);
+#endif
+#ifdef PCA_LED_ENABLE
+    io.digitalWrite(PCA_LED_ENABLE, CHARGE_LED_state);
+#endif
+#ifdef LED_POWER
+    digitalWrite(LED_POWER, CHARGE_LED_state);
 #endif
 #ifdef LED_PAIRING
     digitalWrite(LED_PAIRING, PAIRING_LED_state);
@@ -149,3 +181,43 @@ int32_t StatusLEDModule::runOnce()
 
     return (my_interval);
 }
+
+void StatusLEDModule::setPowerLED(bool LEDon)
+{
+
+#if defined(HAS_PMU)
+    if (pmu_found && PMU) {
+        // blink the axp led
+        PMU->setChargingLedMode(LEDon ? XPOWERS_CHG_LED_ON : XPOWERS_CHG_LED_OFF);
+    }
+#endif
+    if (LEDon)
+        LEDon = LED_STATE_ON;
+    else
+        LEDon = LED_STATE_OFF;
+#ifdef PCA_LED_POWER
+    io.digitalWrite(PCA_LED_POWER, LEDon);
+#endif
+#ifdef PCA_LED_ENABLE
+    io.digitalWrite(PCA_LED_ENABLE, LEDon);
+#endif
+#ifdef LED_POWER
+    digitalWrite(LED_POWER, LEDon);
+#endif
+#ifdef LED_PAIRING
+    digitalWrite(LED_PAIRING, LEDon);
+#endif
+
+#ifdef Battery_LED_1
+    digitalWrite(Battery_LED_1, LEDon);
+#endif
+#ifdef Battery_LED_2
+    digitalWrite(Battery_LED_2, LEDon);
+#endif
+#ifdef Battery_LED_3
+    digitalWrite(Battery_LED_3, LEDon);
+#endif
+#ifdef Battery_LED_4
+    digitalWrite(Battery_LED_4, LEDon);
+#endif
+}
diff --git a/src/modules/StatusLEDModule.h b/src/modules/StatusLEDModule.h
index 98020cb32..c35f29019 100644
--- a/src/modules/StatusLEDModule.h
+++ b/src/modules/StatusLEDModule.h
@@ -5,10 +5,14 @@
 #include "PowerStatus.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
-#include "input/InputBroker.h"
+#include "main.h"
 #include <Arduino.h>
 #include <functional>
 
+#if !MESHTASTIC_EXCLUDE_INPUTBROKER
+#include "input/InputBroker.h"
+#endif
+
 class StatusLEDModule : private concurrency::OSThread
 {
     bool slowTrack = false;
@@ -17,8 +21,11 @@ class StatusLEDModule : private concurrency::OSThread
     StatusLEDModule();
 
     int handleStatusUpdate(const meshtastic::Status *);
-
+#if !MESHTASTIC_EXCLUDE_INPUTBROKER
     int handleInputEvent(const InputEvent *arg);
+#endif
+
+    void setPowerLED(bool);
 
   protected:
     unsigned int my_interval = 1000; // interval in millisconds
@@ -28,8 +35,10 @@ class StatusLEDModule : private concurrency::OSThread
         CallbackObserver<StatusLEDModule, const meshtastic::Status *>(this, &StatusLEDModule::handleStatusUpdate);
     CallbackObserver<StatusLEDModule, const meshtastic::Status *> powerStatusObserver =
         CallbackObserver<StatusLEDModule, const meshtastic::Status *>(this, &StatusLEDModule::handleStatusUpdate);
+#if !MESHTASTIC_EXCLUDE_INPUTBROKER
     CallbackObserver<StatusLEDModule, const InputEvent *> inputObserver =
         CallbackObserver<StatusLEDModule, const InputEvent *>(this, &StatusLEDModule::handleInputEvent);
+#endif
 
   private:
     bool CHARGE_LED_state = LED_STATE_OFF;
diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index d1965f03e..f73a5b896 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -158,7 +158,7 @@
 #endif
 
 #ifdef PIN_LED1
-#define LED_PIN PIN_LED1 // LED1 on nrf52840-DK
+#define LED_POWER PIN_LED1 // LED1 on nrf52840-DK
 #endif
 
 #ifdef PIN_BUTTON1
diff --git a/src/sleep.cpp b/src/sleep.cpp
index 8b30a5352..7c768d573 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -5,7 +5,6 @@
 #endif
 
 #include "Default.h"
-#include "Led.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "NodeDB.h"
@@ -13,6 +12,7 @@
 #include "detect/LoRaRadioType.h"
 #include "error.h"
 #include "main.h"
+#include "modules/StatusLEDModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 
@@ -268,8 +268,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
     digitalWrite(PIN_WD_EN, LOW);
 #endif
 #endif
-    ledBlink.set(false);
-
+    statusLEDModule->setPowerLED(false);
 #ifdef RESET_OLED
     digitalWrite(RESET_OLED, 1); // put the display in reset before killing its power
 #endif
diff --git a/variants/esp32/betafpv_2400_tx_micro/variant.h b/variants/esp32/betafpv_2400_tx_micro/variant.h
index 67699e7c8..8e875a3e6 100644
--- a/variants/esp32/betafpv_2400_tx_micro/variant.h
+++ b/variants/esp32/betafpv_2400_tx_micro/variant.h
@@ -14,7 +14,7 @@
 #define LORA_CS 5
 #define RF95_FAN_EN 17
 
-// #define LED_PIN 16 // This is a LED_WS2812 not a standard LED
+// This is a LED_WS2812 not a standard LED
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
 #define NEOPIXEL_DATA 16                     // gpio pin used to send data to the neopixels
diff --git a/variants/esp32/betafpv_900_tx_nano/variant.h b/variants/esp32/betafpv_900_tx_nano/variant.h
index 7a4ae9190..6bee74d90 100644
--- a/variants/esp32/betafpv_900_tx_nano/variant.h
+++ b/variants/esp32/betafpv_900_tx_nano/variant.h
@@ -20,7 +20,7 @@
 #define LORA_DIO2
 #define LORA_DIO3
 
-#define LED_PIN 16 // green - blue is at 17
+#define LED_POWER 16 // green - blue is at 17
 
 #define BUTTON_PIN 25
 #define BUTTON_NEED_PULLUP
diff --git a/variants/esp32/chatter2/variant.h b/variants/esp32/chatter2/variant.h
index 28ce64f91..e91e4dcef 100644
--- a/variants/esp32/chatter2/variant.h
+++ b/variants/esp32/chatter2/variant.h
@@ -23,8 +23,6 @@
 #define SX126X_TXEN RADIOLIB_NC
 #define SX126X_RXEN RADIOLIB_NC
 
-// Status
-// #define LED_PIN 1
 // 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/esp32/diy/9m2ibr_aprs_lora_tracker/variant.h b/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.h
index 037933140..1f84fffa1 100644
--- a/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.h
+++ b/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.h
@@ -21,8 +21,8 @@
 #define BUTTON_PIN 15 // Right side button - if not available, set device.button_gpio to 0 from Meshtastic client
 
 // LEDs
-#define LED_PIN 13 // Tx LED
-#define USER_LED 2 // Rx LED
+#define LED_POWER 13 // Tx LED
+#define USER_LED 2   // Rx LED
 
 // Buzzer
 #define PIN_BUZZER 33
diff --git a/variants/esp32/diy/hydra/variant.h b/variants/esp32/diy/hydra/variant.h
index e5c10e26b..68194f869 100644
--- a/variants/esp32/diy/hydra/variant.h
+++ b/variants/esp32/diy/hydra/variant.h
@@ -15,7 +15,7 @@
 #define ADC_MULTIPLIER 1.85 // (R1 = 470k, R2 = 680k)
 #define EXT_PWR_DETECT 4    // Pin to detect connected external power source for LILYGO® TTGO T-Energy T18 and other DIY boards
 #define EXT_NOTIFY_OUT 12   // Overridden default pin to use for Ext Notify Module (#975).
-#define LED_PIN 2           // add status LED (compatible with core-pcb and DIY targets)
+#define LED_POWER 2         // add status LED (compatible with core-pcb and DIY targets)
 
 // Radio
 #define USE_SX1262 // E22-900M30S uses SX1262
diff --git a/variants/esp32/diy/v1/variant.h b/variants/esp32/diy/v1/variant.h
index 8a2df3f2b..862969af0 100644
--- a/variants/esp32/diy/v1/variant.h
+++ b/variants/esp32/diy/v1/variant.h
@@ -15,7 +15,7 @@
 #define ADC_MULTIPLIER 1.85 // (R1 = 470k, R2 = 680k)
 #define EXT_PWR_DETECT 4    // Pin to detect connected external power source for LILYGO® TTGO T-Energy T18 and other DIY boards
 #define EXT_NOTIFY_OUT 12   // Overridden default pin to use for Ext Notify Module (#975).
-#define LED_PIN 2           // add status LED (compatible with core-pcb and DIY targets)
+#define LED_POWER 2         // add status LED (compatible with core-pcb and DIY targets)
 
 #define LORA_DIO0 26  // a No connect on the SX1262/SX1268 module
 #define LORA_RESET 23 // RST for SX1276, and for SX1262/SX1268
diff --git a/variants/esp32/hackerboxes_esp32_io/variant.h b/variants/esp32/hackerboxes_esp32_io/variant.h
index 06f0032ee..42ce2423e 100644
--- a/variants/esp32/hackerboxes_esp32_io/variant.h
+++ b/variants/esp32/hackerboxes_esp32_io/variant.h
@@ -3,7 +3,7 @@
 // HACKBOX LoRa IO Kit
 // Uses a ESP-32-WROOM and a RA-01SH (SX1262) LoRa Board
 
-#define LED_PIN 2      // LED
+#define LED_POWER 2    // LED
 #define LED_STATE_ON 1 // State when LED is lit
 
 #define HAS_SCREEN 0
diff --git a/variants/esp32/heltec_v1/variant.h b/variants/esp32/heltec_v1/variant.h
index d1338a28e..c4f6577a8 100644
--- a/variants/esp32/heltec_v1/variant.h
+++ b/variants/esp32/heltec_v1/variant.h
@@ -12,7 +12,7 @@
 
 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
 
-#define LED_PIN 25   // If defined we will blink this LED
+#define LED_POWER 25 // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses
 
 #define USE_RF95
diff --git a/variants/esp32/heltec_v2.1/variant.h b/variants/esp32/heltec_v2.1/variant.h
index 8ebccc54f..e4aeb363d 100644
--- a/variants/esp32/heltec_v2.1/variant.h
+++ b/variants/esp32/heltec_v2.1/variant.h
@@ -18,7 +18,7 @@
 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
 
 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN 0   // If defined, this will be used for user button presses
 
 #define USE_RF95
diff --git a/variants/esp32/heltec_v2/variant.h b/variants/esp32/heltec_v2/variant.h
index 5c183818b..c35465f81 100644
--- a/variants/esp32/heltec_v2/variant.h
+++ b/variants/esp32/heltec_v2/variant.h
@@ -13,7 +13,7 @@
 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
 
 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN 0   // If defined, this will be used for user button presses
 
 #define USE_RF95
diff --git a/variants/esp32/heltec_wireless_bridge/variant.h b/variants/esp32/heltec_wireless_bridge/variant.h
index 5ad16d0e2..82cc83aa8 100644
--- a/variants/esp32/heltec_wireless_bridge/variant.h
+++ b/variants/esp32/heltec_wireless_bridge/variant.h
@@ -15,7 +15,7 @@
 #undef GPS_TX_PIN
 
 // Green / Lora = PIN 22 / GPIO2, Yellow / Wifi = PIN 23 / GPIO0, Blue / BLE = PIN 25 / GPIO16
-#define LED_PIN 22
+#define LED_POWER 22
 #define WIFI_LED 23
 #define BLE_LED 25
 
diff --git a/variants/esp32/heltec_wsl_v2.1/variant.h b/variants/esp32/heltec_wsl_v2.1/variant.h
index 3927a89d6..db374afb6 100644
--- a/variants/esp32/heltec_wsl_v2.1/variant.h
+++ b/variants/esp32/heltec_wsl_v2.1/variant.h
@@ -1,7 +1,7 @@
 #define I2C_SCL SCL
 #define I2C_SDA SDA
 
-#define LED_PIN LED
+#define LED_POWER LED
 
 // active low, powers the Battery reader, but no lora antenna boost (?)
 // #define VEXT_ENABLE Vext
diff --git a/variants/esp32/m5stack_coreink/variant.h b/variants/esp32/m5stack_coreink/variant.h
index 9bf45f2ff..84a1e1966 100644
--- a/variants/esp32/m5stack_coreink/variant.h
+++ b/variants/esp32/m5stack_coreink/variant.h
@@ -11,7 +11,7 @@
 
 // Green LED
 #define LED_STATE_ON 1 // State when LED is lit
-#define LED_PIN 10
+#define LED_POWER 10
 
 // PCF8563 RTC Module
 #define PCF8563_RTC 0x51
diff --git a/variants/esp32/radiomaster_900_bandit_nano/variant.h b/variants/esp32/radiomaster_900_bandit_nano/variant.h
index 1b6bba126..318401f92 100644
--- a/variants/esp32/radiomaster_900_bandit_nano/variant.h
+++ b/variants/esp32/radiomaster_900_bandit_nano/variant.h
@@ -37,7 +37,7 @@
 /*
   LED PIN setup.
 */
-#define LED_PIN 15
+#define LED_POWER 15
 
 /*
   Five way button when using ADC.
diff --git a/variants/esp32/rak11200/variant.h b/variants/esp32/rak11200/variant.h
index fe7d05676..a38ac83b7 100644
--- a/variants/esp32/rak11200/variant.h
+++ b/variants/esp32/rak11200/variant.h
@@ -43,7 +43,7 @@ static const uint8_t SCK = 33;
 #undef GPS_TX_PIN
 #define GPS_TX_PIN (TX1)
 
-#define LED_PIN LED_BLUE
+#define LED_POWER LED_BLUE
 
 #define PIN_VBAT WB_A0
 #define BATTERY_PIN PIN_VBAT
diff --git a/variants/esp32/tbeam/variant.h b/variants/esp32/tbeam/variant.h
index 2c1e61c49..cca52cb9a 100644
--- a/variants/esp32/tbeam/variant.h
+++ b/variants/esp32/tbeam/variant.h
@@ -9,7 +9,7 @@
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
 
 #define LED_STATE_ON 0 // State when LED is lit
-#define LED_PIN 4      // Newer tbeams (1.1) have an extra led on GPIO4
+#define LED_POWER 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
@@ -49,7 +49,7 @@
 
 #undef EXT_NOTIFY_OUT
 #undef LED_STATE_ON
-#undef LED_PIN
+#undef LED_POWER
 
 #define HAS_CST226SE 1
 #define HAS_TOUCHSCREEN 1
diff --git a/variants/esp32/tlora_v1/variant.h b/variants/esp32/tlora_v1/variant.h
index 83e2c193e..ff9f4a8ef 100644
--- a/variants/esp32/tlora_v1/variant.h
+++ b/variants/esp32/tlora_v1/variant.h
@@ -5,7 +5,7 @@
 
 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
 #define VEXT_ON_VALUE LOW
-#define LED_PIN 2    // If defined we will blink this LED
+#define LED_POWER 2  // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses
 #define BUTTON_NEED_PULLUP
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
diff --git a/variants/esp32/tlora_v1_3/variant.h b/variants/esp32/tlora_v1_3/variant.h
index 73cb31f27..2b0395d8a 100644
--- a/variants/esp32/tlora_v1_3/variant.h
+++ b/variants/esp32/tlora_v1_3/variant.h
@@ -7,7 +7,7 @@
 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
 
 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN 36
 #define BUTTON_NEED_PULLUP
 
diff --git a/variants/esp32/tlora_v2/variant.h b/variants/esp32/tlora_v2/variant.h
index 8a7cf89ec..099fdc2ee 100644
--- a/variants/esp32/tlora_v2/variant.h
+++ b/variants/esp32/tlora_v2/variant.h
@@ -5,7 +5,7 @@
 #define I2C_SCL 22
 
 #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
+#define LED_POWER 25   // If defined we will blink this LED
 #define BUTTON_PIN                                                                                                               \
     0 // If defined, this will be used for user button presses, if your board doesn't have a physical switch, you can wire one
       // between this pin and ground
diff --git a/variants/esp32/tlora_v2_1_16/platformio.ini b/variants/esp32/tlora_v2_1_16/platformio.ini
index dfdbcb152..2ea9bbb50 100644
--- a/variants/esp32/tlora_v2_1_16/platformio.ini
+++ b/variants/esp32/tlora_v2_1_16/platformio.ini
@@ -22,4 +22,4 @@ build_flags =
   ${env:tlora-v2-1-1_6.build_flags}
   -DBUTTON_PIN=0
   -DPIN_BUZZER=25
-  -DLED_PIN=-1
\ No newline at end of file
+  -DLED_POWER=-1
\ No newline at end of file
diff --git a/variants/esp32/tlora_v2_1_16/variant.h b/variants/esp32/tlora_v2_1_16/variant.h
index 9584dd68b..5488fddf4 100644
--- a/variants/esp32/tlora_v2_1_16/variant.h
+++ b/variants/esp32/tlora_v2_1_16/variant.h
@@ -8,10 +8,10 @@
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
 
-#if defined(LED_PIN) && LED_PIN == -1
-#undef LED_PIN
+#if defined(LED_POWER) && LED_POWER == -1
+#undef LED_POWER
 #else
-#define LED_PIN 25 // If defined we will blink this LED
+#define LED_POWER 25 // If defined we will blink this LED
 #endif
 
 #define USE_RF95
diff --git a/variants/esp32/tlora_v2_1_18/variant.h b/variants/esp32/tlora_v2_1_18/variant.h
index efc676992..1ab08c364 100644
--- a/variants/esp32/tlora_v2_1_18/variant.h
+++ b/variants/esp32/tlora_v2_1_18/variant.h
@@ -6,7 +6,7 @@
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
 
-#define LED_PIN 25    // If defined we will blink this LED
+#define LED_POWER 25  // If defined we will blink this LED
 #define BUTTON_PIN 12 // If defined, this will be used for user button presses,
 
 #define BUTTON_NEED_PULLUP
diff --git a/variants/esp32/trackerd/variant.h b/variants/esp32/trackerd/variant.h
index 0996e85ac..8071ba99d 100644
--- a/variants/esp32/trackerd/variant.h
+++ b/variants/esp32/trackerd/variant.h
@@ -8,7 +8,7 @@
 #define GPS_RX_PIN 9
 #define GPS_TX_PIN 10
 
-#define LED_PIN 13 // 13 red, 2 blue, 15 red
+#define LED_POWER 13 // 13 red, 2 blue, 15 red
 
 #define BUTTON_PIN 0
 #define BUTTON_NEED_PULLUP
diff --git a/variants/esp32c3/ai-c3/variant.h b/variants/esp32c3/ai-c3/variant.h
index 6c4f4d38a..a933de76b 100644
--- a/variants/esp32c3/ai-c3/variant.h
+++ b/variants/esp32c3/ai-c3/variant.h
@@ -4,7 +4,7 @@
 #define I2C_SCL SCL
 
 #define BUTTON_PIN 9 // BOOT button
-#define LED_PIN 30   // RGB LED
+#define LED_POWER 30 // RGB LED
 
 #define USE_RF95
 #define LORA_SCK 4
diff --git a/variants/esp32c3/hackerboxes_esp32c3_oled/variant.h b/variants/esp32c3/hackerboxes_esp32c3_oled/variant.h
index 7432a9941..71090fbeb 100644
--- a/variants/esp32c3/hackerboxes_esp32c3_oled/variant.h
+++ b/variants/esp32c3/hackerboxes_esp32c3_oled/variant.h
@@ -3,7 +3,7 @@
 // Hackerboxes LoRa ESP32-C3 OLED Kit
 // Uses a ESP32-C3 OLED Board and a RA-01SH (SX1262) LoRa Board
 
-#define LED_PIN 8      // LED
+#define LED_POWER 8    // LED
 #define LED_STATE_ON 1 // State when LED is lit
 
 #define HAS_SCREEN 0
diff --git a/variants/esp32c3/heltec_esp32c3/variant.h b/variants/esp32c3/heltec_esp32c3/variant.h
index ca00c43fa..ed2f6f878 100644
--- a/variants/esp32c3/heltec_esp32c3/variant.h
+++ b/variants/esp32c3/heltec_esp32c3/variant.h
@@ -3,7 +3,7 @@
 // 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_POWER 2    // LED
 #define LED_STATE_ON 1 // State when LED is lit
 
 #define HAS_SCREEN 0
diff --git a/variants/esp32c6/tlora_c6/variant.h b/variants/esp32c6/tlora_c6/variant.h
index 4a0d40232..fcc5b9813 100644
--- a/variants/esp32c6/tlora_c6/variant.h
+++ b/variants/esp32c6/tlora_c6/variant.h
@@ -1,7 +1,7 @@
 #define I2C_SDA 8 // I2C pins for this board
 #define I2C_SCL 9
 
-#define LED_PIN 7      // If defined we will blink this LED
+#define LED_POWER 7    // If defined we will blink this LED
 #define LED_STATE_ON 0 // State when LED is lit
 
 #define USE_SX1262
diff --git a/variants/esp32s2/nugget_s2_lora/variant.h b/variants/esp32s2/nugget_s2_lora/variant.h
index 2d123d603..9d88882e5 100644
--- a/variants/esp32s2/nugget_s2_lora/variant.h
+++ b/variants/esp32s2/nugget_s2_lora/variant.h
@@ -1,7 +1,7 @@
 #define I2C_SDA 34 // I2C pins for this board
 #define I2C_SCL 36
 
-#define LED_PIN 15 // If defined we will blink this LED
+#define LED_POWER 15 // If defined we will blink this LED
 
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 3                     // How many neopixels are connected
diff --git a/variants/esp32s3/CDEBYTE_EoRa-Hub/variant.h b/variants/esp32s3/CDEBYTE_EoRa-Hub/variant.h
index 1591f6395..5decc7eb2 100644
--- a/variants/esp32s3/CDEBYTE_EoRa-Hub/variant.h
+++ b/variants/esp32s3/CDEBYTE_EoRa-Hub/variant.h
@@ -1,7 +1,7 @@
 // EByte EoRA-Hub
 // Uses E80 (LR1121) LoRa module
 
-#define LED_PIN 35
+#define LED_POWER 35
 
 // Button - user interface
 #define BUTTON_PIN 0 // BOOT button
diff --git a/variants/esp32s3/CDEBYTE_EoRa-S3/variant.h b/variants/esp32s3/CDEBYTE_EoRa-S3/variant.h
index 5da99667b..85321cbe0 100644
--- a/variants/esp32s3/CDEBYTE_EoRa-S3/variant.h
+++ b/variants/esp32s3/CDEBYTE_EoRa-S3/variant.h
@@ -1,5 +1,5 @@
 // LED - status indication
-#define LED_PIN 37
+#define LED_POWER 37
 
 // Button - user interface
 #define BUTTON_PIN 0 // This is the BOOT button, and it has its own pull-up resistor
diff --git a/variants/esp32s3/EBYTE_ESP32-S3/variant.h b/variants/esp32s3/EBYTE_ESP32-S3/variant.h
index 80fb26434..6dbe6231c 100644
--- a/variants/esp32s3/EBYTE_ESP32-S3/variant.h
+++ b/variants/esp32s3/EBYTE_ESP32-S3/variant.h
@@ -100,7 +100,7 @@
 */
 
 // Status
-#define LED_PIN 1
+#define LED_POWER 1
 #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
diff --git a/variants/esp32s3/ELECROW-ThinkNode-M2/variant.h b/variants/esp32s3/ELECROW-ThinkNode-M2/variant.h
index ff4f883fe..8768fd70e 100644
--- a/variants/esp32s3/ELECROW-ThinkNode-M2/variant.h
+++ b/variants/esp32s3/ELECROW-ThinkNode-M2/variant.h
@@ -1,5 +1,5 @@
 // Status
-#define LED_PIN 1
+#define LED_POWER 1
 
 #define PIN_BUTTON1 47 // 功能键
 #define PIN_BUTTON2 4  // 电源键
diff --git a/variants/esp32s3/ELECROW-ThinkNode-M5/variant.cpp b/variants/esp32s3/ELECROW-ThinkNode-M5/variant.cpp
index 4b485a1a3..82b218cf9 100644
--- a/variants/esp32s3/ELECROW-ThinkNode-M5/variant.cpp
+++ b/variants/esp32s3/ELECROW-ThinkNode-M5/variant.cpp
@@ -8,5 +8,11 @@ void earlyInitVariant()
     Wire.begin(48, 47);
     io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
     io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
+    io.pinMode(PCA_LED_POWER, OUTPUT);
+    io.pinMode(PCA_LED_USER, OUTPUT);
+    io.pinMode(PCA_LED_ENABLE, OUTPUT);
+
     io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
+    io.digitalWrite(PCA_LED_USER, LOW);
+    io.digitalWrite(PCA_LED_ENABLE, LOW);
 }
diff --git a/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h b/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
index 353741d91..4f6e415a2 100644
--- a/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
+++ b/variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
@@ -8,8 +8,10 @@
 
 // LED
 // Both of these are on the GPIO expander
-#define PCA_LED_USER 1  // the Blue LED
-#define PCA_LED_POWER 3 // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
+#define PCA_LED_USER 1   // the Blue LED
+#define PCA_LED_ENABLE 2 // the power supply to the LEDs, in an OR arrangement with VBUS power
+#define PCA_LED_POWER 3  // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
+#define POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING
 
 // USB_CHECK
 #define EXT_PWR_DETECT 12
diff --git a/variants/esp32s3/bpi_picow_esp32_s3/variant.h b/variants/esp32s3/bpi_picow_esp32_s3/variant.h
index d8d9413d7..d3e573645 100644
--- a/variants/esp32s3/bpi_picow_esp32_s3/variant.h
+++ b/variants/esp32s3/bpi_picow_esp32_s3/variant.h
@@ -11,7 +11,7 @@
 #define I2C_SDA 12
 #define I2C_SCL 14
 
-#define LED_PIN 46
+#define LED_POWER 46
 #define LED_STATE_ON 0 // State when LED is litted
 
 // #define BUTTON_PIN 15 // Pico OLED 1.3 User key 0 - removed User key 1 (17)
diff --git a/variants/esp32s3/crowpanel-esp32s3-5-epaper/variant.h b/variants/esp32s3/crowpanel-esp32s3-5-epaper/variant.h
index 360e33481..c9200b96b 100644
--- a/variants/esp32s3/crowpanel-esp32s3-5-epaper/variant.h
+++ b/variants/esp32s3/crowpanel-esp32s3-5-epaper/variant.h
@@ -26,7 +26,7 @@
 // #define GPS_RX_PIN 44
 // #define GPS_TX_PIN 43
 
-#define LED_PIN 41
+#define LED_POWER 41
 #define BUTTON_PIN 2
 #define BUTTON_NEED_PULLUP
 
diff --git a/variants/esp32s3/diy/my_esp32s3_diy_eink/variant.h b/variants/esp32s3/diy/my_esp32s3_diy_eink/variant.h
index 024f912dd..54db932ea 100644
--- a/variants/esp32s3/diy/my_esp32s3_diy_eink/variant.h
+++ b/variants/esp32s3/diy/my_esp32s3_diy_eink/variant.h
@@ -11,7 +11,7 @@
 #define I2C_SDA 18 // 1 // I2C pins for this board
 #define I2C_SCL 17 // 2
 
-// #define LED_PIN 38     // This is a RGB LED not a standard LED
+// #define LED_POWER 38     // This is a RGB LED not a standard LED
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
 #define NEOPIXEL_DATA 38                     // gpio pin used to send data to the neopixels
diff --git a/variants/esp32s3/diy/my_esp32s3_diy_oled/variant.h b/variants/esp32s3/diy/my_esp32s3_diy_oled/variant.h
index 8a3a39003..20e058058 100644
--- a/variants/esp32s3/diy/my_esp32s3_diy_oled/variant.h
+++ b/variants/esp32s3/diy/my_esp32s3_diy_oled/variant.h
@@ -11,7 +11,7 @@
 #define I2C_SDA 18 // 1 // I2C pins for this board
 #define I2C_SCL 17 // 2
 
-// #define LED_PIN 38     // This is a RGB LED not a standard LED
+// #define LED_POWER 38     // This is a RGB LED not a standard LED
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 1                     // How many neopixels are connected
 #define NEOPIXEL_DATA 38                     // gpio pin used to send data to the neopixels
diff --git a/variants/esp32s3/dreamcatcher/variant.h b/variants/esp32s3/dreamcatcher/variant.h
index 7835979e1..963aff477 100644
--- a/variants/esp32s3/dreamcatcher/variant.h
+++ b/variants/esp32s3/dreamcatcher/variant.h
@@ -6,7 +6,7 @@
 #define I2C_SDA1 45
 #define I2C_SCL1 46
 
-#define LED_PIN 6
+#define LED_POWER 6
 #define LED_STATE_ON 1
 #define BUTTON_PIN 0
 
diff --git a/variants/esp32s3/heltec_capsule_sensor_v3/variant.h b/variants/esp32s3/heltec_capsule_sensor_v3/variant.h
index b30b7fc3e..3ee5545a8 100644
--- a/variants/esp32s3/heltec_capsule_sensor_v3/variant.h
+++ b/variants/esp32s3/heltec_capsule_sensor_v3/variant.h
@@ -1,5 +1,5 @@
-#define LED_PIN 33
-#define LED_PIN2 34
+#define LED_POWER 33
+#define LED_POWER2 34
 #define EXT_PWR_DETECT 35
 
 #define BUTTON_PIN 18
diff --git a/variants/esp32s3/heltec_v3/variant.h b/variants/esp32s3/heltec_v3/variant.h
index d760c3b7f..d2d904d9c 100644
--- a/variants/esp32s3/heltec_v3/variant.h
+++ b/variants/esp32s3/heltec_v3/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN LED
+#define LED_POWER LED
 
 #define USE_SSD1306 // Heltec_v3 has a SSD1306 display
 
diff --git a/variants/esp32s3/heltec_v4/platformio.ini b/variants/esp32s3/heltec_v4/platformio.ini
index 20b3b4606..8b951b5e9 100644
--- a/variants/esp32s3/heltec_v4/platformio.ini
+++ b/variants/esp32s3/heltec_v4/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   ${heltec_v4_base.build_flags}
   -D HELTEC_V4_OLED
   -D USE_SSD1306 ; Heltec_v4 has an SSD1315 display (compatible with SSD1306 driver)
-  -D LED_PIN=35
+  -D LED_POWER=35
   -D RESET_OLED=21
   -D I2C_SDA=17
   -D I2C_SCL=18
diff --git a/variants/esp32s3/heltec_vision_master_e213/variant.h b/variants/esp32s3/heltec_vision_master_e213/variant.h
index 60f4e00cc..c9aaa2ee8 100644
--- a/variants/esp32s3/heltec_vision_master_e213/variant.h
+++ b/variants/esp32s3/heltec_vision_master_e213/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 45 // LED is not populated on earliest board variant
+#define LED_POWER 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
 #define PIN_BUTTON2 21             // Second built-in button
 #define ALT_BUTTON_PIN PIN_BUTTON2 // Send the up event
diff --git a/variants/esp32s3/heltec_vision_master_e290/variant.h b/variants/esp32s3/heltec_vision_master_e290/variant.h
index d7bae7dc2..b32715e39 100644
--- a/variants/esp32s3/heltec_vision_master_e290/variant.h
+++ b/variants/esp32s3/heltec_vision_master_e290/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 45 // LED is not populated on earliest board variant
+#define LED_POWER 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
 #define PIN_BUTTON2 21             // Second built-in button
 #define ALT_BUTTON_PIN PIN_BUTTON2 // Send the up event
diff --git a/variants/esp32s3/heltec_wireless_paper/variant.h b/variants/esp32s3/heltec_wireless_paper/variant.h
index bbfd54ada..7f57bb67f 100644
--- a/variants/esp32s3/heltec_wireless_paper/variant.h
+++ b/variants/esp32s3/heltec_wireless_paper/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 #define BUTTON_PIN 0
 
 // I2C
diff --git a/variants/esp32s3/heltec_wireless_paper_v1/variant.h b/variants/esp32s3/heltec_wireless_paper_v1/variant.h
index 4505395c9..59dd485f6 100644
--- a/variants/esp32s3/heltec_wireless_paper_v1/variant.h
+++ b/variants/esp32s3/heltec_wireless_paper_v1/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 #define BUTTON_PIN 0
 
 // I2C
diff --git a/variants/esp32s3/heltec_wireless_tracker/variant.h b/variants/esp32s3/heltec_wireless_tracker/variant.h
index 3b19f5afd..b40e40011 100644
--- a/variants/esp32s3/heltec_wireless_tracker/variant.h
+++ b/variants/esp32s3/heltec_wireless_tracker/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 
 #define _VARIANT_HELTEC_WIRELESS_TRACKER
 #define HELTEC_TRACKER_V1_X
diff --git a/variants/esp32s3/heltec_wireless_tracker_V1_0/variant.h b/variants/esp32s3/heltec_wireless_tracker_V1_0/variant.h
index df5ab4716..e7d3f93c1 100644
--- a/variants/esp32s3/heltec_wireless_tracker_V1_0/variant.h
+++ b/variants/esp32s3/heltec_wireless_tracker_V1_0/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 
 #define HELTEC_TRACKER_V1_X
 
diff --git a/variants/esp32s3/heltec_wireless_tracker_v2/variant.h b/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
index a5489173d..0ca2dfc03 100644
--- a/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
+++ b/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 
 #define _VARIANT_HELTEC_WIRELESS_TRACKER
 
diff --git a/variants/esp32s3/heltec_wsl_v3/variant.h b/variants/esp32s3/heltec_wsl_v3/variant.h
index c103b9172..c81f45d3b 100644
--- a/variants/esp32s3/heltec_wsl_v3/variant.h
+++ b/variants/esp32s3/heltec_wsl_v3/variant.h
@@ -1,7 +1,7 @@
 #define I2C_SCL SCL
 #define I2C_SDA SDA
 
-#define LED_PIN LED
+#define LED_POWER LED
 
 #define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
 #define VEXT_ON_VALUE LOW
diff --git a/variants/esp32s3/mesh-tab/variant.h b/variants/esp32s3/mesh-tab/variant.h
index 99204bba3..30042b90f 100644
--- a/variants/esp32s3/mesh-tab/variant.h
+++ b/variants/esp32s3/mesh-tab/variant.h
@@ -13,7 +13,7 @@
 #define ADC_CHANNEL ADC1_GPIO4_CHANNEL
 
 // LED
-#define LED_PIN 21
+#define LED_POWER 21
 
 // Button
 #define BUTTON_PIN 0
diff --git a/variants/esp32s3/nibble_esp32/variant.h b/variants/esp32s3/nibble_esp32/variant.h
index 8ffbd9d59..8d75a4fbf 100644
--- a/variants/esp32s3/nibble_esp32/variant.h
+++ b/variants/esp32s3/nibble_esp32/variant.h
@@ -1,7 +1,7 @@
 #define I2C_SDA 11 // I2C pins for this board
 #define I2C_SCL 10
 
-#define LED_PIN 1 // If defined we will blink this LED
+#define LED_POWER 1 // If defined we will blink this LED
 
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses
 #define BUTTON_NEED_PULLUP
diff --git a/variants/esp32s3/nugget_s3_lora/variant.h b/variants/esp32s3/nugget_s3_lora/variant.h
index 1354d0837..633ed27f6 100644
--- a/variants/esp32s3/nugget_s3_lora/variant.h
+++ b/variants/esp32s3/nugget_s3_lora/variant.h
@@ -4,7 +4,7 @@
 #define USE_SSD1306
 #define DISPLAY_FLIP_SCREEN
 
-#define LED_PIN 15 // If defined we will blink this LED
+#define LED_POWER 15 // If defined we will blink this LED
 
 #define HAS_NEOPIXEL                         // Enable the use of neopixels
 #define NEOPIXEL_COUNT 3                     // How many neopixels are connected
diff --git a/variants/esp32s3/rak3312/variant.h b/variants/esp32s3/rak3312/variant.h
index 6431f1fd0..ee0fff524 100644
--- a/variants/esp32s3/rak3312/variant.h
+++ b/variants/esp32s3/rak3312/variant.h
@@ -24,7 +24,7 @@
 #define PIN_LED1 LED_GREEN
 #define LED_NOTIFICATION LED_BLUE
 
-#define LED_PIN LED_GREEN
+#define LED_POWER LED_GREEN
 #define ledOff(pin) pinMode(pin, INPUT)
 
 #define LED_STATE_ON 1 // State when LED is litted
diff --git a/variants/esp32s3/rak_wismesh_tap_v2/variant.h b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
index 7d263165c..90cb12053 100644
--- a/variants/esp32s3/rak_wismesh_tap_v2/variant.h
+++ b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
@@ -32,7 +32,7 @@
 #define PIN_LED1 LED_GREEN
 #define LED_NOTIFICATION LED_BLUE
 
-#define LED_PIN LED_GREEN
+#define LED_POWER LED_GREEN
 #define ledOff(pin) pinMode(pin, INPUT)
 
 #define LED_STATE_ON 1 // State when LED is litted
diff --git a/variants/esp32s3/seeed_xiao_s3/variant.h b/variants/esp32s3/seeed_xiao_s3/variant.h
index d8dcbc8d4..11bf48521 100644
--- a/variants/esp32s3/seeed_xiao_s3/variant.h
+++ b/variants/esp32s3/seeed_xiao_s3/variant.h
@@ -30,7 +30,7 @@ Expansion Board Infomation : https://www.seeedstudio.com/Seeeduino-XIAO-Expansio
 L76K GPS Module Information : https://www.seeedstudio.com/L76K-GNSS-Module-for-Seeed-Studio-XIAO-p-5864.html
 */
 
-#define LED_PIN 48
+#define LED_POWER 48
 #define LED_STATE_ON 1 // State when LED is lit
 
 #define BUTTON_PIN 21 // This is the Program Button
diff --git a/variants/esp32s3/t-beam-1w/variant.h b/variants/esp32s3/t-beam-1w/variant.h
index dbe1620e2..f5345de79 100644
--- a/variants/esp32s3/t-beam-1w/variant.h
+++ b/variants/esp32s3/t-beam-1w/variant.h
@@ -67,7 +67,7 @@
 #endif
 
 // LED
-#define LED_PIN 18
+#define LED_POWER 18
 #define LED_STATE_ON 1 // HIGH = ON
 
 // Battery ADC
diff --git a/variants/esp32s3/t-eth-elite/variant.h b/variants/esp32s3/t-eth-elite/variant.h
index b7ac05872..8f2748c36 100644
--- a/variants/esp32s3/t-eth-elite/variant.h
+++ b/variants/esp32s3/t-eth-elite/variant.h
@@ -12,7 +12,7 @@
 
 #define HAS_SCREEN 1 // Allow for OLED Screens on I2C Header of shield
 
-#define LED_PIN 38   // If defined we will blink this LED
+#define LED_POWER 38 // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses,
 
 #define BUTTON_NEED_PULLUP
diff --git a/variants/esp32s3/tlora_t3s3_epaper/variant.h b/variants/esp32s3/tlora_t3s3_epaper/variant.h
index 1ed505420..0f4875fc4 100644
--- a/variants/esp32s3/tlora_t3s3_epaper/variant.h
+++ b/variants/esp32s3/tlora_t3s3_epaper/variant.h
@@ -22,7 +22,7 @@
 #define GPS_RX_PIN 44
 #define GPS_TX_PIN 43
 
-#define LED_PIN 37
+#define LED_POWER 37
 #define BUTTON_PIN 0
 #define BUTTON_NEED_PULLUP
 
diff --git a/variants/esp32s3/tlora_t3s3_v1/variant.h b/variants/esp32s3/tlora_t3s3_v1/variant.h
index babe44a58..02e2a0e42 100644
--- a/variants/esp32s3/tlora_t3s3_v1/variant.h
+++ b/variants/esp32s3/tlora_t3s3_v1/variant.h
@@ -14,7 +14,7 @@
 #define I2C_SDA1 43
 #define I2C_SCL1 44
 
-#define LED_PIN 37   // If defined we will blink this LED
+#define LED_POWER 37 // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses,
 
 #define BUTTON_NEED_PULLUP
diff --git a/variants/esp32s3/tracksenger/internal/variant.h b/variants/esp32s3/tracksenger/internal/variant.h
index ba3e281c8..f9a20c901 100644
--- a/variants/esp32s3/tracksenger/internal/variant.h
+++ b/variants/esp32s3/tracksenger/internal/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 
 #define HELTEC_TRACKER_V1_X
 
diff --git a/variants/esp32s3/tracksenger/lcd/variant.h b/variants/esp32s3/tracksenger/lcd/variant.h
index a9bb89d68..029f7753b 100644
--- a/variants/esp32s3/tracksenger/lcd/variant.h
+++ b/variants/esp32s3/tracksenger/lcd/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 
 #define HELTEC_TRACKER_V1_X
 
diff --git a/variants/esp32s3/tracksenger/oled/variant.h b/variants/esp32s3/tracksenger/oled/variant.h
index 689864b32..1f1fbbaa1 100644
--- a/variants/esp32s3/tracksenger/oled/variant.h
+++ b/variants/esp32s3/tracksenger/oled/variant.h
@@ -1,4 +1,4 @@
-#define LED_PIN 18
+#define LED_POWER 18
 
 #define HELTEC_TRACKER_V1_X
 
diff --git a/variants/esp32s3/unphone/variant.h b/variants/esp32s3/unphone/variant.h
index 6f0710d62..268eedea5 100644
--- a/variants/esp32s3/unphone/variant.h
+++ b/variants/esp32s3/unphone/variant.h
@@ -54,7 +54,7 @@
 
 #define SD_SPI_FREQUENCY 25000000
 
-#define LED_PIN 13     // the red part of the RGB LED
+#define LED_POWER 13   // the red part of the RGB LED
 #define LED_STATE_ON 0 // State when LED is lit
 
 #define ALT_BUTTON_PIN 21    // Button 3 - square - top button in landscape mode
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
index 50944b6d7..7766a171e 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
@@ -52,7 +52,6 @@ extern "C" {
 // LED
 #define LED_RED 33
 #define LED_POWER LED_RED
-#define LED_CHARGE LED_POWER // Signals the Status LED Module to handle this LED
 #define LED_GREEN 35
 #define LED_NOTIFICATION LED_GREEN
 #define LED_BLUE 37
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp
index bc0381a48..a43755c06 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp
@@ -32,9 +32,6 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    pinMode(LED_CHARGE, OUTPUT);
-    ledOff(LED_CHARGE);
-
     pinMode(LED_PAIRING, OUTPUT);
     ledOff(LED_PAIRING);
 
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
index ba6aa14ab..bdc52a530 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
@@ -41,7 +41,7 @@ extern "C" {
 
 // LEDs
 #define LED_BLUE -1
-#define LED_CHARGE (12)
+#define LED_POWER (12)
 #define LED_PAIRING (7)
 #define LED_NOTIFICATION LED_PAIRING
 
diff --git a/variants/nrf52840/ME25LS01-4Y10TD/variant.cpp b/variants/nrf52840/ME25LS01-4Y10TD/variant.cpp
index 35dc1d39b..5972861d6 100644
--- a/variants/nrf52840/ME25LS01-4Y10TD/variant.cpp
+++ b/variants/nrf52840/ME25LS01-4Y10TD/variant.cpp
@@ -32,9 +32,6 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    pinMode(LED_PIN, OUTPUT);
-    digitalWrite(LED_PIN, LOW);
-
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
 }
\ No newline at end of file
diff --git a/variants/nrf52840/ME25LS01-4Y10TD/variant.h b/variants/nrf52840/ME25LS01-4Y10TD/variant.h
index a920b02e5..1d1af37ad 100644
--- a/variants/nrf52840/ME25LS01-4Y10TD/variant.h
+++ b/variants/nrf52840/ME25LS01-4Y10TD/variant.h
@@ -50,7 +50,7 @@ extern "C" {
 
 #define PIN_LED1 (32 + 7) // P1.07 Blue D2
 
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 
 #define LED_BLUE -1
 #define LED_STATE_ON 1 // State when LED is lit
diff --git a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.cpp b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.cpp
index 35dc1d39b..5972861d6 100644
--- a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.cpp
+++ b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.cpp
@@ -32,9 +32,6 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    pinMode(LED_PIN, OUTPUT);
-    digitalWrite(LED_PIN, LOW);
-
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
 }
\ No newline at end of file
diff --git a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
index 683669160..a5bb53a33 100644
--- a/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
+++ b/variants/nrf52840/ME25LS01-4Y10TD_e-ink/variant.h
@@ -50,7 +50,7 @@ extern "C" {
 
 #define PIN_LED1 (32 + 7) // P1.07 Blue D2
 
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 
 #define LED_BLUE -1
 #define LED_STATE_ON 1 // State when LED is lit
diff --git a/variants/nrf52840/MS24SF1/variant.h b/variants/nrf52840/MS24SF1/variant.h
index a71be99fd..a41b3a350 100644
--- a/variants/nrf52840/MS24SF1/variant.h
+++ b/variants/nrf52840/MS24SF1/variant.h
@@ -50,7 +50,7 @@ extern "C" {
 
 #define PIN_LED1 (-1)
 
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 
 #define LED_BLUE -1
 #define LED_STATE_ON 1 // State when LED is lit
diff --git a/variants/nrf52840/seeed_solar_node/variant.cpp b/variants/nrf52840/seeed_solar_node/variant.cpp
index 994e97ff9..4123944d4 100644
--- a/variants/nrf52840/seeed_solar_node/variant.cpp
+++ b/variants/nrf52840/seeed_solar_node/variant.cpp
@@ -101,7 +101,6 @@ void initVariant()
     pinMode(PIN_LED2, OUTPUT);
     digitalWrite(PIN_LED2, LOW);
     pinMode(PIN_LED2, OUTPUT);
-    // digitalWrite(LED_PIN, LOW);
 
     pinMode(GPS_EN, OUTPUT);
     digitalWrite(GPS_EN, HIGH);
diff --git a/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h b/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
index 0d599d313..8615ca22e 100644
--- a/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
+++ b/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
@@ -65,7 +65,7 @@ static const uint8_t A5 = PIN_A5;
 #define LED_GREEN (13)
 #define LED_BLUE (12)
 
-#define PIN_LED1 LED_GREEN // PIN_LED1 is used in src/platform/nrf52/architecture.h to define LED_PIN
+#define PIN_LED1 LED_GREEN // PIN_LED1 is used in src/platform/nrf52/architecture.h to define LED_POWER
 #define PIN_LED2 LED_BLUE
 #define PIN_LED3 LED_RED
 
diff --git a/variants/nrf52840/tracker-t1000-e/variant.cpp b/variants/nrf52840/tracker-t1000-e/variant.cpp
index 8096705d0..1d0423b9b 100644
--- a/variants/nrf52840/tracker-t1000-e/variant.cpp
+++ b/variants/nrf52840/tracker-t1000-e/variant.cpp
@@ -32,10 +32,6 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    // LED1 & LED2
-    pinMode(LED_PIN, OUTPUT);
-    digitalWrite(LED_PIN, LOW);
-
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
 
diff --git a/variants/nrf52840/tracker-t1000-e/variant.h b/variants/nrf52840/tracker-t1000-e/variant.h
index 143b7d4ad..e258f63ae 100644
--- a/variants/nrf52840/tracker-t1000-e/variant.h
+++ b/variants/nrf52840/tracker-t1000-e/variant.h
@@ -47,7 +47,7 @@ extern "C" {
 #define PIN_3V3_ACC_EN (32 + 7) // P1.7, Power to Acc
 
 #define PIN_LED1 (0 + 24) // P0.24
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 #define LED_BLUE -1    // Actually green
 #define LED_STATE_ON 1 // State when LED is lit
 
diff --git a/variants/nrf52840/wio-t1000-s/variant.cpp b/variants/nrf52840/wio-t1000-s/variant.cpp
index 85e0c44f3..3c54f6ce5 100644
--- a/variants/nrf52840/wio-t1000-s/variant.cpp
+++ b/variants/nrf52840/wio-t1000-s/variant.cpp
@@ -32,10 +32,6 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    // LED1 & LED2
-    pinMode(LED_PIN, OUTPUT);
-    digitalWrite(LED_PIN, LOW);
-
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
 
diff --git a/variants/nrf52840/wio-t1000-s/variant.h b/variants/nrf52840/wio-t1000-s/variant.h
index 3b8103d85..a55c42775 100644
--- a/variants/nrf52840/wio-t1000-s/variant.h
+++ b/variants/nrf52840/wio-t1000-s/variant.h
@@ -47,7 +47,7 @@ extern "C" {
 #define PIN_3V3_ACC_EN (32 + 7) // P1.7, Power to Acc
 
 #define PIN_LED1 (0 + 24) // P0.24
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 #define LED_BLUE -1    // Actually green
 #define LED_STATE_ON 1 // State when LED is lit
 
diff --git a/variants/rp2040/challenger_2040_lora/pins_arduino.h b/variants/rp2040/challenger_2040_lora/pins_arduino.h
index b27cc0297..ee86e1a34 100644
--- a/variants/rp2040/challenger_2040_lora/pins_arduino.h
+++ b/variants/rp2040/challenger_2040_lora/pins_arduino.h
@@ -7,7 +7,7 @@
 #define ADC_RESOLUTION (12u)
 
 // LEDs
-#define LED_PIN (24u)
+#define LED_POWER (24u)
 
 // Serial
 #define PIN_SERIAL1_TX (16u)
diff --git a/variants/rp2040/ec_catsniffer/variant.h b/variants/rp2040/ec_catsniffer/variant.h
index 400074e59..7df69f134 100644
--- a/variants/rp2040/ec_catsniffer/variant.h
+++ b/variants/rp2040/ec_catsniffer/variant.h
@@ -9,7 +9,7 @@
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
 
-#define LED_PIN 27
+#define LED_POWER 27
 
 #define USE_SX1262
 
diff --git a/variants/rp2040/feather_rp2040_rfm95/variant.h b/variants/rp2040/feather_rp2040_rfm95/variant.h
index e9e178202..efaced7b4 100644
--- a/variants/rp2040/feather_rp2040_rfm95/variant.h
+++ b/variants/rp2040/feather_rp2040_rfm95/variant.h
@@ -20,7 +20,7 @@
 #define BUTTON_PIN 7
 // #define BUTTON_NEED_PULLUP
 
-#define LED_PIN PIN_LED
+#define LED_POWER PIN_LED
 
 // #define BATTERY_PIN 26
 //  ratio of voltage divider = 3.0 (R17=200k, R18=100k)
diff --git a/variants/rp2040/nibble_rp2040/variant.h b/variants/rp2040/nibble_rp2040/variant.h
index 0f71b98e9..3b1dfcd7b 100644
--- a/variants/rp2040/nibble_rp2040/variant.h
+++ b/variants/rp2040/nibble_rp2040/variant.h
@@ -2,7 +2,7 @@
 
 #define BUTTON_PIN -1 // Pin 17 used for antenna switching via DIO4
 
-#define LED_PIN 1
+#define LED_POWER 1
 
 #define HAS_CPU_SHUTDOWN 1
 
diff --git a/variants/rp2040/rak11310/variant.h b/variants/rp2040/rak11310/variant.h
index cf49ff491..4dfad060e 100644
--- a/variants/rp2040/rak11310/variant.h
+++ b/variants/rp2040/rak11310/variant.h
@@ -10,7 +10,7 @@
 #define I2C_SDA1 2
 #define I2C_SCL1 3
 
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 #define ledOff(pin) pinMode(pin, INPUT)
 
 #define BUTTON_PIN 9
diff --git a/variants/rp2040/rp2040-lora/variant.h b/variants/rp2040/rp2040-lora/variant.h
index 92b067457..51a760e0b 100644
--- a/variants/rp2040/rp2040-lora/variant.h
+++ b/variants/rp2040/rp2040-lora/variant.h
@@ -17,7 +17,7 @@
 #define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN -1 // Pin 17 used for antenna switching via DIO4
 
-#define LED_PIN PIN_LED
+#define LED_POWER PIN_LED
 
 // #define BATTERY_PIN 26
 //  ratio of voltage divider = 3.0 (R17=200k, R18=100k)
diff --git a/variants/rp2040/rpipico-slowclock/variant.h b/variants/rp2040/rpipico-slowclock/variant.h
index fb97ec0fb..40d20e17a 100644
--- a/variants/rp2040/rpipico-slowclock/variant.h
+++ b/variants/rp2040/rpipico-slowclock/variant.h
@@ -52,7 +52,7 @@
 
 #define BUTTON_PIN 18
 #define EXT_NOTIFY_OUT 22
-#define LED_PIN PIN_LED
+#define LED_POWER PIN_LED
 
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
diff --git a/variants/rp2040/rpipico/variant.h b/variants/rp2040/rpipico/variant.h
index 7efaeaf7a..dd849c290 100644
--- a/variants/rp2040/rpipico/variant.h
+++ b/variants/rp2040/rpipico/variant.h
@@ -15,7 +15,7 @@
 #define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN 17
 
-#define LED_PIN PIN_LED
+#define LED_POWER PIN_LED
 
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
diff --git a/variants/rp2040/rpipicow/variant.h b/variants/rp2040/rpipicow/variant.h
index fe94e615d..2de00545e 100644
--- a/variants/rp2040/rpipicow/variant.h
+++ b/variants/rp2040/rpipicow/variant.h
@@ -19,7 +19,7 @@
 #define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN 17
 
-#define LED_PIN PIN_LED
+#define LED_POWER PIN_LED
 
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
diff --git a/variants/rp2040/senselora_rp2040/variant.h b/variants/rp2040/senselora_rp2040/variant.h
index 04e21e073..f79ed66ca 100644
--- a/variants/rp2040/senselora_rp2040/variant.h
+++ b/variants/rp2040/senselora_rp2040/variant.h
@@ -5,7 +5,7 @@
 #define BUTTON_PIN 2
 #define BUTTON_NEED_PULLUP
 
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 #define ledOff(pin) pinMode(pin, INPUT)
 
 #undef BATTERY_PIN
diff --git a/variants/rp2350/rpipico2/variant.h b/variants/rp2350/rpipico2/variant.h
index 7efaeaf7a..dd849c290 100644
--- a/variants/rp2350/rpipico2/variant.h
+++ b/variants/rp2350/rpipico2/variant.h
@@ -15,7 +15,7 @@
 #define EXT_NOTIFY_OUT 22
 #define BUTTON_PIN 17
 
-#define LED_PIN PIN_LED
+#define LED_POWER PIN_LED
 
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
diff --git a/variants/stm32/CDEBYTE_E77-MBL/variant.h b/variants/stm32/CDEBYTE_E77-MBL/variant.h
index 2cf355a61..686326137 100644
--- a/variants/stm32/CDEBYTE_E77-MBL/variant.h
+++ b/variants/stm32/CDEBYTE_E77-MBL/variant.h
@@ -15,8 +15,8 @@ Do not expect a working Meshtastic device with this target.
 
 #define USE_STM32WLx
 
-#define LED_PIN PB4 // LED1
-// #define LED_PIN PB3 // LED2
+#define LED_POWER PB4 // LED1
+// #define LED_POWER PB3 // LED2
 #define LED_STATE_ON 1
 
 #define SERIAL_PRINT_PORT 1
diff --git a/variants/stm32/milesight_gs301/variant.h b/variants/stm32/milesight_gs301/variant.h
index e86e93fc4..f68d70458 100644
--- a/variants/stm32/milesight_gs301/variant.h
+++ b/variants/stm32/milesight_gs301/variant.h
@@ -6,7 +6,7 @@
 // I/O
 #define LED_STATE_ON 1
 #define PIN_LED1 PA0 // Green LED
-#define LED_PIN PIN_LED1
+#define LED_POWER PIN_LED1
 #define PIN_LED2 PA0 // Red LED
 #define USER_LED PIN_LED2
 #define BUTTON_PIN PC13
diff --git a/variants/stm32/rak3172/variant.h b/variants/stm32/rak3172/variant.h
index b3f6cbcda..bd6decd4c 100644
--- a/variants/stm32/rak3172/variant.h
+++ b/variants/stm32/rak3172/variant.h
@@ -13,7 +13,7 @@ Do not expect a working Meshtastic device with this target.
 
 #define USE_STM32WLx
 
-#define LED_PIN PA0 // Green LED
+#define LED_POWER PA0 // Green LED
 #define LED_STATE_ON 1
 
 #define RAK3172
diff --git a/variants/stm32/russell/variant.h b/variants/stm32/russell/variant.h
index 796302d34..8773d5d8d 100644
--- a/variants/stm32/russell/variant.h
+++ b/variants/stm32/russell/variant.h
@@ -4,7 +4,7 @@
 #define USE_STM32WLx
 
 // I/O
-#define LED_PIN PA0 // Red LED
+#define LED_POWER PA0 // Red LED
 #define LED_STATE_ON 1
 #define BUTTON_PIN PH3 // Shared with BOOT0
 #define BUTTON_NEED_PULLUP
diff --git a/variants/stm32/wio-e5/variant.h b/variants/stm32/wio-e5/variant.h
index 2b20eb2a6..da2c623fb 100644
--- a/variants/stm32/wio-e5/variant.h
+++ b/variants/stm32/wio-e5/variant.h
@@ -14,7 +14,7 @@ Do not expect a working Meshtastic device with this target.
 
 #define USE_STM32WLx
 
-#define LED_PIN PB5
+#define LED_POWER PB5
 #define LED_STATE_ON 0
 
 #define WIO_E5