Index: sources/rb-auto-playlist-source.c
===================================================================
--- sources/rb-auto-playlist-source.c	(revisione 4950)
+++ sources/rb-auto-playlist-source.c	(copia locale)
@@ -142,7 +142,7 @@
 
 		gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &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-static-playlist-source.c
===================================================================
--- sources/rb-static-playlist-source.c	(revisione 4950)
+++ sources/rb-static-playlist-source.c	(copia locale)
@@ -155,7 +155,7 @@
 		gint size;
 		gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &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: lib/rb-stock-icons.h
===================================================================
--- lib/rb-stock-icons.h	(revisione 4950)
+++ lib/rb-stock-icons.h	(copia locale)
@@ -31,10 +31,10 @@
 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	(revisione 4950)
+++ lib/Makefile.am	(copia locale)
@@ -67,9 +67,6 @@
 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 @@
 	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	(revisione 4950)
+++ lib/rb-stock-icons.c	(copia locale)
@@ -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_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_PLAYLIST[] = "playlist";
+const char RB_STOCK_AUTO_PLAYLIST[] = "playlist-automatic"; 
 const char RB_STOCK_BROWSER[] = "stock_music-library";
 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 @@
 	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	(revisione 4950)
+++ shell/rb-playlist-manager.c	(copia locale)
@@ -130,10 +130,10 @@
 	/* 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	(revisione 4950)
+++ data/art/Makefile.am	(copia locale)
@@ -5,7 +5,6 @@
 	   rhythmbox-set-star.png      \
 	   rhythmbox-unset-star.png    \
 	   rhythmbox-no-star.png       \
-	   rhythmbox-podcast.png       \
 	   media-eject.png             \
 	   about-logo.png
 
