Index: sources/rb-source.h
===================================================================
--- sources/rb-source.h	(revision 4953)
+++ sources/rb-source.h	(working copy)
@@ -49,6 +49,8 @@ GType rb_source_eof_type_get_type (void)
 #define RB_IS_SOURCE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), RB_TYPE_SOURCE))
 #define RB_SOURCE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), RB_TYPE_SOURCE, RBSourceClass))
 
+#define RB_SOURCE_ICON_SIZE GTK_ICON_SIZE_LARGE_TOOLBAR
+
 typedef struct _RBSourceClass	RBSourceClass;
 typedef struct _RBSource		RBSource;
 typedef struct _RBSourcePrivate	RBSourcePrivate;
Index: sources/rb-auto-playlist-source.c
===================================================================
--- sources/rb-auto-playlist-source.c	(revision 4953)
+++ sources/rb-auto-playlist-source.c	(working copy)
@@ -140,9 +140,9 @@ rb_auto_playlist_source_init (RBAutoPlay
 	if (playlist_pixbuf == NULL) {
 		gint size;
 
-		gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+		gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 		playlist_pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-							    GNOME_MEDIA_AUTO_PLAYLIST,
+							    RB_STOCK_AUTO_PLAYLIST,
 							    size,
 							    0, NULL);
 		if (playlist_pixbuf) {
Index: sources/rb-missing-files-source.c
===================================================================
--- sources/rb-missing-files-source.c	(revision 4953)
+++ sources/rb-missing-files-source.c	(working copy)
@@ -111,7 +111,7 @@ rb_missing_files_source_init (RBMissingF
 
 	source->priv = G_TYPE_INSTANCE_GET_PRIVATE (source, RB_TYPE_MISSING_FILES_SOURCE, RBMissingFilesSourcePrivate);
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+	gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 	pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
 					   GTK_STOCK_MISSING_IMAGE,
 					   size,
Index: sources/rb-import-errors-source.c
===================================================================
--- sources/rb-import-errors-source.c	(revision 4953)
+++ sources/rb-import-errors-source.c	(working copy)
@@ -90,7 +90,7 @@ rb_import_errors_source_init (RBImportEr
 
 	source->priv = G_TYPE_INSTANCE_GET_PRIVATE (source, RB_TYPE_IMPORT_ERRORS_SOURCE, RBImportErrorsSourcePrivate);
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+	gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 	pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
 					   GTK_STOCK_DIALOG_ERROR,
 					   size,
Index: sources/rb-static-playlist-source.c
===================================================================
--- sources/rb-static-playlist-source.c	(revision 4953)
+++ sources/rb-static-playlist-source.c	(working copy)
@@ -153,9 +153,9 @@ rb_static_playlist_source_init (RBStatic
 {
 	if (playlist_pixbuf == NULL) {
 		gint size;
-		gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+		gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 		playlist_pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-							    GNOME_MEDIA_PLAYLIST,
+							    RB_STOCK_PLAYLIST,
 							    size,
 							    0, NULL);
 		if (playlist_pixbuf) {
Index: sources/rb-removable-media-source.c
===================================================================
--- sources/rb-removable-media-source.c	(revision 4953)
+++ sources/rb-removable-media-source.c	(working copy)
@@ -151,7 +151,7 @@ rb_removable_media_source_constructor (G
 
 	icon_name = gnome_vfs_volume_get_icon (volume);
 	theme = gtk_icon_theme_get_default ();
-	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+	gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 	pixbuf = gtk_icon_theme_load_icon (theme, icon_name, size, 0, NULL);
 	g_free (icon_name);
 
Index: sources/rb-library-source.c
===================================================================
--- sources/rb-library-source.c	(revision 4953)
+++ sources/rb-library-source.c	(working copy)
@@ -321,7 +321,7 @@ rb_library_source_new (RBShell *shell)
 
 	entry_type = RHYTHMDB_ENTRY_TYPE_SONG;
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+	gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 	icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
 					 "audio-x-generic",
 					 size,
Index: sources/rb-podcast-source.c
===================================================================
--- sources/rb-podcast-source.c	(revision 4953)
+++ sources/rb-podcast-source.c	(working copy)
@@ -391,7 +391,7 @@ rb_podcast_source_init (RBPodcastSource 
 
 	gtk_container_add (GTK_CONTAINER (source), source->priv->vbox);
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+	gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 	pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
 					   RB_STOCK_PODCAST,
 					   size,
@@ -402,7 +402,7 @@ rb_podcast_source_init (RBPodcastSource 
 		 * scale it to the right size.  otherwise the sourcelist gets
 		 * a bit uneven.
 		 */
-		gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+		gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 		scaled = gdk_pixbuf_scale_simple (pixbuf, size, size, GDK_INTERP_BILINEAR);
 
 		rb_source_set_pixbuf (RB_SOURCE (source), scaled);
Index: lib/rb-stock-icons.h
===================================================================
--- lib/rb-stock-icons.h	(revision 4953)
+++ lib/rb-stock-icons.h	(working copy)
@@ -31,10 +31,10 @@ extern const char RB_STOCK_UNSET_STAR[];
 extern const char RB_STOCK_NO_STAR[];
 extern const char RB_STOCK_PODCAST[];
 extern const char RB_STOCK_BROWSER[];
+extern const char RB_STOCK_PLAYLIST[];
+extern const char RB_STOCK_AUTO_PLAYLIST[];
 extern const char GNOME_MEDIA_SHUFFLE[];
 extern const char GNOME_MEDIA_REPEAT[];
-extern const char GNOME_MEDIA_PLAYLIST[];
-extern const char GNOME_MEDIA_AUTO_PLAYLIST[];
 extern const char GNOME_MEDIA_EJECT[];
 
 void	rb_stock_icons_init	(void);
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am	(revision 4953)
+++ lib/Makefile.am	(working copy)
@@ -67,9 +67,6 @@ rhythmbox-unset-star-inline.h: $(top_src
 rhythmbox-no-star-inline.h: $(top_srcdir)/data/art/rhythmbox-no-star.png
 	@GDK_PIXBUF_CSOURCE@ --raw --name=rhythmbox_no_star_inline $< > $@
 
-rhythmbox-podcast-inline.h: $(top_srcdir)/data/art/rhythmbox-podcast.png
-	@GDK_PIXBUF_CSOURCE@ --raw --name=rhythmbox_podcast_inline $< > $@
-
 rhythmbox-tray-icon-inline.h: $(top_srcdir)/data/art/rhythmbox-tray-icon.png
 	@GDK_PIXBUF_CSOURCE@ --raw --name=rhythmbox_tray_icon_inline $< > $@
 
@@ -83,7 +80,6 @@ BUILT_SOURCES += 				\
 	rhythmbox-set-star-inline.h		\
 	rhythmbox-unset-star-inline.h		\
 	rhythmbox-no-star-inline.h		\
-	rhythmbox-podcast-inline.h		\
 	rhythmbox-tray-icon-inline.h		\
 	media-eject-inline.h
 
Index: lib/rb-stock-icons.c
===================================================================
--- lib/rb-stock-icons.c	(revision 4953)
+++ lib/rb-stock-icons.c	(working copy)
@@ -35,7 +35,6 @@
 #include "rhythmbox-set-star-inline.h"
 #include "rhythmbox-unset-star-inline.h"
 #include "rhythmbox-no-star-inline.h"
-#include "rhythmbox-podcast-inline.h"
 #include "rhythmbox-tray-icon-inline.h"
 #include "media-eject-inline.h"
 
@@ -51,19 +50,18 @@ const char RB_STOCK_TRAY_ICON[] = "rhyth
 const char RB_STOCK_SET_STAR[] = "rhythmbox-set-star";
 const char RB_STOCK_UNSET_STAR[] = "rhythmbox-unset-star";
 const char RB_STOCK_NO_STAR[] = "rhythmbox-no-star";
-const char RB_STOCK_PODCAST[] = "rhythmbox-podcast";
+const char RB_STOCK_PODCAST[] = "library-podcast";
 const char RB_STOCK_BROWSER[] = "stock_music-library";
+const char RB_STOCK_PLAYLIST[] = "playlist";
+const char RB_STOCK_AUTO_PLAYLIST[] = "playlist-automatic";
 const char GNOME_MEDIA_SHUFFLE[] = "stock_shuffle";
 const char GNOME_MEDIA_REPEAT[] = "stock_repeat";
-const char GNOME_MEDIA_PLAYLIST[] = "stock_playlist";
-const char GNOME_MEDIA_AUTO_PLAYLIST[] = "stock_smart-playlist";
 const char GNOME_MEDIA_EJECT[] = "media-eject";
 
 static RBInlineIconData inline_icons[] = {
 	{ rhythmbox_set_star_inline, RB_STOCK_SET_STAR },
 	{ rhythmbox_unset_star_inline, RB_STOCK_UNSET_STAR },
 	{ rhythmbox_no_star_inline, RB_STOCK_NO_STAR },
-	{ rhythmbox_podcast_inline, RB_STOCK_PODCAST },
 	{ rhythmbox_tray_icon_inline, RB_STOCK_TRAY_ICON },
 	{ media_eject_inline, GNOME_MEDIA_EJECT }
 };
@@ -76,12 +74,12 @@ static const char* icons[] =
 	RB_STOCK_UNSET_STAR,
 	RB_STOCK_PODCAST,
 	RB_STOCK_NO_STAR,
+	RB_STOCK_PLAYLIST,
+	RB_STOCK_AUTO_PLAYLIST,
 
 	/* gnome-icon-theme icons */
 	GNOME_MEDIA_SHUFFLE,
 	GNOME_MEDIA_REPEAT,
-	GNOME_MEDIA_PLAYLIST,
-	GNOME_MEDIA_AUTO_PLAYLIST,
 	GNOME_MEDIA_EJECT,
 	RB_STOCK_BROWSER
 };
Index: shell/rb-playlist-manager.c
===================================================================
--- shell/rb-playlist-manager.c	(revision 4953)
+++ shell/rb-playlist-manager.c	(working copy)
@@ -130,10 +130,10 @@ static GtkActionEntry rb_playlist_manage
 	/* Submenu of Music */
 	{ "Playlist", NULL, N_("_Playlist") },
 
-	{ "MusicPlaylistNewPlaylist", GNOME_MEDIA_PLAYLIST, N_("_New Playlist"), "<control>N",
+	{ "MusicPlaylistNewPlaylist", RB_STOCK_PLAYLIST, N_("_New Playlist"), "<control>N",
 	  N_("Create a new playlist"),
 	  G_CALLBACK (rb_playlist_manager_cmd_new_playlist) },
-	{ "MusicPlaylistNewAutomaticPlaylist", GNOME_MEDIA_AUTO_PLAYLIST, N_("New _Automatic Playlist..."), NULL,
+	{ "MusicPlaylistNewAutomaticPlaylist", RB_STOCK_AUTO_PLAYLIST, N_("New _Automatic Playlist..."), NULL,
 	  N_("Create a new automatically updating playlist"),
 	  G_CALLBACK (rb_playlist_manager_cmd_new_automatic_playlist) },
 	{ "MusicPlaylistLoadPlaylist", NULL, N_("_Load from File..."), NULL,
Index: data/art/Makefile.am
===================================================================
--- data/art/Makefile.am	(revision 4953)
+++ data/art/Makefile.am	(working copy)
@@ -5,7 +5,6 @@ art_DATA =  \
 	   rhythmbox-set-star.png      \
 	   rhythmbox-unset-star.png    \
 	   rhythmbox-no-star.png       \
-	   rhythmbox-podcast.png       \
 	   media-eject.png             \
 	   about-logo.png
 
Index: plugins/iradio/rb-iradio-source.c
===================================================================
--- plugins/iradio/rb-iradio-source.c	(revision 4953)
+++ plugins/iradio/rb-iradio-source.c	(working copy)
@@ -218,7 +218,7 @@ rb_iradio_source_init (RBIRadioSource *s
 
 	gtk_container_add (GTK_CONTAINER (source), source->priv->vbox);
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+	gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 	pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
 					   IRADIO_SOURCE_ICON,
 					   size,
Index: plugins/daap/rb-daap-plugin.c
===================================================================
--- plugins/daap/rb-daap-plugin.c	(revision 4953)
+++ plugins/daap/rb-daap-plugin.c	(working copy)
@@ -378,7 +378,7 @@ create_pixbufs (RBDaapPlugin *plugin)
 
 	theme = gtk_icon_theme_get_default ();
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
+	gtk_icon_size_lookup (RB_SOURCE_ICON_SIZE, &size, NULL);
 	plugin->priv->daap_share_pixbuf =
 		gtk_icon_theme_load_icon (theme, "gnome-fs-network", size, 0, NULL);
 
