-#define MODEST_TOOLBAR_ICON_MAIL_SEND "qgn_toolb_messagin_send"
-#define MODEST_TOOLBAR_ICON_NEW_MAIL "qgn_list_messagin_editor"
-#define MODEST_TOOLBAR_ICON_SEND_RECEIVE "qgn_toolb_messagin_sendreceive"
-#define MODEST_TOOLBAR_ICON_REPLY "qgn_toolb_messagin_reply"
-#define MODEST_TOOLBAR_ICON_REPLY_ALL "qgn_toolb_messagin_replytoall"
-#define MODEST_TOOLBAR_ICON_FORWARD "qgn_toolb_messagin_forward"
-#define MODEST_TOOLBAR_ICON_DELETE "qgn_toolb_gene_deletebutton"
-#define MODEST_TOOLBAR_ICON_FORMAT_BULLETS "qgn_list_gene_bullets"
-#define MODEST_TOOLBAR_ICON_SPLIT_VIEW "qgn_toolb_rss_fldonoff"
-#define MODEST_TOOLBAR_ICON_SORT "qgn_list_sort"
-#define MODEST_TOOLBAR_ICON_REFRESH "qgn_toolb_gene_refresh"
-#define MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER "qgn_toolb_gene_movetofldr"
-#define MODEST_TOOLBAR_ICON_BOLD "qgn_list_gene_bold"
-#define MODEST_TOOLBAR_ICON_ITALIC "qgn_list_gene_italic"
-#define MODEST_TOOLBAR_ICON_NEXT "qgn_toolb_gene_forward"
-#define MODEST_TOOLBAR_ICON_PREV "qgn_toolb_gene_back"
-#define MODEST_TOOLBAR_ICON_FIND "qgn_toolb_gene_find"
+#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_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 "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"