3 files changed, 2 insertions, 10 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 90081cc07d..31de9fa56f 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -81,7 +81,7 @@ static const struct plugin_api rockbox_api = {
     lcd_putc,
     lcd_put_cursor,
     lcd_remove_cursor,
-    PREFIX(lcd_icon),
+    lcd_icon,
     lcd_double_height,
 #else
     lcd_set_drawmode,
diff --git a/apps/plugin.h b/apps/plugin.h
index cb076f5b85..ccc8d1c3af 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -149,7 +149,7 @@ struct plugin_api {
     void (*lcd_putc)(int x, int y, unsigned long ucs);
     void (*lcd_put_cursor)(int x, int y, unsigned long ucs);
     void (*lcd_remove_cursor)(void);
-    void (*PREFIX(lcd_icon))(int icon, bool enable);
+    void (*lcd_icon)(int icon, bool enable);
     void (*lcd_double_height)(bool on);
 #else
     void (*lcd_set_drawmode)(int mode);
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 89b09ad959..03687a3dbb 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -81,11 +81,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
             screen->putc=&lcd_remote_putc;
             screen->get_locked_pattern=&lcd_remote_get_locked_pattern;
             screen->define_pattern=&lcd_remote_define_pattern;
-#ifdef SIMULATOR
-            screen->icon=&sim_lcd_remote_icon;
-#else
             screen->icon=&lcd_remote_icon;
-#endif
 #endif /* 0 */
 
             screen->init=&lcd_remote_init;
@@ -164,11 +160,7 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
             screen->putc=&lcd_putc;
             screen->get_locked_pattern=&lcd_get_locked_pattern;
             screen->define_pattern=&lcd_define_pattern;
-#ifdef SIMULATOR
-            screen->icon=&sim_lcd_icon;
-#else
             screen->icon=&lcd_icon;
-#endif
 #endif /* HAVE_LCD_CHARCELLS */
 
             screen->init=&lcd_init;