diff --git a/configure.ac b/configure.ac
index 74a682660..268beed78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -756,30 +756,21 @@ data/ui/Makefile
data/icons/Makefile
data/icons/hicolor/Makefile
data/icons/hicolor/16x16/Makefile
-data/icons/hicolor/16x16/actions/Makefile
data/icons/hicolor/16x16/apps/Makefile
-data/icons/hicolor/16x16/places/Makefile
data/icons/hicolor/16x16/status/Makefile
data/icons/hicolor/22x22/Makefile
-data/icons/hicolor/22x22/actions/Makefile
data/icons/hicolor/22x22/apps/Makefile
-data/icons/hicolor/22x22/places/Makefile
data/icons/hicolor/24x24/Makefile
data/icons/hicolor/24x24/apps/Makefile
-data/icons/hicolor/24x24/places/Makefile
data/icons/hicolor/32x32/Makefile
-data/icons/hicolor/32x32/actions/Makefile
data/icons/hicolor/32x32/apps/Makefile
-data/icons/hicolor/32x32/places/Makefile
data/icons/hicolor/48x48/Makefile
data/icons/hicolor/48x48/apps/Makefile
data/icons/hicolor/48x48/status/Makefile
data/icons/hicolor/256x256/Makefile
data/icons/hicolor/256x256/apps/Makefile
data/icons/hicolor/scalable/Makefile
-data/icons/hicolor/scalable/actions/Makefile
data/icons/hicolor/scalable/apps/Makefile
-data/icons/hicolor/scalable/places/Makefile
data/icons/src/Makefile
sources/Makefile
sources/sync/Makefile
diff --git a/data/icons/hicolor/16x16/Makefile.am b/data/icons/hicolor/16x16/Makefile.am
index d3736bbf8..1eae4a6f2 100644
--- a/data/icons/hicolor/16x16/Makefile.am
+++ b/data/icons/hicolor/16x16/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions apps places status
+SUBDIRS = apps status
diff --git a/data/icons/hicolor/16x16/actions/Makefile.am b/data/icons/hicolor/16x16/actions/Makefile.am
deleted file mode 100644
index b3b98a34d..000000000
--- a/data/icons/hicolor/16x16/actions/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- internet-radio-new.png \
- media-eject.png \
- playlist-automatic-new.png \
- playlist-new.png \
- podcast-new.png \
- audio-cd-new.png \
- audio-cd-new.svg \
- audio-cd-duplicate.png \
- audio-cd-duplicate.svg
-
-noinst_DATA = \
- internet-radio-new.xcf \
- playlist-automatic-new.xcf \
- playlist-new.xcf \
- podcast-new.xcf
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
diff --git a/data/icons/hicolor/16x16/actions/audio-cd-duplicate.png b/data/icons/hicolor/16x16/actions/audio-cd-duplicate.png
deleted file mode 100644
index 54be5fe2f..000000000
Binary files a/data/icons/hicolor/16x16/actions/audio-cd-duplicate.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/audio-cd-duplicate.svg b/data/icons/hicolor/16x16/actions/audio-cd-duplicate.svg
deleted file mode 100644
index 258998600..000000000
--- a/data/icons/hicolor/16x16/actions/audio-cd-duplicate.svg
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/16x16/actions/audio-cd-new.png b/data/icons/hicolor/16x16/actions/audio-cd-new.png
deleted file mode 100644
index ed2529cb4..000000000
Binary files a/data/icons/hicolor/16x16/actions/audio-cd-new.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/audio-cd-new.svg b/data/icons/hicolor/16x16/actions/audio-cd-new.svg
deleted file mode 100644
index eebd8f812..000000000
--- a/data/icons/hicolor/16x16/actions/audio-cd-new.svg
+++ /dev/null
@@ -1,426 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/16x16/actions/internet-radio-new.png b/data/icons/hicolor/16x16/actions/internet-radio-new.png
deleted file mode 100644
index 0b6537a76..000000000
Binary files a/data/icons/hicolor/16x16/actions/internet-radio-new.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/internet-radio-new.xcf b/data/icons/hicolor/16x16/actions/internet-radio-new.xcf
deleted file mode 100644
index cdccd75b5..000000000
Binary files a/data/icons/hicolor/16x16/actions/internet-radio-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/media-eject.png b/data/icons/hicolor/16x16/actions/media-eject.png
deleted file mode 100644
index c133715c9..000000000
Binary files a/data/icons/hicolor/16x16/actions/media-eject.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/playlist-automatic-new.png b/data/icons/hicolor/16x16/actions/playlist-automatic-new.png
deleted file mode 100644
index 1014e5c9d..000000000
Binary files a/data/icons/hicolor/16x16/actions/playlist-automatic-new.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/playlist-automatic-new.xcf b/data/icons/hicolor/16x16/actions/playlist-automatic-new.xcf
deleted file mode 100644
index 19317d515..000000000
Binary files a/data/icons/hicolor/16x16/actions/playlist-automatic-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/playlist-new.png b/data/icons/hicolor/16x16/actions/playlist-new.png
deleted file mode 100644
index f653693bc..000000000
Binary files a/data/icons/hicolor/16x16/actions/playlist-new.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/playlist-new.xcf b/data/icons/hicolor/16x16/actions/playlist-new.xcf
deleted file mode 100644
index 7c21ce3a2..000000000
Binary files a/data/icons/hicolor/16x16/actions/playlist-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/podcast-new.png b/data/icons/hicolor/16x16/actions/podcast-new.png
deleted file mode 100644
index 645b24eb4..000000000
Binary files a/data/icons/hicolor/16x16/actions/podcast-new.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/actions/podcast-new.xcf b/data/icons/hicolor/16x16/actions/podcast-new.xcf
deleted file mode 100644
index d5117da28..000000000
Binary files a/data/icons/hicolor/16x16/actions/podcast-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/16x16/places/Makefile.am b/data/icons/hicolor/16x16/places/Makefile.am
deleted file mode 100644
index 2816ec43c..000000000
--- a/data/icons/hicolor/16x16/places/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = places
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- library-internet-radio.png \
- library-podcast.png \
- music-library.png \
- playlist.png \
- playlist-automatic.png
-
-noinst_DATA = \
- library-internet-radio.xcf \
- library-podcast.svg \
- playlist.svg \
- playlist-automatic.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
diff --git a/data/icons/hicolor/16x16/places/library-internet-radio.png b/data/icons/hicolor/16x16/places/library-internet-radio.png
deleted file mode 100644
index 7e02fbd54..000000000
Binary files a/data/icons/hicolor/16x16/places/library-internet-radio.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/places/library-internet-radio.xcf b/data/icons/hicolor/16x16/places/library-internet-radio.xcf
deleted file mode 100644
index ca8b650b4..000000000
Binary files a/data/icons/hicolor/16x16/places/library-internet-radio.xcf and /dev/null differ
diff --git a/data/icons/hicolor/16x16/places/library-podcast.png b/data/icons/hicolor/16x16/places/library-podcast.png
deleted file mode 100644
index 720bfc678..000000000
Binary files a/data/icons/hicolor/16x16/places/library-podcast.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/places/library-podcast.svg b/data/icons/hicolor/16x16/places/library-podcast.svg
deleted file mode 100644
index b81d509a7..000000000
--- a/data/icons/hicolor/16x16/places/library-podcast.svg
+++ /dev/null
@@ -1,237 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/16x16/places/music-library.png b/data/icons/hicolor/16x16/places/music-library.png
deleted file mode 100644
index bb4c4bba3..000000000
Binary files a/data/icons/hicolor/16x16/places/music-library.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/places/playlist-automatic.png b/data/icons/hicolor/16x16/places/playlist-automatic.png
deleted file mode 100644
index 8c9142da3..000000000
Binary files a/data/icons/hicolor/16x16/places/playlist-automatic.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/places/playlist-automatic.svg b/data/icons/hicolor/16x16/places/playlist-automatic.svg
deleted file mode 100644
index e8d741477..000000000
--- a/data/icons/hicolor/16x16/places/playlist-automatic.svg
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/16x16/places/playlist.png b/data/icons/hicolor/16x16/places/playlist.png
deleted file mode 100644
index 968208d69..000000000
Binary files a/data/icons/hicolor/16x16/places/playlist.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/places/playlist.svg b/data/icons/hicolor/16x16/places/playlist.svg
deleted file mode 100644
index 1a8706344..000000000
--- a/data/icons/hicolor/16x16/places/playlist.svg
+++ /dev/null
@@ -1,346 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/22x22/Makefile.am b/data/icons/hicolor/22x22/Makefile.am
index 0f1aa6d47..ebbd1452f 100644
--- a/data/icons/hicolor/22x22/Makefile.am
+++ b/data/icons/hicolor/22x22/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions apps places
+SUBDIRS = apps
diff --git a/data/icons/hicolor/22x22/actions/Makefile.am b/data/icons/hicolor/22x22/actions/Makefile.am
deleted file mode 100644
index 00b122908..000000000
--- a/data/icons/hicolor/22x22/actions/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- internet-radio-new.png \
- playlist-automatic-new.png \
- playlist-new.png \
- podcast-new.png \
- audio-cd-new.png \
- audio-cd-new.svg \
- audio-cd-duplicate.png \
- audio-cd-duplicate.svg
-
-noinst_DATA = \
- internet-radio-new.xcf \
- playlist-automatic-new.xcf \
- playlist-new.xcf \
- podcast-new.xcf
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
diff --git a/data/icons/hicolor/22x22/actions/audio-cd-duplicate.png b/data/icons/hicolor/22x22/actions/audio-cd-duplicate.png
deleted file mode 100644
index ef3bd8e2b..000000000
Binary files a/data/icons/hicolor/22x22/actions/audio-cd-duplicate.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/audio-cd-duplicate.svg b/data/icons/hicolor/22x22/actions/audio-cd-duplicate.svg
deleted file mode 100644
index 864dfdb34..000000000
--- a/data/icons/hicolor/22x22/actions/audio-cd-duplicate.svg
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/22x22/actions/audio-cd-new.png b/data/icons/hicolor/22x22/actions/audio-cd-new.png
deleted file mode 100644
index 0122df22c..000000000
Binary files a/data/icons/hicolor/22x22/actions/audio-cd-new.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/audio-cd-new.svg b/data/icons/hicolor/22x22/actions/audio-cd-new.svg
deleted file mode 100644
index 610465af3..000000000
--- a/data/icons/hicolor/22x22/actions/audio-cd-new.svg
+++ /dev/null
@@ -1,456 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/22x22/actions/internet-radio-new.png b/data/icons/hicolor/22x22/actions/internet-radio-new.png
deleted file mode 100644
index b8be68a04..000000000
Binary files a/data/icons/hicolor/22x22/actions/internet-radio-new.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/internet-radio-new.xcf b/data/icons/hicolor/22x22/actions/internet-radio-new.xcf
deleted file mode 100644
index a681fbca3..000000000
Binary files a/data/icons/hicolor/22x22/actions/internet-radio-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/playlist-automatic-new.png b/data/icons/hicolor/22x22/actions/playlist-automatic-new.png
deleted file mode 100644
index f2695fd70..000000000
Binary files a/data/icons/hicolor/22x22/actions/playlist-automatic-new.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/playlist-automatic-new.xcf b/data/icons/hicolor/22x22/actions/playlist-automatic-new.xcf
deleted file mode 100644
index 2f6dca5a6..000000000
Binary files a/data/icons/hicolor/22x22/actions/playlist-automatic-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/playlist-new.png b/data/icons/hicolor/22x22/actions/playlist-new.png
deleted file mode 100644
index 66f3ec7c0..000000000
Binary files a/data/icons/hicolor/22x22/actions/playlist-new.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/playlist-new.xcf b/data/icons/hicolor/22x22/actions/playlist-new.xcf
deleted file mode 100644
index af47698c4..000000000
Binary files a/data/icons/hicolor/22x22/actions/playlist-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/podcast-new.png b/data/icons/hicolor/22x22/actions/podcast-new.png
deleted file mode 100644
index a42a35504..000000000
Binary files a/data/icons/hicolor/22x22/actions/podcast-new.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/actions/podcast-new.xcf b/data/icons/hicolor/22x22/actions/podcast-new.xcf
deleted file mode 100644
index 313eb04ae..000000000
Binary files a/data/icons/hicolor/22x22/actions/podcast-new.xcf and /dev/null differ
diff --git a/data/icons/hicolor/22x22/places/Makefile.am b/data/icons/hicolor/22x22/places/Makefile.am
deleted file mode 100644
index 1b3ca732f..000000000
--- a/data/icons/hicolor/22x22/places/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = places
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- library-internet-radio.png \
- library-podcast.png \
- playlist.png \
- playlist-automatic.png
-
-noinst_DATA = \
- library-internet-radio.svg \
- library-podcast.svg \
- playlist.svg \
- playlist-automatic.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
\ No newline at end of file
diff --git a/data/icons/hicolor/22x22/places/library-internet-radio.png b/data/icons/hicolor/22x22/places/library-internet-radio.png
deleted file mode 100644
index a937019cb..000000000
Binary files a/data/icons/hicolor/22x22/places/library-internet-radio.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/places/library-internet-radio.svg b/data/icons/hicolor/22x22/places/library-internet-radio.svg
deleted file mode 100644
index 9eb256852..000000000
--- a/data/icons/hicolor/22x22/places/library-internet-radio.svg
+++ /dev/null
@@ -1,595 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/22x22/places/library-podcast.png b/data/icons/hicolor/22x22/places/library-podcast.png
deleted file mode 100644
index 4345fec40..000000000
Binary files a/data/icons/hicolor/22x22/places/library-podcast.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/places/library-podcast.svg b/data/icons/hicolor/22x22/places/library-podcast.svg
deleted file mode 100644
index e9f212c18..000000000
--- a/data/icons/hicolor/22x22/places/library-podcast.svg
+++ /dev/null
@@ -1,324 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/22x22/places/playlist-automatic.png b/data/icons/hicolor/22x22/places/playlist-automatic.png
deleted file mode 100644
index f4849b64b..000000000
Binary files a/data/icons/hicolor/22x22/places/playlist-automatic.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/places/playlist-automatic.svg b/data/icons/hicolor/22x22/places/playlist-automatic.svg
deleted file mode 100644
index fb48ee08c..000000000
--- a/data/icons/hicolor/22x22/places/playlist-automatic.svg
+++ /dev/null
@@ -1,317 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/22x22/places/playlist.png b/data/icons/hicolor/22x22/places/playlist.png
deleted file mode 100644
index df7379938..000000000
Binary files a/data/icons/hicolor/22x22/places/playlist.png and /dev/null differ
diff --git a/data/icons/hicolor/22x22/places/playlist.svg b/data/icons/hicolor/22x22/places/playlist.svg
deleted file mode 100644
index 85caedfe9..000000000
--- a/data/icons/hicolor/22x22/places/playlist.svg
+++ /dev/null
@@ -1,299 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/24x24/Makefile.am b/data/icons/hicolor/24x24/Makefile.am
index 94c70fc6f..ebbd1452f 100644
--- a/data/icons/hicolor/24x24/Makefile.am
+++ b/data/icons/hicolor/24x24/Makefile.am
@@ -1 +1 @@
-SUBDIRS = apps places
+SUBDIRS = apps
diff --git a/data/icons/hicolor/24x24/places/Makefile.am b/data/icons/hicolor/24x24/places/Makefile.am
deleted file mode 100644
index a3df3d3e7..000000000
--- a/data/icons/hicolor/24x24/places/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = places
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- music-library.png
-
-EXTRA_DIST = \
- $(icons_DATA)
diff --git a/data/icons/hicolor/24x24/places/music-library.png b/data/icons/hicolor/24x24/places/music-library.png
deleted file mode 100644
index ed40de396..000000000
Binary files a/data/icons/hicolor/24x24/places/music-library.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/Makefile.am b/data/icons/hicolor/32x32/Makefile.am
index 0f1aa6d47..ebbd1452f 100644
--- a/data/icons/hicolor/32x32/Makefile.am
+++ b/data/icons/hicolor/32x32/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions apps places
+SUBDIRS = apps
diff --git a/data/icons/hicolor/32x32/actions/Makefile.am b/data/icons/hicolor/32x32/actions/Makefile.am
deleted file mode 100644
index aa5ef62ea..000000000
--- a/data/icons/hicolor/32x32/actions/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- internet-radio-new.png \
- playlist-automatic-new.png \
- playlist-new.png \
- audio-cd-new.png \
- audio-cd-new.svg \
- audio-cd-duplicate.png \
- audio-cd-duplicate.svg
-
-noinst_DATA = \
- internet-radio-new.svg \
- playlist-automatic-new.svg \
- playlist-new.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
diff --git a/data/icons/hicolor/32x32/actions/audio-cd-duplicate.png b/data/icons/hicolor/32x32/actions/audio-cd-duplicate.png
deleted file mode 100644
index 85c1a3bb6..000000000
Binary files a/data/icons/hicolor/32x32/actions/audio-cd-duplicate.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/actions/audio-cd-duplicate.svg b/data/icons/hicolor/32x32/actions/audio-cd-duplicate.svg
deleted file mode 100644
index 1c04de633..000000000
--- a/data/icons/hicolor/32x32/actions/audio-cd-duplicate.svg
+++ /dev/null
@@ -1,293 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/32x32/actions/audio-cd-new.png b/data/icons/hicolor/32x32/actions/audio-cd-new.png
deleted file mode 100644
index d1be014cf..000000000
Binary files a/data/icons/hicolor/32x32/actions/audio-cd-new.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/actions/audio-cd-new.svg b/data/icons/hicolor/32x32/actions/audio-cd-new.svg
deleted file mode 100644
index a14884661..000000000
--- a/data/icons/hicolor/32x32/actions/audio-cd-new.svg
+++ /dev/null
@@ -1,373 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/32x32/actions/internet-radio-new.png b/data/icons/hicolor/32x32/actions/internet-radio-new.png
deleted file mode 100644
index c5a2993f1..000000000
Binary files a/data/icons/hicolor/32x32/actions/internet-radio-new.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/actions/internet-radio-new.svg b/data/icons/hicolor/32x32/actions/internet-radio-new.svg
deleted file mode 100644
index 802ae76bd..000000000
--- a/data/icons/hicolor/32x32/actions/internet-radio-new.svg
+++ /dev/null
@@ -1,1308 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/32x32/actions/playlist-automatic-new.png b/data/icons/hicolor/32x32/actions/playlist-automatic-new.png
deleted file mode 100644
index 3f5e2d17f..000000000
Binary files a/data/icons/hicolor/32x32/actions/playlist-automatic-new.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/actions/playlist-automatic-new.svg b/data/icons/hicolor/32x32/actions/playlist-automatic-new.svg
deleted file mode 100644
index 5a2d25281..000000000
--- a/data/icons/hicolor/32x32/actions/playlist-automatic-new.svg
+++ /dev/null
@@ -1,1526 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/32x32/actions/playlist-new.png b/data/icons/hicolor/32x32/actions/playlist-new.png
deleted file mode 100644
index 65ef34c19..000000000
Binary files a/data/icons/hicolor/32x32/actions/playlist-new.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/actions/playlist-new.svg b/data/icons/hicolor/32x32/actions/playlist-new.svg
deleted file mode 100644
index 04204d237..000000000
--- a/data/icons/hicolor/32x32/actions/playlist-new.svg
+++ /dev/null
@@ -1,1515 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/32x32/places/Makefile.am b/data/icons/hicolor/32x32/places/Makefile.am
deleted file mode 100644
index d638f5073..000000000
--- a/data/icons/hicolor/32x32/places/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = places
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- library-internet-radio.png \
- playlist.png \
- playlist-automatic.png
-
-noinst_DATA = \
- library-internet-radio.svg \
- playlist.svg \
- playlist-automatic.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
diff --git a/data/icons/hicolor/32x32/places/library-internet-radio.png b/data/icons/hicolor/32x32/places/library-internet-radio.png
deleted file mode 100644
index cead52b51..000000000
Binary files a/data/icons/hicolor/32x32/places/library-internet-radio.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/places/library-internet-radio.svg b/data/icons/hicolor/32x32/places/library-internet-radio.svg
deleted file mode 100644
index aa7db3bca..000000000
--- a/data/icons/hicolor/32x32/places/library-internet-radio.svg
+++ /dev/null
@@ -1,1274 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/32x32/places/playlist-automatic.png b/data/icons/hicolor/32x32/places/playlist-automatic.png
deleted file mode 100644
index 3624ddb93..000000000
Binary files a/data/icons/hicolor/32x32/places/playlist-automatic.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/places/playlist-automatic.svg b/data/icons/hicolor/32x32/places/playlist-automatic.svg
deleted file mode 100644
index d80f245de..000000000
--- a/data/icons/hicolor/32x32/places/playlist-automatic.svg
+++ /dev/null
@@ -1,318 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/32x32/places/playlist.png b/data/icons/hicolor/32x32/places/playlist.png
deleted file mode 100644
index 989156742..000000000
Binary files a/data/icons/hicolor/32x32/places/playlist.png and /dev/null differ
diff --git a/data/icons/hicolor/32x32/places/playlist.svg b/data/icons/hicolor/32x32/places/playlist.svg
deleted file mode 100644
index 07f0f2723..000000000
--- a/data/icons/hicolor/32x32/places/playlist.svg
+++ /dev/null
@@ -1,307 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
index 0f1aa6d47..ebbd1452f 100644
--- a/data/icons/hicolor/scalable/Makefile.am
+++ b/data/icons/hicolor/scalable/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions apps places
+SUBDIRS = apps
diff --git a/data/icons/hicolor/scalable/actions/Makefile.am b/data/icons/hicolor/scalable/actions/Makefile.am
deleted file mode 100644
index 21820dca0..000000000
--- a/data/icons/hicolor/scalable/actions/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- internet-radio-new.svg \
- playlist-automatic-new.svg \
- playlist-new.svg \
- audio-cd-new.svg \
- audio-cd-duplicate.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
diff --git a/data/icons/hicolor/scalable/actions/audio-cd-duplicate.svg b/data/icons/hicolor/scalable/actions/audio-cd-duplicate.svg
deleted file mode 100644
index 51294f59a..000000000
--- a/data/icons/hicolor/scalable/actions/audio-cd-duplicate.svg
+++ /dev/null
@@ -1,291 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/actions/audio-cd-new.svg b/data/icons/hicolor/scalable/actions/audio-cd-new.svg
deleted file mode 100644
index 3707be039..000000000
--- a/data/icons/hicolor/scalable/actions/audio-cd-new.svg
+++ /dev/null
@@ -1,411 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/actions/internet-radio-new.svg b/data/icons/hicolor/scalable/actions/internet-radio-new.svg
deleted file mode 100644
index 50b445d5e..000000000
--- a/data/icons/hicolor/scalable/actions/internet-radio-new.svg
+++ /dev/null
@@ -1,1201 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/actions/playlist-automatic-new.svg b/data/icons/hicolor/scalable/actions/playlist-automatic-new.svg
deleted file mode 100644
index 945150f45..000000000
--- a/data/icons/hicolor/scalable/actions/playlist-automatic-new.svg
+++ /dev/null
@@ -1,1434 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/actions/playlist-new.svg b/data/icons/hicolor/scalable/actions/playlist-new.svg
deleted file mode 100644
index 2a917804c..000000000
--- a/data/icons/hicolor/scalable/actions/playlist-new.svg
+++ /dev/null
@@ -1,984 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/places/Makefile.am b/data/icons/hicolor/scalable/places/Makefile.am
deleted file mode 100644
index 86b1a74b4..000000000
--- a/data/icons/hicolor/scalable/places/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = places
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- library-internet-radio.svg \
- playlist.svg \
- playlist-automatic.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
diff --git a/data/icons/hicolor/scalable/places/library-internet-radio.svg b/data/icons/hicolor/scalable/places/library-internet-radio.svg
deleted file mode 100644
index 10b199429..000000000
--- a/data/icons/hicolor/scalable/places/library-internet-radio.svg
+++ /dev/null
@@ -1,1167 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/places/playlist-automatic.svg b/data/icons/hicolor/scalable/places/playlist-automatic.svg
deleted file mode 100644
index 91fff141c..000000000
--- a/data/icons/hicolor/scalable/places/playlist-automatic.svg
+++ /dev/null
@@ -1,318 +0,0 @@
-
-
-
diff --git a/data/icons/hicolor/scalable/places/playlist.svg b/data/icons/hicolor/scalable/places/playlist.svg
deleted file mode 100644
index 36f3eddfe..000000000
--- a/data/icons/hicolor/scalable/places/playlist.svg
+++ /dev/null
@@ -1,327 +0,0 @@
-
-
-
diff --git a/data/icons/src/Makefile.am b/data/icons/src/Makefile.am
index 55fa9c766..24c0606d0 100644
--- a/data/icons/src/Makefile.am
+++ b/data/icons/src/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = music-library.svg rhythmbox.svg
+EXTRA_DIST = rhythmbox.svg
diff --git a/data/icons/src/music-library.svg b/data/icons/src/music-library.svg
deleted file mode 100644
index 7ab047091..000000000
--- a/data/icons/src/music-library.svg
+++ /dev/null
@@ -1,3738 +0,0 @@
-
-
-
-
diff --git a/lib/rb-stock-icons.c b/lib/rb-stock-icons.c
index 9c257eada..abccde8ec 100644
--- a/lib/rb-stock-icons.c
+++ b/lib/rb-stock-icons.c
@@ -48,21 +48,10 @@ typedef struct {
} RBInlineIconData;
const char RB_APP_ICON[] = "rhythmbox";
-const char RB_STOCK_TRAY_ICON[] = "rhythmbox";
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[] = "library-podcast";
-const char RB_STOCK_PODCAST_NEW[] = "podcast-new";
-const char RB_STOCK_BROWSER[] = "music-library";
-const char RB_STOCK_PLAYLIST[] = "playlist";
-const char RB_STOCK_PLAYLIST_NEW[] = "playlist-new";
-const char RB_STOCK_AUTO_PLAYLIST[] = "playlist-automatic";
-const char RB_STOCK_AUTO_PLAYLIST_NEW[] = "playlist-automatic-new";
const char RB_STOCK_MISSING_ARTWORK[] = "rhythmbox-missing-artwork";
-const char GNOME_MEDIA_SHUFFLE[] = "media-playlist-shuffle";
-const char GNOME_MEDIA_REPEAT[] = "media-playlist-repeat";
-const char GNOME_MEDIA_EJECT[] = "media-eject";
static RBInlineIconData inline_icons[] = {
{ rhythmbox_set_star_inline, RB_STOCK_SET_STAR },
@@ -123,4 +112,3 @@ rb_stock_icons_shutdown (void)
{
/* do nothing */
}
-
diff --git a/lib/rb-stock-icons.h b/lib/rb-stock-icons.h
index fee81fa41..d2c7666e9 100644
--- a/lib/rb-stock-icons.h
+++ b/lib/rb-stock-icons.h
@@ -32,21 +32,10 @@
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[];
extern const char RB_STOCK_NO_STAR[];
-extern const char RB_STOCK_PODCAST[];
-extern const char RB_STOCK_PODCAST_NEW[];
-extern const char RB_STOCK_BROWSER[];
-extern const char RB_STOCK_PLAYLIST[];
-extern const char RB_STOCK_PLAYLIST_NEW[];
-extern const char RB_STOCK_AUTO_PLAYLIST[];
-extern const char RB_STOCK_AUTO_PLAYLIST_NEW[];
extern const char RB_STOCK_MISSING_ARTWORK[];
-extern const char GNOME_MEDIA_SHUFFLE[];
-extern const char GNOME_MEDIA_REPEAT[];
-extern const char GNOME_MEDIA_EJECT[];
void rb_stock_icons_init (void);