--- a/src/mn-popup.gob
+++ b/src/mn-popup.gob
@@ -48,7 +48,7 @@ class MN:Popup from Notify:Notification
 
     g_object_set(self,
 		 "body", body->str,
-		 "icon-name", "stock_mail",
+		 "icon-name", "mail-unread",
 		 NULL);
 
     if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED)
diff --git a/src/mn-stock.c b/src/mn-stock.c
index ed62c14..c2cff1f 100644
--- a/src/mn-stock.c
+++ b/src/mn-stock.c
@@ -32,11 +32,11 @@ mn_stock_init (void)
     const char	*icon_name;
     const char	*source_stock_id;
   } icons[] = {
-    { MN_STOCK_MAIL,			NULL, "stock_mail" },
-    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
-    { MN_STOCK_LOCAL,			NULL, "stock_folder" },
-    { MN_STOCK_REMOTE,			NULL, "stock_internet" },
-    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
+    { MN_STOCK_MAIL,			NULL, "mail-message-new" },
+    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
+    { MN_STOCK_LOCAL,			NULL, "folder" },
+    { MN_STOCK_REMOTE,			NULL, "applications-internet" },
+    { MN_STOCK_UNKNOWN,			NULL, "dialog-question" },
     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
 #if WITH_GMAIL
     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
@@ -48,14 +48,14 @@
     { MN_STOCK_HOTMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" },
 #endif
 #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED
-    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
+    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
 #endif
 #if WITH_EVOLUTION
-    { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
+    { MN_STOCK_EVOLUTION_MAILBOX,	PKGDATADIR G_DIR_SEPARATOR_S "evolution.png" },
 #endif
-    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
-    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
-    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
+    { MN_STOCK_MAIL_READER,		NULL, "mail-unread" },
+    { MN_STOCK_OPEN_MESSAGE,		NULL, "mail-read" },
+    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
   };
   GtkIconFactory *factory;
   GtkIconTheme *icon_theme;

--- a/jbsrc/jb.c	2012-02-28 16:47:24.989827330 +0100
+++ b/jbsrc/jb.c	2012-02-28 16:52:09.954552989 +0100
@@ -364,6 +364,8 @@
   if (jb_variable_get_bool("hotmail"))
     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
 
+  jb_group_add_data_file(group, "evolution.png", "$pkgdatadir");
+
   rule = jb_rule_new();
   jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
   jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");