3 files changed, 8 insertions, 5 deletions

diff --git a/apps/menu.c b/apps/menu.c
index a7f34a8fca..e483ad7136 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -47,7 +47,7 @@ struct menu {
     struct menu_item* items;
     int itemcount;
     int (*callback)(int, int);
-#ifdef HAVE_LCD_BITMAP
+#if defined(HAVE_LCD_BITMAP) && (CONFIG_KEYPAD == RECORDER_PAD)
     bool use_buttonbar; /* true if a buttonbar is defined */
     const char *buttonbar[3];
 #endif
@@ -248,7 +248,7 @@ int menu_init(const struct menu_item* mitems, int count, int (*callback)(int, in
     menus[i].top = 0;
     menus[i].cursor = 0;
     menus[i].callback = callback;
-#ifdef HAVE_LCD_BITMAP
+#if defined(HAVE_LCD_BITMAP) && (CONFIG_KEYPAD == RECORDER_PAD)
     menus[i].buttonbar[0] = button1;
     menus[i].buttonbar[1] = button2;
     menus[i].buttonbar[2] = button3;
diff --git a/apps/status.h b/apps/status.h
index ab8939cda5..a3c471bafd 100644
--- a/apps/status.h
+++ b/apps/status.h
@@ -34,14 +34,15 @@ void status_init(void);
 void status_set_ffmode(enum playmode mode);
 #ifdef HAVE_LCD_BITMAP
 bool statusbar(bool state);
+#if CONFIG_KEYPAD == RECORDER_PAD
 void buttonbar_set(const char* caption1, const char* caption2, 
                    const char* caption3);
 void buttonbar_unset(void);
 bool buttonbar_isset(void);
 void buttonbar_draw(void);
-
 #define BUTTONBAR_HEIGHT 8
-#endif
+#endif /* CONFIG_KEYPAD == RECORDER_PAD */
+#endif /* HAVE_LCD_BITMAP */
 void status_draw(bool force_redraw);
 
 #if defined(HAVE_LCD_CHARCELLS)
diff --git a/apps/tree.c b/apps/tree.c
index 2d82e518e2..9b4f6898de 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -594,9 +594,11 @@ static int recalc_screen_height(void)
     lcd_getstringsize("A", &fw, &fh);
     if(global_settings.statusbar)
         height -= STATUSBAR_HEIGHT;
-    
+
+#if CONFIG_KEYPAD == RECORDER_PAD
     if(global_settings.buttonbar)
         height -= BUTTONBAR_HEIGHT;
+#endif        
 
     return height / fh;
 }