/* icons */
-#define MODEST_APP_ICON "general_mail"
+#define MODEST_APP_ICON "general_email"
#define MODEST_APP_MSG_VIEW_ICON "email_message_viewer"
#define MODEST_APP_MSG_EDIT_ICON "email_message_editor"
#define MODEST_FOLDER_ICON_NORMAL "general_folder"
#define MODEST_FOLDER_ICON_LOCAL_FOLDERS "general_device_root_folder"
#define MODEST_FOLDER_ICON_MMC "general_removable_memory_card"
-
+#define MODEST_FOLDER_ICON_MMC_FOLDER "general_removable_memory_card"
/* toolbar */
#define MODEST_TOOLBAR_ICON_MAIL_SEND "email_message_send"
#define MODEST_TOOLBAR_ICON_SPLIT_VIEW "general_foldertree"
#define MODEST_TOOLBAR_ICON_SORT "general_sort"
#define MODEST_TOOLBAR_ICON_REFRESH "general_refresh"
-#define MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER "filemanager_move_to_folder"
+#define MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER "general_move_to_folder"
#define MODEST_TOOLBAR_ICON_BOLD "general_bold"
#define MODEST_TOOLBAR_ICON_ITALIC "general_italic"
#define MODEST_TOOLBAR_ICON_NEXT "general_forward"