diff --git a/firmware/SOURCES b/firmware/SOURCES
index 5ecad19bba..0d845f2b3c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1226,7 +1226,7 @@ target/arm/as3525/lcd-ssd1303.c
 target/arm/as3525/sansa-clipv2/lcd-clipv2.c
 target/arm/as3525/sansa-clip/lcd-as-clip.S  /* TODO for clipv2 */
 target/arm/as3525/sansa-clipv2/button-clip.c
-target/arm/as3525/sansa-clipv2/backlight-clip.c
+target/arm/as3525/sansa-clipv2/backlight-clipv2.c
 #ifndef BOOTLOADER
 target/arm/powermgmt-ascodec.c
 target/arm/as3525/sansa-clip/powermgmt-clip.c
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
index 26d562f829..5f5662f787 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
@@ -24,8 +24,6 @@
 #include "as3525v2.h"
 #include "ascodec-target.h"
 
-/* FIXME : this is clipv2 code, not sure if it works the same on clip+ */
-
 void _backlight_on(void)
 {
     ascodec_write(0x25, ascodec_read(0x25) | 2);    /* lcd power */
@@ -36,6 +34,8 @@ void _backlight_on(void)
 
 void _backlight_off(void)
 {
-    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
     lcd_enable(false);
+    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
+    ascodec_write(0x1c, 8|1);
+    ascodec_write(0x1b, 0x00);
 }
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
similarity index 96%
rename from firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c
rename to firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
index dc36b5237f..fad9e6acff 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
@@ -34,8 +34,10 @@ void _backlight_on(void)
 
 void _backlight_off(void)
 {
-    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
     lcd_enable(false);
+    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
+    ascodec_write(0x1c, 8|1);
+    ascodec_write(0x1b, 0);
 }
 
 void _buttonlight_on(void)