Index: shell/rb-tray-icon.c
===================================================================
--- shell/rb-tray-icon.c	(revision 4827)
+++ shell/rb-tray-icon.c	(working copy)
@@ -41,7 +41,6 @@
 #include "rb-shell-player.h"
 
 #define TRAY_ICON_DEFAULT_TOOLTIP _("Music Player")
-#define DEFAULT_TOOLTIP_ICON "" /*"gnome-media-player"*/
 #define TOOLTIPS_DELAY 500
 #define TOOLTIPS_STICKY_REVERT_DELAY 1000
 
@@ -86,7 +85,6 @@ static void rb_tray_icon_drop_cb (GtkWid
 				  RBTrayIcon *icon);
 static void rb_tray_icon_suppress_tooltips (RBTrayIcon *icon, guint duration);
 static void rb_tray_icon_construct_tooltip (RBTrayIcon *icon);
-static GtkWidget* rb_tray_icon_create_blank_image (RBTrayIcon *icon);
 
 struct RBTrayIconPrivate
 {
@@ -629,7 +627,8 @@ rb_tray_icon_set_tooltip_icon (RBTrayIco
 	GList *children;
 
 	if (msgicon == NULL)
-		msgicon = rb_tray_icon_create_blank_image (icon);
+		msgicon = gtk_image_new_from_icon_name (RB_APP_ICON,
+							GTK_ICON_SIZE_DIALOG);
 	image_box = GTK_CONTAINER (icon->priv->tooltip_image_box);
 	children = gtk_container_get_children (image_box);
 	current_image = GTK_WIDGET (g_list_nth_data (children, 0));
@@ -675,8 +674,6 @@ rb_tray_icon_notify (RBTrayIcon *icon,
 	rb_debug ("doing notify: %s", primary_markup);
 	if (timeout > 0)
 		rb_tray_icon_suppress_tooltips (icon, timeout);
-	if (msgicon == NULL)
-		msgicon = rb_tray_icon_create_blank_image (icon);
 	egg_tray_icon_notify (EGG_TRAY_ICON (icon), timeout,
 			      primary_markup, msgicon, secondary_markup);
 }
@@ -779,7 +776,8 @@ rb_tray_icon_construct_tooltip (RBTrayIc
 	gtk_misc_set_alignment  (GTK_MISC  (icon->priv->tooltip_secondary),
 				 0.0, 0.0);
 
-	image = rb_tray_icon_create_blank_image (icon);
+	image = gtk_image_new_from_icon_name (RB_APP_ICON,
+					      GTK_ICON_SIZE_DIALOG);
 	icon->priv->tooltip_image_box = gtk_vbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (icon->priv->tooltip_image_box), image,
 			    FALSE, FALSE, 0);
@@ -824,19 +822,3 @@ rb_tray_icon_suppress_tooltips (RBTrayIc
 	icon->priv->tooltip_unsuppress_id = g_timeout_add (duration, (GSourceFunc) rb_tray_icon_unsuppress_cb, icon);
 }
 
-static GtkWidget*
-rb_tray_icon_create_blank_image (RBTrayIcon *icon)
-{
-	int width;
-	GdkPixbuf *pixbuf;
-	GtkWidget *image;
-
-	gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &width, NULL);
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, width);
-	gdk_pixbuf_fill (pixbuf, 0); /* transparent */
-	image = gtk_image_new_from_pixbuf (pixbuf);
-	g_object_unref (pixbuf);
-
-	return image;
-}
-
Index: widgets/eggtrayicon.c
===================================================================
--- widgets/eggtrayicon.c	(revision 4827)
+++ widgets/eggtrayicon.c	(working copy)
@@ -619,7 +619,7 @@ egg_tray_icon_notify (EggTrayIcon *icon,
       theme = gtk_icon_theme_get_default ();
       gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &icon_size, NULL);
       pixbuf = gtk_icon_theme_load_icon (theme,
-                                         "gnome-media-player",
+                                         RB_APP_ICON,
                                          icon_size,
                                          0,
                                          NULL);
Index: lib/rb-stock-icons.h
===================================================================
--- lib/rb-stock-icons.h	(revision 4827)
+++ lib/rb-stock-icons.h	(working copy)
@@ -25,6 +25,7 @@
 
 G_BEGIN_DECLS
 
+extern const char RB_APP_ICON[];
 extern const char RB_STOCK_TRAY_ICON[];
 extern const char RB_STOCK_SET_STAR[];
 extern const char RB_STOCK_UNSET_STAR[];
