-#define MODEST_TOOLBAR_ICON_MAIL_SEND PIXMAP_PREFIX "gnome-stock-mail-new.svg"
-#define MODEST_TOOLBAR_ICON_NEW_MAIL PIXMAP_PREFIX "gnome-stock-mail-new.svg"
-#define MODEST_TOOLBAR_ICON_SEND_RECEIVE PIXMAP_PREFIX "gtk-refresh.svg"
-#define MODEST_TOOLBAR_ICON_REPLY PIXMAP_PREFIX "gnome-stock-mail-rpl.svg"
-#define MODEST_TOOLBAR_ICON_REPLY_ALL PIXMAP_PREFIX "mail-reply-all.svg"
-#define MODEST_TOOLBAR_ICON_FORWARD PIXMAP_PREFIX "mail-forward.svg"
-#define MODEST_TOOLBAR_ICON_DELETE PIXMAP_PREFIX "edit-delete.svg"
-#define MODEST_TOOLBAR_ICON_NEXT PIXMAP_PREFIX "forward.svg"
-#define MODEST_TOOLBAR_ICON_PREV PIXMAP_PREFIX "back.svg"
-#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"
+
+/* Stock icon names */
+#define MODEST_STOCK_MAIL_SEND "modest-stock-mail-send"
+#define MODEST_STOCK_NEW_MAIL "modest-stock-new-mail"
+#define MODEST_STOCK_SEND_RECEIVE "modest-stock-send-receive"
+#define MODEST_STOCK_REPLY "modest-stock-reply"
+#define MODEST_STOCK_REPLY_ALL "modest-stock-reply-all"
+#define MODEST_STOCK_FORWARD "modest-stock-forward"
+#define MODEST_STOCK_DELETE "modest-stock-delete"
+#define MODEST_STOCK_NEXT "modest-stock-next"
+#define MODEST_STOCK_PREV "modest-stock-prev"
+#define MODEST_STOCK_STOP "modest-stock-stop"
+#define MODEST_STOCK_SPLIT_VIEW "modest-stock-split-view"
+#define MODEST_STOCK_SORT "modest-stock-sort"
+#define MODEST_STOCK_REFRESH "modest-stock-refresh"