diff --git a/evolution-2.11.92-icon-names.patch b/evolution-2.11.92-icon-names.patch
new file mode 100644
index 0000000..25e1b23
--- /dev/null
+++ b/evolution-2.11.92-icon-names.patch
@@ -0,0 +1,2479 @@
+diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c
+--- evolution-2.11.92/mail/em-folder-browser.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-15 16:53:46.000000000 -0400
+@@ -206,7 +206,7 @@ enum {
+ /* Options for View */
+ static EMFBSearchBarItem emfb_view_items[] = {
+ {{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL},
+- {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"},
++ {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"},
+ {{ NULL, 0, 0 }, NULL},
+ {{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL},
+ {{ NULL, -1, 0 }, NULL}
+@@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items
+ /* TODO: Following options should be customizable */
+ static EMFBSearchBarItem temp_view_items[] = {
+ {{ NULL, 0, 0 }, NULL},
+- {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
++ {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"},
+ {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
+ {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
+ {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
+ {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
+- {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
++ {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"},
+ /* { NULL, 0, NULL }, */
+ /* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */
+ {{ NULL, -1, 0 }, NULL}
+diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c
+--- evolution-2.11.92/mail/em-folder-tree.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/mail/em-folder-tree.c 2007-09-15 16:53:46.000000000 -0400
+@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column
+ guint32 flags;
+
+ if (!initialised) {
+- folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
++ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
+- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU);
+- folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
++ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU);
++ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU);
+ folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU);
+@@ -1002,7 +1002,7 @@ static EPopupItem emft_drop_popup_menu[]
+ { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 },
+ { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 },
+ { E_POPUP_BAR, "10.emc" },
+- { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 },
++ { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 },
+ };
+
+ static void
+@@ -2114,12 +2114,12 @@ static EPopupItem emft_popup_items[] = {
+
+ { E_POPUP_BAR, "20.emc" },
+ /* FIXME: need to disable for nochildren folders */
+- { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS },
++ { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS },
+ /* FIXME: need to disable for undeletable folders */
+- { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
++ { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+ { E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+- { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
+- { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
++ { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
++ { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
+
+
+ { E_POPUP_BAR, "80.emc" },
+diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml
+--- evolution-2.11.92/mail/mail.error.xml.icon-names 2007-07-28 17:08:12.000000000 -0400
++++ evolution-2.11.92/mail/mail.error.xml 2007-09-15 16:53:46.000000000 -0400
+@@ -16,14 +16,14 @@
+ <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
+ {0}
+ Send anyway?
+-
++
+
+
+
+
+ <_primary>Are you sure you want to send a message without a subject?
+ <_secondary xml:space="preserve">Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about.
+-
++
+
+
+
+@@ -32,14 +32,14 @@ Send anyway?
+ <_secondary xml:space="preserve">The contact list you are sending to is configured to hide list recipients.
+
+ Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient.
+-
++
+
+
+
+
+ <_primary>Are you sure you want to send a message with only BCC recipients?
+ <_secondary xml:space="preserve">Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient.
+-
++
+
+
+
+@@ -51,36 +51,36 @@ Many email systems add an Apparently-To
+
+ <_primary>Use default drafts folder?
+ <_secondary xml:space="preserve">Unable to open the drafts folder for this account. Use the system drafts folder instead?
+-
++
+
+
+
+
+ <_primary>Are you sure you want to permanently remove all the deleted messages in folder "{0}"?
+ <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.
+-
++
+
+
+
+
+ <_primary>Are you sure you want to permanently remove all the deleted messages in all folders?
+ <_secondary xml:space="preserve">If you continue, you will not be able to recover these messages.
+-
++
+
+
+
+
+ <_primary>Are you sure you want to open {0} messages at once?
+ <_secondary xml:space="preserve">Opening too many messages at once may take a long time.
+-
++
+
+
+
+
+ <_primary>You have unsent messages, do you wish to quit anyway?
+ <_secondary xml:space="preserve">If you quit, these messages will not be sent until Evolution is started again.
+-
+-
++
++
+
+
+
+@@ -99,8 +99,8 @@ Many email systems add an Apparently-To
+
+
+ {0}
+-
+-
++
++
+
+
+
+@@ -109,8 +109,8 @@ Many email systems add an Apparently-To
+
+
+ {0}
+-
+-
++
++
+
+
+
+@@ -119,15 +119,15 @@ Many email systems add an Apparently-To
+
+
+ {0}
+-
+-
++
++
+
+
+
+ <_primary>Enter password.
+ {0}
+-
+-
++
++
+
+
+
+@@ -179,15 +179,15 @@ Many email systems add an Apparently-To
+ <_title>Delete "{0}"?
+ <_primary>Really delete folder "{0}" and all of its subfolders?
+ <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders contents will be deleted permanently.
+-
+-
++
++
+
+
+
+ <_title>Delete "{0}"?
+ <_primary>Really delete folder "{0}" and all of its subfolders?
+-
+-
++
++
+
+
+
+@@ -239,7 +239,7 @@ Many email systems add an Apparently-To
+ <_title>Delete account?
+ <_primary>Are you sure you want to delete this account?
+ <_secondary xml:space="preserve">If you proceed, the account information will be deleted permanently.
+-
++
+
+
+
+@@ -248,7 +248,7 @@ Many email systems add an Apparently-To
+ <_primary>Are you sure you want to delete this account and all its proxies?
+ <_secondary xml:space="preserve">If you proceed, the account information and
+ all proxy information will be deleted permanently.
+-
++
+
+
+
+@@ -275,8 +275,8 @@ all proxy information will be deleted pe
+ <_primary>Do you wish to save your changes?
+ <_secondary xml:space="preserve">This signature has been changed, but has not been saved.
+
+-
+-
++
++
+
+
+
+@@ -329,9 +329,9 @@ Either by selecting the folders individu
+ <_secondary xml:space="preserve">A non-empty folder at "{1}" already exists.
+
+ You can choose to ignore this folder, overwrite or append its contents, or quit.
+-
++
+
+-
++
+
+
+
+@@ -344,7 +344,7 @@ You can choose to ignore this folder, ov
+ <_title>Querying server
+ <_primary>Please wait.
+ <_secondary xml:space="preserve">Querying server for a list of supported authentication mechanisms.
+-
++
+
+
+
+diff -up evolution-2.11.92/mail/message-list.c.icon-names evolution-2.11.92/mail/message-list.c
+--- evolution-2.11.92/mail/message-list.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/mail/message-list.c 2007-09-15 16:53:46.000000000 -0400
+@@ -217,9 +217,9 @@ static struct {
+ char *icon_name;
+ GdkPixbuf *pixbuf;
+ } states_pixmaps[] = {
+- { "stock_mail-unread", NULL },
+- { "stock_mail-open", NULL },
+- { "stock_mail-replied", NULL },
++ { "mail-unread", NULL },
++ { "mail-read", NULL },
++ { "mail-replied", NULL },
+ { "stock_mail-unread-multiple", NULL },
+ { "stock_mail-open-multiple", NULL },
+ { NULL, NULL },
+diff -up evolution-2.11.92/mail/mail-mt.c.icon-names evolution-2.11.92/mail/mail-mt.c
+--- evolution-2.11.92/mail/mail-mt.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/mail/mail-mt.c 2007-09-15 16:53:46.000000000 -0400
+@@ -964,7 +964,7 @@ op_status_exec (struct _op_status_msg *m
+ data->activity_state = 1;
+
+ if (progress_icon == NULL)
+- progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
++ progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU);
+
+ MAIL_MT_UNLOCK (mail_msg_lock);
+ if (msg->info->desc)
+diff -up evolution-2.11.92/mail/em-folder-view.c.icon-names evolution-2.11.92/mail/em-folder-view.c
+--- evolution-2.11.92/mail/em-folder-view.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/mail/em-folder-view.c 2007-09-15 16:53:46.000000000 -0400
+@@ -1216,29 +1216,29 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current
+ /* TODO: Move some of these to be 'standard' menu's */
+
+ static EPopupItem emfv_popup_items[] = {
+- { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "stock_copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION },
++ { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION },
+
+ { E_POPUP_BAR, "10.emfv", NULL, NULL, NULL, NULL },
+
+- { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "stock_mail-reply", EM_POPUP_SELECT_ONE },
+- { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_SELECT_ONE },
+- { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "stock_mail-forward", EM_POPUP_SELECT_MANY },
++ { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "mail-reply-sender", EM_POPUP_SELECT_ONE },
++ { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_SELECT_ONE },
++ { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "mail-forward", EM_POPUP_SELECT_MANY },
+
+ { E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL },
+ /* EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone */
+ { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE },
+- { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "stock_save-as", EM_POPUP_SELECT_MANY },
+- { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "stock_print", EM_POPUP_SELECT_ONE },
++ { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "document-save-as", EM_POPUP_SELECT_MANY },
++ { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "document-print", EM_POPUP_SELECT_ONE },
+
+ { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL },
+- { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
++ { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
+
+ { E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL },
+- { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "stock_mail-open", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY },
+- { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "stock_mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY },
++ { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY },
++ { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "emblem-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK },
+@@ -1950,43 +1950,47 @@ static BonoboUIVerb emfv_message_verbs[]
+ BONOBO_UI_VERB_END
+ };
+ static EPixmap emfv_message_pixmaps[] = {
+- E_PIXMAP ("/commands/EditCut", "stock_cut", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/EditCopy", "stock_copy", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/EditPaste", "stock_paste", E_ICON_SIZE_MENU),
+-
+- E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageForward", "stock_mail-forward", E_ICON_SIZE_MENU),
++
++ E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MailCompose", "mail-message-new", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageDelete", "user-trash", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageSearch", "stock_search", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageMarkAsRead", "stock_mail-open", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageMarkAsUnRead", "stock_mail-unread", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageForward", "mail-forward", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageMarkAsImportant", "emblem-important", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/ViewLoadImages", "stock_insert_image", E_ICON_SIZE_MENU),
+- E_PIXMAP ("/commands/MailCompose", "stock_mail-compose", E_ICON_SIZE_MENU),
+-
+- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_LARGE_TOOLBAR),
+- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_LARGE_TOOLBAR),
+- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR),
+- E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR),
++ E_PIXMAP ("/commands/MessageMarkAsRead", "mail-read", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-unread", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/MessageSearch", "edit-find", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/PrintMessage", "document-print", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/PrintPreviewMessage", "document-print-preview", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/TextZoomIn", "zoom-in", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/TextZoomOut", "zoom-out", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/TextZoomReset", "zoom-reset", E_ICON_SIZE_MENU),
++ E_PIXMAP ("/commands/ViewLoadImages", "insert-image", E_ICON_SIZE_MENU),
++
++ E_PIXMAP ("/menu/MessagePlaceholder/Message/MessageNavigation/GoTo", "go-jump", E_ICON_SIZE_MENU),
++
++ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_LARGE_TOOLBAR),
++ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_LARGE_TOOLBAR),
++ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", E_ICON_SIZE_LARGE_TOOLBAR),
++ E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR),
++ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR),
+-
+- E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR),
+- E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR),
++ E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "go-next", E_ICON_SIZE_LARGE_TOOLBAR),
++ E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP_END
+ };
+@@ -2601,7 +2605,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPop
+
+ static EPopupItem emfv_uri_popups[] = {
+ { E_POPUP_ITEM, "00.uri.11", N_("C_all To..."), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_CALLTO },
+- { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "gtk-copy", EM_POPUP_URI_NOT_MAILTO },
++ { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO },
+
+ { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
+ { E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
+diff -up evolution-2.11.92/mail/em-popup.c.icon-names evolution-2.11.92/mail/em-popup.c
+--- evolution-2.11.92/mail/em-popup.c.icon-names 2007-09-02 14:56:48.000000000 -0400
++++ evolution-2.11.92/mail/em-popup.c 2007-09-15 16:53:46.000000000 -0400
+@@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPop
+ }
+
+ static EMPopupItem emp_standard_object_popups[] = {
+- { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 },
++ { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 },
+ { E_POPUP_ITEM, "00.part.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE },
+ { E_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE },
+- { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE },
++ { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_PART_MESSAGE },
+ { E_POPUP_ITEM, "10.part.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE},
+- { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_PART_MESSAGE},
++ { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_PART_MESSAGE},
+ { E_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE },
+- { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_PART_MESSAGE },
++ { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_PART_MESSAGE },
+ };
+
+ static EMPopupItem emp_attachment_object_popups[] = {
+- { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 },
++ { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 },
+ { E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_ATTACHMENTS_IMAGE },
+ { E_POPUP_BAR, "05.attach", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE },
+- { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_ATTACHMENTS_MESSAGE },
++ { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_ATTACHMENTS_MESSAGE },
+ { E_POPUP_ITEM, "05.attach.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE},
+- { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_ATTACHMENTS_MESSAGE},
++ { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_ATTACHMENTS_MESSAGE},
+ { E_POPUP_BAR, "05.attach.10", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE },
+- { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE },
++ { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE },
+ };
+
+ static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
+@@ -631,8 +631,8 @@ emp_uri_popup_address_add(EPopup *ep, EP
+
+ static EPopupItem emp_standard_uri_popups[] = {
+ { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP },
+- { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO },
+- { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO },
++ { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO },
++ { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "list-add", EM_POPUP_URI_MAILTO },
+ };
+
+ /* ********************************************************************** */
+diff -up evolution-2.11.92/mail/mail-send-recv.c.icon-names evolution-2.11.92/mail/mail-send-recv.c
+--- evolution-2.11.92/mail/mail-send-recv.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/mail/mail-send-recv.c 2007-09-15 16:53:46.000000000 -0400
+@@ -399,7 +399,7 @@ build_dialog (EAccountList *accounts, Ca
+ gtk_widget_show (cancel_button);
+ gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL);
+
+- icon_list = e_icon_factory_get_icon_list ("stock_mail-send-receive");
++ icon_list = e_icon_factory_get_icon_list ("mail-send-receive");
+ if (icon_list) {
+ gtk_window_set_icon_list (GTK_WINDOW (gd), icon_list);
+ g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
+@@ -560,7 +560,7 @@ build_dialog (EAccountList *accounts, Ca
+ info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
+
+ send_icon = e_icon_factory_get_image (
+- "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
++ "mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
+ pretty_url = format_url (destination, NULL);
+ label = gtk_label_new (NULL);
+ gtk_label_set_ellipsize (
+diff -up evolution-2.11.92/mail/em-format-html-display.c.icon-names evolution-2.11.92/mail/em-format-html-display.c
+--- evolution-2.11.92/mail/em-format-html-display.c.icon-names 2007-09-02 14:56:48.000000000 -0400
++++ evolution-2.11.92/mail/em-format-html-display.c 2007-09-15 16:53:46.000000000 -0400
+@@ -2322,7 +2322,7 @@ efhd_add_bar(EMFormatHTML *efh, GtkHTMLE
+ priv->label = gtk_label_new(_("No Attachment"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (priv->label), priv->arrow);
+ save = gtk_button_new();
+- image = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_BUTTON);
++ image = gtk_image_new_from_stock ("document-save", GTK_ICON_SIZE_BUTTON);
+ txt = gtk_label_new_with_mnemonic(_("S_ave"));
+ priv->save_txt = txt;
+ hbox1 = gtk_hbox_new(FALSE, 0);
+diff -up evolution-2.11.92/mail/em-mailer-prefs.c.icon-names evolution-2.11.92/mail/em-mailer-prefs.c
+--- evolution-2.11.92/mail/em-mailer-prefs.c.icon-names 2007-09-02 14:56:48.000000000 -0400
++++ evolution-2.11.92/mail/em-mailer-prefs.c 2007-09-15 16:53:46.000000000 -0400
+@@ -783,7 +783,7 @@ junk_plugin_changed (GtkWidget *combo, E
+ void *status = e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
+ if ((gboolean)status == TRUE) {
+ char *text, *html;
+- gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
++ gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
+ text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
+ html = g_strdup_printf ("%s", text);
+ gtk_label_set_markup (prefs->plugin_status, html);
+@@ -791,7 +791,7 @@ junk_plugin_changed (GtkWidget *combo, E
+ g_free (text);
+ } else {
+ char *text, *html;
+- gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
++ gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
+ text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
+ html = g_strdup_printf ("%s", text);
+ gtk_label_set_markup (prefs->plugin_status, html);
+@@ -836,7 +836,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
+ status = (gboolean)e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL);
+ if (status) {
+ char *text, *html;
+- gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU);
++ gtk_image_set_from_stock (prefs->plugin_image, "dialog-information", GTK_ICON_SIZE_MENU);
+ /* May be a better text */
+ text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name);
+ html = g_strdup_printf ("%s", text);
+@@ -845,7 +845,7 @@ junk_plugin_setup (GtkWidget *combo, EMM
+ g_free (text);
+ } else {
+ char *text, *html;
+- gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU);
++ gtk_image_set_from_stock (prefs->plugin_image, "dialog-warning", GTK_ICON_SIZE_MENU);
+ /* May be a better text */
+ text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name);
+ html = g_strdup_printf ("%s", text);
+diff -up evolution-2.11.92/mail/mail-component.c.icon-names evolution-2.11.92/mail/mail-component.c
+--- evolution-2.11.92/mail/mail-component.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/mail/mail-component.c 2007-09-15 16:53:46.000000000 -0400
+@@ -881,7 +881,7 @@ impl__get_userCreatableItems (PortableSe
+ list->_buffer[0].menuDescription = _("_Mail Message");
+ list->_buffer[0].tooltip = _("Compose a new mail message");
+ list->_buffer[0].menuShortcut = 'm';
+- list->_buffer[0].iconName = "stock_mail-compose";
++ list->_buffer[0].iconName = "mail-message-new";
+ list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
+
+ list->_buffer[1].id = "folder";
+@@ -889,7 +889,7 @@ impl__get_userCreatableItems (PortableSe
+ list->_buffer[1].menuDescription = _("Mail _Folder");
+ list->_buffer[1].tooltip = _("Create a new mail folder");
+ list->_buffer[1].menuShortcut = '\0';
+- list->_buffer[1].iconName = "stock_new-dir";
++ list->_buffer[1].iconName = "folder-new";
+ list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
+
+ return list;
+diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder.c
+--- evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.icon-names 2007-09-15 16:53:46.000000000 -0400
++++ evolution-2.11.92/plugins/exchange-operations/exchange-folder.c 2007-09-15 16:53:46.000000000 -0400
+@@ -63,7 +63,7 @@ static void exchange_get_folder (char *u
+
+
+ static EPopupItem popup_inbox_items[] = {
+- { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
++ { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+ };
+
+ void
+@@ -232,7 +232,7 @@ org_gnome_exchange_check_inbox_subscribe
+ }
+
+ static EPopupItem popup_items[] = {
+- { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
++ { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+ };
+
+ void
+@@ -242,7 +242,7 @@ popup_free (EPopup *ep, GSList *items, v
+ }
+
+ static EPopupItem popup_ab_items[] = {
+- { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
++ { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+ };
+
+ void
+diff -up evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c
+--- evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c.icon-names 2007-09-02 14:56:39.000000000 -0400
++++ evolution-2.11.92/plugins/exchange-operations/exchange-folder-permission.c 2007-09-15 16:53:46.000000000 -0400
+@@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permiss
+ gchar *selected_exchange_folder_uri = NULL;
+
+ static EPopupItem popup_items[] = {
+- { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
++ { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+ };
+
+ static void
+diff -up evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
+--- evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names 2007-07-05 02:09:22.000000000 -0400
++++ evolution-2.11.92/plugins/save-calendar/org-gnome-save-calendar.eplug.xml 2007-09-15 16:53:46.000000000 -0400
+@@ -8,10 +8,10 @@
+
+
+
+diff -up evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
+--- evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml.icon-names 2007-07-05 02:09:19.000000000 -0400
++++ evolution-2.11.92/plugins/copy-tool/org-gnome-copy-tool.eplug.xml 2007-09-15 16:53:46.000000000 -0400
+@@ -14,7 +14,7 @@
+