This is a manual merge of branch drop split view intro trunk.

[modest] / src / hildon2 / modest-icon-names.h

diff --git a/src/hildon2/modest-icon-names.h b/src/hildon2/modest-icon-names.h
index 716b71e..e0b33af 100644 (file)
--- a/src/hildon2/modest-icon-names.h
+++ b/src/hildon2/modest-icon-names.h
@@ -36,7 +36,7 @@
 
 /* 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"
 
@@ -66,8 +66,8 @@
 
 #define MODEST_FOLDER_ICON_ACCOUNT             "general_web"
 #define MODEST_FOLDER_ICON_INBOX               "general_received"
-#define MODEST_FOLDER_ICON_OUTBOX              "general_sent"
-#define MODEST_FOLDER_ICON_SENT                        "email_message_sent"
+#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_JUNK                        "general_folder"
 #define MODEST_FOLDER_ICON_DRAFTS              "email_message_drafts"
@@ -88,7 +88,7 @@
 #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"