-#define MODEST_TOOLBAR_ICON_MAIL_SEND PIXMAP_PREFIX "qgn_list_messagin_sent.png"
-#define MODEST_TOOLBAR_ICON_NEW_MAIL PIXMAP_PREFIX "qgn_toolb_messagin_new.png"
-#define MODEST_TOOLBAR_ICON_SEND_RECEIVE PIXMAP_PREFIX "qgn_toolb_messagin_sendreceive.png"
-#define MODEST_TOOLBAR_ICON_REPLY PIXMAP_PREFIX "qgn_toolb_messagin_reply.png"
-#define MODEST_TOOLBAR_ICON_REPLY_ALL PIXMAP_PREFIX "qgn_toolb_messagin_replytoall.png"
-#define MODEST_TOOLBAR_ICON_FORWARD PIXMAP_PREFIX "qgn_toolb_messagin_forward.png"
-#define MODEST_TOOLBAR_ICON_DELETE PIXMAP_PREFIX "qgn_toolb_messagin_delete.png"
-#define MODEST_TOOLBAR_ICON_NEXT PIXMAP_PREFIX "forward.png"
-#define MODEST_TOOLBAR_ICON_PREV PIXMAP_PREFIX "back.png"
-#define MODEST_TOOLBAR_ICON_STOP PIXMAP_PREFIX "stock-stop.svg"
-
+#define MODEST_TOOLBAR_ICON_MAIL_SEND "qgn_list_messagin_sent"
+#define MODEST_TOOLBAR_ICON_NEW_MAIL "qgn_toolb_messagin_new"
+#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"