diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index db4b8ade3..5bf2bc126 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-19  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Michael Monreal <infernux@web.de>
+
+	* gnome-da-capplet.c: replace mail and multimedia icon names with
+	Tangoified versions (bug #470386)
+
 2007-09-18  Jens Granseuer  <jensgr@gmx.net>
 
 	Patch by: Patrick Wade <patrick.wade@sun.com>
diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c
index 897c58d86..506fc451e 100644
--- a/capplets/default-applications/gnome-da-capplet.c
+++ b/capplets/default-applications/gnome-da-capplet.c
@@ -533,8 +533,8 @@ static struct {
     const gchar *icon;
 } icons[] = {
     { "web_browser_image", "web-browser"      },
-    { "mail_reader_image", "stock_mail-open"  },
-    { "media_player_image", "gnome-audio"     },
+    { "mail_reader_image", "emblem-mail"  },
+    { "media_player_image", "applications-multimedia"     },
     { "visual_image",      "zoom-best-fit" },
     { "mobility_image",    "preferences-desktop-accessibility" },
 /*    { "messenger_image",   "im"               },