diff --git a/sw/airborne/arch/lpc21/ADS8344.c b/sw/airborne/arch/lpc21/ADS8344.c
index 49ce4dd027..b40952f91c 100644
--- a/sw/airborne/arch/lpc21/ADS8344.c
+++ b/sw/airborne/arch/lpc21/ADS8344.c
@@ -103,6 +103,10 @@ void ADS8344_init( void ) {
   /* configure SS pin */
   SetBit( ADS8344_SS_IODIR,  ADS8344_SS_PIN);  /* pin is output  */
   ADS8344Unselect();                           /* pin low        */
+
+  // FIXME, no hardcoded led numbers
+  LED_INIT(2);
+  LED_OFF(2);
 }
 
 static inline void read_values( void ) {
diff --git a/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c b/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
index 1b9a020303..ce414d26ae 100644
--- a/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
+++ b/sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
@@ -120,6 +120,11 @@ void sys_time_arch_init( void ) {
   _VIC_CNTL(TIMER0_VIC_SLOT) = VIC_ENABLE | VIC_TIMER0;
   /* address of the ISR      */
   _VIC_ADDR(TIMER0_VIC_SLOT) = (uint32_t)TIMER0_ISR;
+
+  //FIXME, no hardcoded led number
+#ifdef TRIGGER_EXT
+  LED_INIT(3);
+#endif
 }
 
 
diff --git a/sw/airborne/arch/lpc21/uart_tunnel.c b/sw/airborne/arch/lpc21/uart_tunnel.c
index 9f4bbd5ef2..bfe1161e10 100644
--- a/sw/airborne/arch/lpc21/uart_tunnel.c
+++ b/sw/airborne/arch/lpc21/uart_tunnel.c
@@ -15,8 +15,14 @@ int main (int argc, char** argv) {
   int tx=0, rx=0;
   int tx_shadow=1, rx_shadow=1;
   mcu_init();
-  led_init();
+
+  // FIXME, no hardcoded led numbers
+  LED_INIT(1);
   LED_ON(1);
+  LED_INIT(2);
+  LED_OFF(2);
+  LED_INIT(3);
+  LED_OFF(3);
 
   /* TXD0 and TXD1 output */
   SetBit(IO0DIR, TXD0_PIN);
diff --git a/sw/airborne/arch/lpc21/usb_tunnel.c b/sw/airborne/arch/lpc21/usb_tunnel.c
index 78e7679346..783a109d16 100644
--- a/sw/airborne/arch/lpc21/usb_tunnel.c
+++ b/sw/airborne/arch/lpc21/usb_tunnel.c
@@ -46,7 +46,15 @@ int main( void ) {
 
   mcu_init();
   sys_time_init();
-  led_init();
+
+  // FIXME, no hardcoded led numbers
+  LED_INIT(1);
+  LED_ON(1);
+  LED_INIT(2);
+  LED_OFF(2);
+  LED_INIT(3);
+  LED_OFF(3);
+
   VCOM_allow_linecoding(1);
 
 #ifdef USE_USB_SERIAL
diff --git a/sw/airborne/boards/booz/baro_board.c b/sw/airborne/boards/booz/baro_board.c
index cfcbc8b5b2..3d2767f2d2 100644
--- a/sw/airborne/boards/booz/baro_board.c
+++ b/sw/airborne/boards/booz/baro_board.c
@@ -49,6 +49,7 @@ void baro_init( void ) {
   baro_board.value_filtered = 0;
   baro_board.data_available = FALSE;
 #ifdef ROTORCRAFT_BARO_LED
+  LED_INIT(ROTORCRAFT_BARO_LED);
   LED_OFF(ROTORCRAFT_BARO_LED);
 #endif
 }
diff --git a/sw/airborne/boards/navgo/baro_board.c b/sw/airborne/boards/navgo/baro_board.c
index b42b69ee3a..a73f806c5d 100644
--- a/sw/airborne/boards/navgo/baro_board.c
+++ b/sw/airborne/boards/navgo/baro_board.c
@@ -43,6 +43,7 @@ void baro_init( void ) {
   baro.absolute     = 0;
   baro.differential = 0; /* not handled on this board */
 #ifdef ROTORCRAFT_BARO_LED
+  LED_INIT(ROTORCRAFT_BARO_LED);
   LED_OFF(ROTORCRAFT_BARO_LED);
 #endif
   startup_cnt = STARTUP_COUNTER;
diff --git a/sw/airborne/firmwares/fixedwing/main_ap.c b/sw/airborne/firmwares/fixedwing/main_ap.c
index 1859d46ffc..a608bcfb37 100644
--- a/sw/airborne/firmwares/fixedwing/main_ap.c
+++ b/sw/airborne/firmwares/fixedwing/main_ap.c
@@ -169,6 +169,15 @@ void init_ap( void ) {
   mcu_init();
 #endif /* SINGLE_MCU */
 
+#ifdef POWER_SWITCH_LED
+  LED_INIT(POWER_SWITCH_LED);
+  LED_OFF(POWER_SWITCH_LED);
+#endif
+#ifdef AHRS_CPU_LED
+  LED_INIT(AHRS_CPU_LED);
+  LED_OFF(AHRS_CPU_LED);
+#endif
+
   /************* Sensors initialization ***************/
 #if USE_GPS
   gps_init();
diff --git a/sw/airborne/firmwares/logger/main_logger.c b/sw/airborne/firmwares/logger/main_logger.c
index bf3af136e2..763e944541 100644
--- a/sw/airborne/firmwares/logger/main_logger.c
+++ b/sw/airborne/firmwares/logger/main_logger.c
@@ -572,7 +572,19 @@ int main(void)
 static inline void main_init( void ) {
   mcu_init();
   sys_time_init();
-  led_init();
+
+  LED_INIT(LED_RED);
+  LED_OFF(LED_RED);
+  LED_INIT(LED_GREEN);
+  LED_OFF(LED_GREEN);
+  LED_INIT(LED_YELLOW);
+  LED_OFF(LED_YELLOW);
+
+  //FIXME, no hardcoded led numbers
+  LED_INIT(1);
+  LED_OFF(1);
+  LED_INIT(2);
+  LED_OFF(2);
 
 #ifdef USE_MAX11040
   max11040_init_ssp();
diff --git a/sw/airborne/firmwares/rotorcraft/autopilot.c b/sw/airborne/firmwares/rotorcraft/autopilot.c
index 978121cdc7..3847e32775 100644
--- a/sw/airborne/firmwares/rotorcraft/autopilot.c
+++ b/sw/airborne/firmwares/rotorcraft/autopilot.c
@@ -78,6 +78,7 @@ void autopilot_init(void) {
   autopilot_rc = TRUE;
   autopilot_power_switch = FALSE;
 #ifdef POWER_SWITCH_LED
+  LED_INIT(POWER_SWITCH_LED);
   LED_ON(POWER_SWITCH_LED); // POWER OFF
 #endif
   autopilot_arming_init();
diff --git a/sw/airborne/lisa/lisa_overo_link.c b/sw/airborne/lisa/lisa_overo_link.c
index b949a5dcb9..3ebfb941ab 100644
--- a/sw/airborne/lisa/lisa_overo_link.c
+++ b/sw/airborne/lisa/lisa_overo_link.c
@@ -10,6 +10,11 @@ void overo_link_init(void) {
   overo_link.crc_error = FALSE;
   overo_link.timeout = FALSE;
   overo_link_arch_init();
+
+  LED_INIT(OVERO_LINK_LED_OK);
+  LED_INIT(OVERO_LINK_LED_KO);
+  LED_OFF(OVERO_LINK_LED_OK);
+  LED_OFF(OVERO_LINK_LED_KO);
 }
 
 
diff --git a/sw/airborne/lisa/test_spi_slave.c b/sw/airborne/lisa/test_spi_slave.c
index 53676b8efa..dbc9eb879d 100644
--- a/sw/airborne/lisa/test_spi_slave.c
+++ b/sw/airborne/lisa/test_spi_slave.c
@@ -53,6 +53,8 @@ int main(void) {
 
 static inline void main_init( void ) {
   mcu_init();
+  LED_INIT(3);
+  LED_OFF(3);
   sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
   main_spi_slave_init();
 }
diff --git a/sw/airborne/lisa/test_uart_lisam.c b/sw/airborne/lisa/test_uart_lisam.c
index 364a2e4c60..ec7853a919 100644
--- a/sw/airborne/lisa/test_uart_lisam.c
+++ b/sw/airborne/lisa/test_uart_lisam.c
@@ -52,6 +52,10 @@ int main(void) {
 static inline void main_init( void ) {
   mcu_init();
   sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
+  LED_INIT(1);
+  LED_INIT(2);
+  LED_OFF(1);
+  LED_OFF(2);
 }
 
 static inline void main_periodic( void ) {
diff --git a/sw/airborne/lisa/tunnel_hw.c b/sw/airborne/lisa/tunnel_hw.c
index 6f9df43608..49657a2bd1 100644
--- a/sw/airborne/lisa/tunnel_hw.c
+++ b/sw/airborne/lisa/tunnel_hw.c
@@ -55,6 +55,9 @@ int main(void) {
   mcu_init();
   sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
 
+  LED_INIT(2);
+  LED_OFF(2);
+
   /* init RCC */
   RCC_APB2PeriphClockCmd(A_PERIPH , ENABLE);
   //  RCC_APB2PeriphClockCmd(B_PERIPH , ENABLE);
diff --git a/sw/airborne/mcu.c b/sw/airborne/mcu.c
index 4e2b0890c6..037c087c53 100644
--- a/sw/airborne/mcu.c
+++ b/sw/airborne/mcu.c
@@ -60,9 +60,6 @@ void mcu_init(void) {
 
 #ifdef PERIPHERALS_AUTO_INIT
   sys_time_init();
-#ifdef USE_LED
-  led_init();
-#endif
   /* for now this means using spektrum */
 #if defined RADIO_CONTROL & defined RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT & defined RADIO_CONTROL_BIND_IMPL_FUNC
   RADIO_CONTROL_BIND_IMPL_FUNC();
diff --git a/sw/airborne/mcu_periph/sys_time.c b/sw/airborne/mcu_periph/sys_time.c
index 6cf939a799..d2586ae476 100644
--- a/sw/airborne/mcu_periph/sys_time.c
+++ b/sw/airborne/mcu_periph/sys_time.c
@@ -29,6 +29,7 @@
 
 #include "mcu_periph/sys_time.h"
 #include "mcu.h"
+#include "led.h"
 
 struct sys_time sys_time;
 
@@ -69,6 +70,11 @@ void sys_time_update_timer(tid_t id, float duration) {
 void sys_time_init( void ) {
   sys_time_arch_init();
 
+#ifdef SYS_TIME_LED
+  LED_INIT(SYS_TIME_LED);
+  LED_OFF(SYS_TIME_LED);
+#endif
+
   sys_time.nb_sec     = 0;
   sys_time.nb_sec_rem = 0;
   sys_time.nb_tick    = 0;
diff --git a/sw/airborne/modules/benchmark/i2c_abuse_test.c b/sw/airborne/modules/benchmark/i2c_abuse_test.c
index d5bee73822..ad2e82ec96 100644
--- a/sw/airborne/modules/benchmark/i2c_abuse_test.c
+++ b/sw/airborne/modules/benchmark/i2c_abuse_test.c
@@ -33,8 +33,12 @@ volatile uint8_t i2c_abuse_test_counter = 0;
 volatile uint32_t i2c_abuse_test_bitrate = 1000;
 
 void init_i2c_abuse_test(void) {
-  //LED_INIT(DEMO_MODULE_LED);
-  //LED_OFF(DEMO_MODULE_LED);
+  LED_INIT(4);
+  LED_OFF(4);
+  LED_INIT(5);
+  LED_OFF(5);
+  LED_INIT(I2C_ABUSE_LED);
+  LED_OFF(I2C_ABUSE_LED);
 
   i2c_test1.status = I2CTransSuccess;
   i2c_test1.slave_addr = 0x3C;
diff --git a/sw/airborne/modules/cam_control/booz_cam.c b/sw/airborne/modules/cam_control/booz_cam.c
index 2082a831d3..8b62796c99 100644
--- a/sw/airborne/modules/cam_control/booz_cam.c
+++ b/sw/airborne/modules/cam_control/booz_cam.c
@@ -73,6 +73,8 @@ int16_t booz_cam_pan;
 #endif
 
 void booz_cam_init(void) {
+  LED_INIT(CAM_SWITCH_LED);
+  LED_ON(CAM_SWITCH_LED);
   booz_cam_SetCamMode(BOOZ_CAM_DEFAULT_MODE);
 #ifdef BOOZ_CAM_USE_TILT
   booz_cam_tilt_pwm = BOOZ_CAM_TILT_NEUTRAL;
diff --git a/sw/airborne/modules/cam_control/cam.c b/sw/airborne/modules/cam_control/cam.c
index 6e5c1877c8..76c8a5b4a5 100644
--- a/sw/airborne/modules/cam_control/cam.c
+++ b/sw/airborne/modules/cam_control/cam.c
@@ -101,6 +101,10 @@ void cam_waypoint_target(void);
 void cam_ac_target(void);
 
 void cam_init( void ) {
+#ifdef VIDEO_TX_SWITCH
+  LED_INIT(VIDEO_TX_SWITCH);
+#endif
+
   cam_mode = CAM_MODE0;
 }
 
diff --git a/sw/airborne/modules/digital_cam/led_cam_ctrl.h b/sw/airborne/modules/digital_cam/led_cam_ctrl.h
index 541b691eed..9216f79cbe 100644
--- a/sw/airborne/modules/digital_cam/led_cam_ctrl.h
+++ b/sw/airborne/modules/digital_cam/led_cam_ctrl.h
@@ -54,6 +54,17 @@ extern uint8_t dc_timer;
 
 static inline void led_cam_ctrl_init(void)
 {
+  LED_INIT(DC_SHUTTER_LED);
+#ifdef DC_ZOOM_IN_LED
+  LED_INIT(DC_ZOOM_IN_LED);
+#endif
+#ifdef DC_ZOOM_OUT_LED
+  LED_INIT(DC_ZOOM_OUT_LED);
+#endif
+#ifdef DC_POWER_LED
+  LED_INIT(DC_POWER_LED);
+#endif
+
   // Call common DC init
   dc_init();
 
diff --git a/sw/airborne/modules/gsm/gsm.c b/sw/airborne/modules/gsm/gsm.c
index 5f2c10212f..2193de60d4 100644
--- a/sw/airborne/modules/gsm/gsm.c
+++ b/sw/airborne/modules/gsm/gsm.c
@@ -152,6 +152,8 @@ static uint8_t gcs_index_max;
 
 /*****************************************************************************/
 void gsm_init(void) {
+  LED_INIT(GSM_ONOFF_LED);
+
   if (gsm_status == STATUS_NONE) { /* First call */
     LED_ON(GSM_ONOFF_LED);
     gsm_status = STATUS_POWERON;
diff --git a/sw/airborne/modules/ins/ins_chimu_spi.c b/sw/airborne/modules/ins/ins_chimu_spi.c
index 07ba9c35e5..6b78af1d91 100644
--- a/sw/airborne/modules/ins/ins_chimu_spi.c
+++ b/sw/airborne/modules/ins/ins_chimu_spi.c
@@ -38,6 +38,9 @@ volatile uint8_t new_ins_attitude;
 
 void ins_init( void )
 {
+  // FIXME, don't use hardcode led number here
+  LED_INIT(3);
+
   // uint8_t ping[7] = {CHIMU_STX, CHIMU_STX, 0x01, CHIMU_BROADCAST, MSG00_PING, 0x00, 0xE6 };
   uint8_t rate[12] = {CHIMU_STX, CHIMU_STX, 0x06, CHIMU_BROADCAST, MSG10_UARTSETTINGS, 0x05, 0xff, 0x79, 0x00, 0x00, 0x01, 0x76 };	// 50Hz attitude only + SPI
   uint8_t quaternions[7] = {CHIMU_STX, CHIMU_STX, 0x01, CHIMU_BROADCAST, MSG09_ESTIMATOR, 0x01, 0x39 }; // 25Hz attitude only + SPI
diff --git a/sw/airborne/modules/ins/ins_chimu_uart.c b/sw/airborne/modules/ins/ins_chimu_uart.c
index baa3af3779..039aefcdca 100644
--- a/sw/airborne/modules/ins/ins_chimu_uart.c
+++ b/sw/airborne/modules/ins/ins_chimu_uart.c
@@ -37,6 +37,9 @@ volatile uint8_t new_ins_attitude;
 
 void ins_init( void )
 {
+  // FIXME, don't use hardcode led number here
+  LED_INIT(3);
+
   uint8_t ping[7] = {CHIMU_STX, CHIMU_STX, 0x01, CHIMU_BROADCAST, MSG00_PING, 0x00, 0xE6 };
   uint8_t rate[12] = {CHIMU_STX, CHIMU_STX, 0x06, CHIMU_BROADCAST, MSG10_UARTSETTINGS, 0x05, 0xff, 0x79, 0x00, 0x00, 0x01, 0x76 };	// 50Hz attitude only + SPI
   uint8_t quaternions[7] = {CHIMU_STX, CHIMU_STX, 0x01, CHIMU_BROADCAST, MSG09_ESTIMATOR, 0x01, 0x39 }; // 25Hz attitude only + SPI
diff --git a/sw/airborne/modules/ins/ins_xsens.c b/sw/airborne/modules/ins/ins_xsens.c
index 8da99364ff..c32cc42a08 100644
--- a/sw/airborne/modules/ins/ins_xsens.c
+++ b/sw/airborne/modules/ins/ins_xsens.c
@@ -226,6 +226,14 @@ volatile int xsens_configured = 0;
 
 void ins_init( void ) {
 
+  // FIXME, don't use hardcode led number here
+  LED_INIT(3);
+
+#ifdef GPS_LED
+  LED_INIT(GPS_LED);
+  LED_OFF(GPS_LED);
+#endif
+
   xsens_status = UNINIT;
   xsens_configured = 20;
 
diff --git a/sw/airborne/modules/meteo/humid_sht.c b/sw/airborne/modules/meteo/humid_sht.c
index 2de7164e4d..b07f5ea6d7 100644
--- a/sw/airborne/modules/meteo/humid_sht.c
+++ b/sw/airborne/modules/meteo/humid_sht.c
@@ -237,8 +237,13 @@ uint8_t humid_sht_reset( void )
 
 void humid_sht_init( void )
 {
-  /* Configure DAT/SCL pin as GPIO */
+  // FIXME, should not use hardcoded led number
+  LED_INIT(2);
+  LED_OFF(2);
 
+  // FIXME, should not contain arch dependent code here
+
+  /* Configure DAT/SCL pin as GPIO */
 #if (DAT_PIN<16)
     PINSEL0 &= ~(_BV(DAT_PIN*2)|_BV(DAT_PIN*2+1));
 #else
diff --git a/sw/airborne/sd_card/main.c b/sw/airborne/sd_card/main.c
index 25342b9d7d..148733f9ed 100644
--- a/sw/airborne/sd_card/main.c
+++ b/sw/airborne/sd_card/main.c
@@ -36,7 +36,10 @@ int main( void ) {
 static inline void main_init( void ) {
   mcu_init();
   sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
-  led_init();
+
+  LED_INIT(1);
+  LED_OFF(1);
+
   Uart0Init();
 
   spi_init();
diff --git a/sw/airborne/subsystems/ahrs/ahrs_aligner.c b/sw/airborne/subsystems/ahrs/ahrs_aligner.c
index 2f80e57298..35c7ce2d99 100644
--- a/sw/airborne/subsystems/ahrs/ahrs_aligner.c
+++ b/sw/airborne/subsystems/ahrs/ahrs_aligner.c
@@ -46,6 +46,11 @@ void ahrs_aligner_init(void) {
   samples_idx = 0;
   ahrs_aligner.noise = 0;
   ahrs_aligner.low_noise_cnt = 0;
+
+#ifdef AHRS_ALIGNER_LED
+  LED_INIT(AHRS_ALIGNER_LED);
+  LED_OFF(AHRS_ALIGNER_LED);
+#endif
 }
 
 #ifndef LOW_NOISE_THRESHOLD
diff --git a/sw/airborne/subsystems/gps.c b/sw/airborne/subsystems/gps.c
index 624fca6bc0..01568b97cd 100644
--- a/sw/airborne/subsystems/gps.c
+++ b/sw/airborne/subsystems/gps.c
@@ -38,6 +38,7 @@ void gps_init(void) {
   gps.fix = GPS_FIX_NONE;
   gps.cacc = 0;
 #ifdef GPS_LED
+  LED_INIT(GPS_LED);
   LED_OFF(GPS_LED);
 #endif
 #ifdef GPS_TYPE_H
diff --git a/sw/airborne/subsystems/radio_control.h b/sw/airborne/subsystems/radio_control.h
index 9651422f20..0b4a7c17e8 100644
--- a/sw/airborne/subsystems/radio_control.h
+++ b/sw/airborne/subsystems/radio_control.h
@@ -71,6 +71,11 @@ static inline void radio_control_init ( void ) {
   radio_control.frame_rate = 0;
   radio_control.frame_cpt = 0;
   radio_control_impl_init();
+
+#if defined RADIO_CONTROL_LED
+  LED_INIT(RADIO_CONTROL_LED);
+  LED_OFF(RADIO_CONTROL_LED);
+#endif
 }
 
 /************* PERIODIC ******************************************************/
diff --git a/sw/airborne/test/mcu_periph/test_sys_time.c b/sw/airborne/test/mcu_periph/test_sys_time.c
index 95147a13cc..9c94d752f7 100644
--- a/sw/airborne/test/mcu_periph/test_sys_time.c
+++ b/sw/airborne/test/mcu_periph/test_sys_time.c
@@ -11,6 +11,20 @@ static inline void main_event( void );
 int main(void) {
 
   mcu_init();
+
+#ifdef LED_GREEN
+  LED_INIT(LED_GREEN);
+  LED_OFF(LED_GREEN);
+#endif
+#ifdef LED_BLUE
+  LED_INIT(LED_BLUE);
+  LED_OFF(LED_BLUE);
+#endif
+#ifdef LED_RED
+  LED_INIT(LED_RED);
+  LED_OFF(LED_RED);
+#endif
+
   unsigned int tmr_02 = sys_time_register_timer(0.2, NULL);
   unsigned int tmr_03 = sys_time_register_timer(0.3, NULL);
   sys_time_register_timer(0.5, main_periodic_05);
diff --git a/sw/airborne/test/subsystems/test_imu.c b/sw/airborne/test/subsystems/test_imu.c
index b7f439bfb2..27ee980d19 100644
--- a/sw/airborne/test/subsystems/test_imu.c
+++ b/sw/airborne/test/subsystems/test_imu.c
@@ -61,6 +61,11 @@ static inline void main_init( void ) {
 
   mcu_init();
 
+#ifdef BOARD_LISA_L
+  LED_INIT(3);
+  LED_OFF(3);
+#endif
+
   sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
 
   imu_init();
@@ -71,7 +76,7 @@ static inline void main_init( void ) {
 static inline void led_toggle ( void ) {
 
 #ifdef BOARD_LISA_L
-      LED_TOGGLE(3);
+  LED_TOGGLE(3);
 #endif
 }
 
diff --git a/sw/airborne/test/test_adcs.c b/sw/airborne/test/test_adcs.c
index 01b1781149..90e74ce256 100644
--- a/sw/airborne/test/test_adcs.c
+++ b/sw/airborne/test/test_adcs.c
@@ -21,7 +21,10 @@ static struct adc_buf buf_adc[NB_ADC];
 int main (int argc, char** argv) {
   mcu_init();
   sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
-  led_init();
+
+  LED_INIT(1);
+  LED_OFF(1);
+
   adc_init();
 
   adc_buf_channel(ADC_0, &buf_adc[0], ADC_NB_SAMPLES);