/* 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_CLOSED "qgn_list_gene_fldr_cls"
#define MODEST_FOLDER_ICON_ACCOUNT "general_web"
-#define MODEST_FOLDER_ICON_INBOX "general_received"
+#define MODEST_FOLDER_ICON_INBOX "email_inbox"
#define MODEST_FOLDER_ICON_OUTBOX "general_outbox"
#define MODEST_FOLDER_ICON_SENT "general_sent"
#define MODEST_FOLDER_ICON_TRASH "general_folder"
#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"
+#define MODEST_FOLDER_ICON_REMOTE_FOLDER "email_remote_folder"
/* toolbar */
#define MODEST_TOOLBAR_ICON_MAIL_SEND "email_message_send"
#define MODEST_TOOLBAR_ICON_NEW_MAIL "email_message_editor"
#define MODEST_TOOLBAR_ICON_SEND_RECEIVE "general_refresh"
#define MODEST_TOOLBAR_ICON_REPLY "email_message_reply"
-#define MODEST_TOOLBAR_ICON_REPLY_ALL ""
+#define MODEST_TOOLBAR_ICON_REPLY_ALL "email_message_reply_all"
#define MODEST_TOOLBAR_ICON_FORWARD ""
#define MODEST_TOOLBAR_ICON_DELETE "general_delete"
#define MODEST_TOOLBAR_ICON_FORMAT_BULLETS ""
#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"
#define MODEST_TOOLBAR_ICON_PREV "general_back"
#define MODEST_TOOLBAR_ICON_FIND "general_search"
+#define MODEST_TOOLBAR_ICON_DOWNLOAD_IMAGES "email_message_download_external_images"
/* Stock icon names */
#define MODEST_STOCK_MAIL_SEND "modest-stock-mail-send"