#define MODEST_APP_MSG_EDIT_ICON "qgn_list_messagin_editor"
#define MODEST_HEADER_ICON_READ "qgn_list_messagin_mail"
-#define MODEST_HEADER_ICON_UNREAD "qgn_list_messagin_mail_unread"
+#define MODEST_HEADER_ICON_UNREAD ""
#define MODEST_HEADER_ICON_DELETED "qgn_list_messagin_mail_deleted"
#define MODEST_HEADER_ICON_ATTACH "qgn_list_gene_attacpap"
+#define MODEST_HEADER_ICON_HIGH "qgn_list_messaging_high"
+#define MODEST_HEADER_ICON_LOW "qgn_list_messaging_low"
-#define MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY PIXMAP_PREFIX "qgn_list_gene_high_attacpap,png"
-#define MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY PIXMAP_PREFIX "qgn_list_gene_low_attacpap.png"
-#define MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY PIXMAP_PREFIX "qgn_list_gene_norm_attacpap.png"
-
-#define MODEST_HEADER_ICON_HIGH_PRIORITY PIXMAP_PREFIX "qgn_list_messaging_high_noatt.png"
-#define MODEST_HEADER_ICON_LOW_PRIORITY PIXMAP_PREFIX "qgn_list_messaging_low_noatt.png"
+/*
+ * until we have the custom cell renderer, we use the hacked icons below;
+ * don't remove!!!
+ */
+#define MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY PIXMAP_PREFIX"modest_high_attachment.png"
+#define MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY PIXMAP_PREFIX"modest_low_attachment.png"
+#define MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY PIXMAP_PREFIX"modest_normal_attachment.png"
+#define MODEST_HEADER_ICON_HIGH_PRIORITY PIXMAP_PREFIX"modest_high_no_attachment.png"
+#define MODEST_HEADER_ICON_LOW_PRIORITY PIXMAP_PREFIX"modest_low_no_attachment.png"
+#define MODEST_HEADER_ICON_NORM_PRIORITY PIXMAP_PREFIX"modest_normal_no_attachment.png"
+/*
+ *
+ */
#define MODEST_FOLDER_ICON_OPEN "qgn_list_gene_fldr_opn"
#define MODEST_FOLDER_ICON_CLOSED "qgn_list_gene_fldr_cls"
#define MODEST_FOLDER_ICON_INBOX "qgn_list_messagin_inbox"
#define MODEST_FOLDER_ICON_OUTBOX "qgn_list_messagin_outbox"
#define MODEST_FOLDER_ICON_SENT "qgn_list_messagin_sent"
-#define MODEST_FOLDER_ICON_TRASH "qgn_toolb_messagin_delete"
-#define MODEST_FOLDER_ICON_JUNK "qgn_toolb_messagin_delete"
+#define MODEST_FOLDER_ICON_TRASH "qgn_toolb_gene_deletebutton"
+#define MODEST_FOLDER_ICON_JUNK "qgn_toolb_gene_deletebutton"
#define MODEST_FOLDER_ICON_DRAFTS "qgn_list_messagin_drafts"
#define MODEST_FOLDER_ICON_NORMAL "qgn_list_gene_fldr_cls"
#define MODEST_FOLDER_ICON_LOCAL_FOLDERS "qgn_list_shell_mydevice"
#define MODEST_FOLDER_ICON_MMC "qgn_list_gene_mmc"
-
+#define MODEST_FOLDER_ICON_MMC_FOLDER MODEST_FOLDER_ICON_NORMAL
/* toolbar */
-#define MODEST_TOOLBAR_ICON_MAIL_SEND "qgn_list_messagin_sent"
-#define MODEST_TOOLBAR_ICON_NEW_MAIL "qgn_toolb_messagin_new"
+#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_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"
/* Stock icon names */
#define MODEST_STOCK_MAIL_SEND "modest-stock-mail-send"