diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 12f5e059e0..aa232f9331 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -801,6 +801,7 @@ bool view_battery(void)
             case 3: /* remeining time estimation: */
                 lcd_clear_display();
 
+#ifdef HAVE_CHARGE_CTRL
                 snprintf(buf, 30, "charge_state: %d", charge_state);
                 lcd_puts(0, 0, buf);
 
@@ -809,6 +810,7 @@ bool view_battery(void)
 
                 snprintf(buf, 30, "Lev.at cycle start: %d%%", powermgmt_last_cycle_level);
                 lcd_puts(0, 2, buf);
+#endif
 
                 snprintf(buf, 30, "Last PwrHist val: %d.%02d V",
                     power_history[POWER_HISTORY_LEN-1] / 100,
@@ -821,9 +823,9 @@ bool view_battery(void)
                 snprintf(buf, 30, "Est. remaining: %d m", battery_time());
                 lcd_puts(0, 6, buf);
 
+#ifdef HAVE_CHARGE_CTRL
                 snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec);
                 lcd_puts(0, 7, buf);
-#ifdef HAVE_CHARGE_CTRL
 #endif                
                 break;
         }
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index 2a9c00647b..acd6d6de4b 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -166,8 +166,12 @@ void statusbar_icon_battery(int percent, bool charging)
 #ifdef SIMULATOR
 	if (global_settings.battery_type) {
 #else
+#ifdef HAVE_CHARGE_CTRL /* Recorder */
     /* show graphical animation when charging instead of numbers */
 	if ((global_settings.battery_type) && (charge_state != 1)) {
+#else /* FM */
+	if (global_settings.battery_type) {
+#endif /* HAVE_CHARGE_CTRL */
 #endif
 		/* Numeric display */
 		snprintf(buffer, sizeof(buffer), "%3d", percent);
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 026bfe47c0..ae8b7445a8 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -105,13 +105,9 @@ int charge_state = 0;                          /* at the beginning, the charger
 
 static int percent_to_volt_charge[11] = /* voltages (centivolt) of 0%, 10%, ... 100% when charging enabled */
 {
-#ifdef HAVE_LIION
     /* values guessed, see http://www.seattlerobotics.org/encoder/200210/LiIon2.pdf */
     /* until someone measures voltages over a charging cycle */
-    260, 290, 320, 340, 360, 370, 380, 390, 400, 410, 420
-#else /* NiMH */
-    476, 544, 551, 556, 561, 564, 566, 576, 582, 584, 585
-#endif
+    476, 544, 551, 556, 561, 564, 566, 576, 582, 584, 585 /* NiMH */
 };
 
 void enable_trickle_charge(bool on)