1 files changed, 17 insertions, 17 deletions

diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 254162e7f0..26eac23f21 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -160,18 +160,18 @@ static int reset_color(void)
     return 0;
 }
 MENUITEM_FUNCTION(clear_main_bd, ID2P(LANG_CLEAR_BACKDROP),
-                    clear_main_backdrop, NULL, NOICON);
+                    clear_main_backdrop, NULL, Icon_NOICON);
 MENUITEM_FUNCTION(set_bg_col, ID2P(LANG_BACKGROUND_COLOR),
-                    set_bg_color, NULL, NOICON);
+                    set_bg_color, NULL, Icon_NOICON);
 MENUITEM_FUNCTION(set_fg_col, ID2P(LANG_FOREGROUND_COLOR),
-                    set_fg_color, NULL, NOICON);
+                    set_fg_color, NULL, Icon_NOICON);
 MENUITEM_FUNCTION(reset_colors, ID2P(LANG_RESET_COLORS),
-                    reset_color, NULL, NOICON);
+                    reset_color, NULL, Icon_NOICON);
 #endif
 
 /* now the actual menu */
 MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
-            NULL, bitmap_icons_6x8[Icon_Display_menu]
+            NULL, Icon_Display_menu
 #if CONFIG_BACKLIGHT
             ,&backlight_timeout
 # if CONFIG_CHARGING
@@ -258,7 +258,7 @@ MENUITEM_SETTING(remote_reduce_ticking,
 #endif
 
 MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU),
-            NULL, bitmap_icons_6x8[Icon_Remote_Display_menu],
+            NULL, Icon_Remote_Display_menu,
             &remote_backlight_timeout,
 #if CONFIG_CHARGING
             &remote_backlight_timeout_plugged,
@@ -290,7 +290,7 @@ MENUITEM_SETTING(remote_scroll_speed, &global_settings.remote_scroll_speed, NULL
 MENUITEM_SETTING(remote_scroll_delay, &global_settings.remote_scroll_delay, NULL);
 MENUITEM_SETTING(remote_scroll_step, &global_settings.remote_scroll_step, NULL);
 MENUITEM_SETTING(remote_bidir_limit, &global_settings.remote_bidir_limit, NULL);
-MAKE_MENU(remote_scroll_sets, ID2P(LANG_REMOTE_SCROLL_SETS), 0, NOICON,
+MAKE_MENU(remote_scroll_sets, ID2P(LANG_REMOTE_SCROLL_SETS), 0, Icon_NOICON,
           &remote_scroll_speed, &remote_scroll_delay,
           &remote_scroll_step, &remote_bidir_limit);
 #endif /* HAVE_REMOTE_LCD */
@@ -316,7 +316,7 @@ MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL);
 #endif
 MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL);
 
-MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, NOICON,
+MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON,
           &scroll_speed, &scroll_delay,
 #ifdef HAVE_LCD_BITMAP
           &scroll_step,
@@ -346,7 +346,7 @@ MENUITEM_SETTING(buttonbar, &global_settings.buttonbar, NULL);
 #endif
 MENUITEM_SETTING(volume_type, &global_settings.volume_type, NULL);
 MENUITEM_SETTING(battery_display, &global_settings.battery_display, NULL);
-MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, NOICON,
+MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON,
           &scrollbar_item, &statusbar,
 #if CONFIG_KEYPAD == RECORDER_PAD
           &buttonbar,
@@ -493,12 +493,12 @@ static int peak_meter_max(void) {
     return retval;
 }
 MENUITEM_FUNCTION(peak_meter_scale_item, ID2P(LANG_PM_SCALE),
-                    peak_meter_scale, NULL, NOICON);
+                    peak_meter_scale, NULL, Icon_NOICON);
 MENUITEM_FUNCTION(peak_meter_min_item, ID2P(LANG_PM_MIN), 
-                    peak_meter_min, NULL, NOICON);
+                    peak_meter_min, NULL, Icon_NOICON);
 MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), 
-                    peak_meter_max, NULL, NOICON);
-MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, NOICON, 
+                    peak_meter_max, NULL, Icon_NOICON);
+MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, 
           &peak_meter_clip_hold, &peak_meter_release,
           &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item);
 #endif /*  HAVE_LCD_BITMAP */
@@ -528,13 +528,13 @@ static int browse_folder(void *param)
 
 #ifdef HAVE_LCD_BITMAP
 MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), 
-        browse_folder, (void*)&fonts, NULL, NOICON);
+        browse_folder, (void*)&fonts, NULL, Icon_NOICON);
 #endif
 MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), 
-        browse_folder, (void*)&wps, NULL, NOICON);
+        browse_folder, (void*)&wps, NULL, Icon_NOICON);
 #ifdef HAVE_REMOTE_LCD
 MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), 
-        browse_folder, (void*)&rwps, NULL, NOICON);
+        browse_folder, (void*)&rwps, NULL, Icon_NOICON);
 #endif
 
 MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL);
@@ -542,7 +542,7 @@ MENUITEM_SETTING(codepage_setting, &global_settings.default_codepage, NULL);
 
 
 MAKE_MENU(display_menu, ID2P(LANG_DISPLAY),
-            NULL, bitmap_icons_6x8[Icon_Display_menu],
+            NULL, Icon_Display_menu,
 #ifdef HAVE_LCD_BITMAP
             &browse_fonts,
 #endif