diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ae04b1..5fb4b53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,61 +3,15 @@ project(
 	mdeartworks
 )
 
-file(
-	GLOB
-	ICONS_SCALABLE
-	icons/scalable/*.svg
-)
-file(
-	GLOB
-	ICONS_128
-	icons/128x128/*.png
-)
-file(
-	GLOB
-	ICONS_64
-	icons/64x64/*.png
-)
-file(
-	GLOB
-	ICONS_32
-	icons/32x32/*.png
-)
-file(
-	GLOB
-	ICONS_16
-	icons/16x16/*.png
-)
-
-file(
-	GLOB
-	WALLPAPERS
-	wallpapers/*.png
-	wallpapers/*.jpg
-)
-
 include(GNUInstallDirs)
 install(
-	FILES ${ICONS_SCALABLE}
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/mde/scalable
+	DIRECTORY icons/
+	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/mde
 )
 install(
-	FILES ${ICONS_128}
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/mde/128x128
-)
-install(
-	FILES ${ICONS_64}
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/mde/64x64
-)
-install(
-	FILES ${ICONS_32}
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/mde/32x32
-)
-install(
-	FILES ${ICONS_16}
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/mde/16x16
-)
-install(
-	FILES ${WALLPAPERS}
+	DIRECTORY wallpapers/
 	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/wallpapers/mde
+	FILES_MATCHING
+		PATTERN "*.png"
+		PATTERN "*.jpg"
 )
diff --git a/generate_png.sh b/generate_png.sh
index aa82568..f41071f 100755
--- a/generate_png.sh
+++ b/generate_png.sh
@@ -2,8 +2,11 @@
 cd icons/scalable
 for i in 128 64 32 16; do
 	echo "-- ${i}x${i}"
-	for j in *.svg; do
-		echo "$j"
-		rsvg-convert --height=$i -o ../${i}x${i}/`echo $j | cut -d. -f1`.png $j
+	for j in actions apps categories devices emblems emotes mimetypes places status; do
+		mkdir -p ../${i}x${i}/${j}
+	done
+	find . -name "*.svg" | while read a; do
+		echo "$a"
+		rsvg-convert --height=$i -o ../${i}x${i}/`echo $a | cut -d. -f2`.png $a
 	done
 done
diff --git a/icons/128x128/clock.png b/icons/128x128/actions/clock.png
similarity index 100%
rename from icons/128x128/clock.png
rename to icons/128x128/actions/clock.png
diff --git a/icons/128x128/next.png b/icons/128x128/actions/next.png
similarity index 100%
rename from icons/128x128/next.png
rename to icons/128x128/actions/next.png
diff --git a/icons/128x128/previous.png b/icons/128x128/actions/previous.png
similarity index 100%
rename from icons/128x128/previous.png
rename to icons/128x128/actions/previous.png
diff --git a/icons/128x128/artist.png b/icons/128x128/actions/view-media-artist.png
similarity index 100%
rename from icons/128x128/artist.png
rename to icons/128x128/actions/view-media-artist.png
diff --git a/icons/128x128/genre.png b/icons/128x128/actions/view-media-genre.png
similarity index 100%
rename from icons/128x128/genre.png
rename to icons/128x128/actions/view-media-genre.png
diff --git a/icons/128x128/zoomin.png b/icons/128x128/actions/zoom-in.png
similarity index 100%
rename from icons/128x128/zoomin.png
rename to icons/128x128/actions/zoom-in.png
diff --git a/icons/128x128/zoomout.png b/icons/128x128/actions/zoom-out.png
similarity index 100%
rename from icons/128x128/zoomout.png
rename to icons/128x128/actions/zoom-out.png
diff --git a/icons/128x128/optical.png b/icons/128x128/devices/media-optical.png
similarity index 100%
rename from icons/128x128/optical.png
rename to icons/128x128/devices/media-optical.png
diff --git a/icons/128x128/projector.png b/icons/128x128/devices/projector.png
similarity index 100%
rename from icons/128x128/projector.png
rename to icons/128x128/devices/projector.png
diff --git a/icons/128x128/radio.png b/icons/128x128/devices/radio.png
similarity index 100%
rename from icons/128x128/radio.png
rename to icons/128x128/devices/radio.png
diff --git a/icons/128x128/logo.png b/icons/128x128/logo.png
deleted file mode 100644
index 59e46bd..0000000
Binary files a/icons/128x128/logo.png and /dev/null differ
diff --git a/icons/128x128/file.png b/icons/128x128/mimetypes/text-x-generic.png
similarity index 100%
rename from icons/128x128/file.png
rename to icons/128x128/mimetypes/text-x-generic.png
diff --git a/icons/128x128/folder-music.png b/icons/128x128/places/folder-music.png
similarity index 100%
rename from icons/128x128/folder-music.png
rename to icons/128x128/places/folder-music.png
diff --git a/icons/128x128/folder.png b/icons/128x128/places/folder.png
similarity index 100%
rename from icons/128x128/folder.png
rename to icons/128x128/places/folder.png
diff --git a/icons/128x128/mail.png b/icons/128x128/places/mailbox.png
similarity index 100%
rename from icons/128x128/mail.png
rename to icons/128x128/places/mailbox.png
diff --git a/icons/128x128/mailempty.png b/icons/128x128/status/mail-read.png
similarity index 100%
rename from icons/128x128/mailempty.png
rename to icons/128x128/status/mail-read.png
diff --git a/icons/128x128/mailfull.png b/icons/128x128/status/mail-unread.png
similarity index 100%
rename from icons/128x128/mailfull.png
rename to icons/128x128/status/mail-unread.png
diff --git a/icons/16x16/clock.png b/icons/16x16/actions/clock.png
similarity index 100%
rename from icons/16x16/clock.png
rename to icons/16x16/actions/clock.png
diff --git a/icons/16x16/next.png b/icons/16x16/actions/next.png
similarity index 100%
rename from icons/16x16/next.png
rename to icons/16x16/actions/next.png
diff --git a/icons/16x16/previous.png b/icons/16x16/actions/previous.png
similarity index 100%
rename from icons/16x16/previous.png
rename to icons/16x16/actions/previous.png
diff --git a/icons/16x16/artist.png b/icons/16x16/actions/view-media-artist.png
similarity index 100%
rename from icons/16x16/artist.png
rename to icons/16x16/actions/view-media-artist.png
diff --git a/icons/16x16/genre.png b/icons/16x16/actions/view-media-genre.png
similarity index 100%
rename from icons/16x16/genre.png
rename to icons/16x16/actions/view-media-genre.png
diff --git a/icons/16x16/zoomin.png b/icons/16x16/actions/zoom-in.png
similarity index 100%
rename from icons/16x16/zoomin.png
rename to icons/16x16/actions/zoom-in.png
diff --git a/icons/16x16/zoomout.png b/icons/16x16/actions/zoom-out.png
similarity index 100%
rename from icons/16x16/zoomout.png
rename to icons/16x16/actions/zoom-out.png
diff --git a/icons/16x16/optical.png b/icons/16x16/devices/media-optical.png
similarity index 100%
rename from icons/16x16/optical.png
rename to icons/16x16/devices/media-optical.png
diff --git a/icons/16x16/projector.png b/icons/16x16/devices/projector.png
similarity index 100%
rename from icons/16x16/projector.png
rename to icons/16x16/devices/projector.png
diff --git a/icons/16x16/radio.png b/icons/16x16/devices/radio.png
similarity index 100%
rename from icons/16x16/radio.png
rename to icons/16x16/devices/radio.png
diff --git a/icons/16x16/logo.png b/icons/16x16/logo.png
deleted file mode 100644
index 68c56ad..0000000
Binary files a/icons/16x16/logo.png and /dev/null differ
diff --git a/icons/16x16/file.png b/icons/16x16/mimetypes/text-x-generic.png
similarity index 100%
rename from icons/16x16/file.png
rename to icons/16x16/mimetypes/text-x-generic.png
diff --git a/icons/16x16/folder-music.png b/icons/16x16/places/folder-music.png
similarity index 100%
rename from icons/16x16/folder-music.png
rename to icons/16x16/places/folder-music.png
diff --git a/icons/16x16/folder.png b/icons/16x16/places/folder.png
similarity index 100%
rename from icons/16x16/folder.png
rename to icons/16x16/places/folder.png
diff --git a/icons/16x16/mail.png b/icons/16x16/places/mailbox.png
similarity index 100%
rename from icons/16x16/mail.png
rename to icons/16x16/places/mailbox.png
diff --git a/icons/16x16/mailempty.png b/icons/16x16/status/mail-read.png
similarity index 100%
rename from icons/16x16/mailempty.png
rename to icons/16x16/status/mail-read.png
diff --git a/icons/16x16/mailfull.png b/icons/16x16/status/mail-unread.png
similarity index 100%
rename from icons/16x16/mailfull.png
rename to icons/16x16/status/mail-unread.png
diff --git a/icons/32x32/clock.png b/icons/32x32/actions/clock.png
similarity index 100%
rename from icons/32x32/clock.png
rename to icons/32x32/actions/clock.png
diff --git a/icons/32x32/next.png b/icons/32x32/actions/next.png
similarity index 100%
rename from icons/32x32/next.png
rename to icons/32x32/actions/next.png
diff --git a/icons/32x32/previous.png b/icons/32x32/actions/previous.png
similarity index 100%
rename from icons/32x32/previous.png
rename to icons/32x32/actions/previous.png
diff --git a/icons/32x32/artist.png b/icons/32x32/actions/view-media-artist.png
similarity index 100%
rename from icons/32x32/artist.png
rename to icons/32x32/actions/view-media-artist.png
diff --git a/icons/32x32/genre.png b/icons/32x32/actions/view-media-genre.png
similarity index 100%
rename from icons/32x32/genre.png
rename to icons/32x32/actions/view-media-genre.png
diff --git a/icons/32x32/zoomin.png b/icons/32x32/actions/zoom-in.png
similarity index 100%
rename from icons/32x32/zoomin.png
rename to icons/32x32/actions/zoom-in.png
diff --git a/icons/32x32/zoomout.png b/icons/32x32/actions/zoom-out.png
similarity index 100%
rename from icons/32x32/zoomout.png
rename to icons/32x32/actions/zoom-out.png
diff --git a/icons/32x32/optical.png b/icons/32x32/devices/media-optical.png
similarity index 100%
rename from icons/32x32/optical.png
rename to icons/32x32/devices/media-optical.png
diff --git a/icons/32x32/projector.png b/icons/32x32/devices/projector.png
similarity index 100%
rename from icons/32x32/projector.png
rename to icons/32x32/devices/projector.png
diff --git a/icons/32x32/radio.png b/icons/32x32/devices/radio.png
similarity index 100%
rename from icons/32x32/radio.png
rename to icons/32x32/devices/radio.png
diff --git a/icons/32x32/logo.png b/icons/32x32/logo.png
deleted file mode 100644
index 40353db..0000000
Binary files a/icons/32x32/logo.png and /dev/null differ
diff --git a/icons/32x32/file.png b/icons/32x32/mimetypes/text-x-generic.png
similarity index 100%
rename from icons/32x32/file.png
rename to icons/32x32/mimetypes/text-x-generic.png
diff --git a/icons/32x32/folder-music.png b/icons/32x32/places/folder-music.png
similarity index 100%
rename from icons/32x32/folder-music.png
rename to icons/32x32/places/folder-music.png
diff --git a/icons/32x32/folder.png b/icons/32x32/places/folder.png
similarity index 100%
rename from icons/32x32/folder.png
rename to icons/32x32/places/folder.png
diff --git a/icons/32x32/mail.png b/icons/32x32/places/mailbox.png
similarity index 100%
rename from icons/32x32/mail.png
rename to icons/32x32/places/mailbox.png
diff --git a/icons/32x32/mailempty.png b/icons/32x32/status/mail-read.png
similarity index 100%
rename from icons/32x32/mailempty.png
rename to icons/32x32/status/mail-read.png
diff --git a/icons/32x32/mailfull.png b/icons/32x32/status/mail-unread.png
similarity index 100%
rename from icons/32x32/mailfull.png
rename to icons/32x32/status/mail-unread.png
diff --git a/icons/64x64/clock.png b/icons/64x64/actions/clock.png
similarity index 100%
rename from icons/64x64/clock.png
rename to icons/64x64/actions/clock.png
diff --git a/icons/64x64/next.png b/icons/64x64/actions/next.png
similarity index 100%
rename from icons/64x64/next.png
rename to icons/64x64/actions/next.png
diff --git a/icons/64x64/previous.png b/icons/64x64/actions/previous.png
similarity index 100%
rename from icons/64x64/previous.png
rename to icons/64x64/actions/previous.png
diff --git a/icons/64x64/artist.png b/icons/64x64/actions/view-media-artist.png
similarity index 100%
rename from icons/64x64/artist.png
rename to icons/64x64/actions/view-media-artist.png
diff --git a/icons/64x64/genre.png b/icons/64x64/actions/view-media-genre.png
similarity index 100%
rename from icons/64x64/genre.png
rename to icons/64x64/actions/view-media-genre.png
diff --git a/icons/64x64/zoomin.png b/icons/64x64/actions/zoom-in.png
similarity index 100%
rename from icons/64x64/zoomin.png
rename to icons/64x64/actions/zoom-in.png
diff --git a/icons/64x64/zoomout.png b/icons/64x64/actions/zoom-out.png
similarity index 100%
rename from icons/64x64/zoomout.png
rename to icons/64x64/actions/zoom-out.png
diff --git a/icons/64x64/optical.png b/icons/64x64/devices/media-optical.png
similarity index 100%
rename from icons/64x64/optical.png
rename to icons/64x64/devices/media-optical.png
diff --git a/icons/64x64/projector.png b/icons/64x64/devices/projector.png
similarity index 100%
rename from icons/64x64/projector.png
rename to icons/64x64/devices/projector.png
diff --git a/icons/64x64/radio.png b/icons/64x64/devices/radio.png
similarity index 100%
rename from icons/64x64/radio.png
rename to icons/64x64/devices/radio.png
diff --git a/icons/64x64/logo.png b/icons/64x64/logo.png
deleted file mode 100644
index faaef84..0000000
Binary files a/icons/64x64/logo.png and /dev/null differ
diff --git a/icons/64x64/file.png b/icons/64x64/mimetypes/text-x-generic.png
similarity index 100%
rename from icons/64x64/file.png
rename to icons/64x64/mimetypes/text-x-generic.png
diff --git a/icons/64x64/folder-music.png b/icons/64x64/places/folder-music.png
similarity index 100%
rename from icons/64x64/folder-music.png
rename to icons/64x64/places/folder-music.png
diff --git a/icons/64x64/folder.png b/icons/64x64/places/folder.png
similarity index 100%
rename from icons/64x64/folder.png
rename to icons/64x64/places/folder.png
diff --git a/icons/64x64/mail.png b/icons/64x64/places/mailbox.png
similarity index 100%
rename from icons/64x64/mail.png
rename to icons/64x64/places/mailbox.png
diff --git a/icons/64x64/mailempty.png b/icons/64x64/status/mail-read.png
similarity index 100%
rename from icons/64x64/mailempty.png
rename to icons/64x64/status/mail-read.png
diff --git a/icons/64x64/mailfull.png b/icons/64x64/status/mail-unread.png
similarity index 100%
rename from icons/64x64/mailfull.png
rename to icons/64x64/status/mail-unread.png
diff --git a/icons/scalable/clock.svg b/icons/scalable/actions/clock.svg
similarity index 100%
rename from icons/scalable/clock.svg
rename to icons/scalable/actions/clock.svg
diff --git a/icons/scalable/next.svg b/icons/scalable/actions/next.svg
similarity index 100%
rename from icons/scalable/next.svg
rename to icons/scalable/actions/next.svg
diff --git a/icons/scalable/previous.svg b/icons/scalable/actions/previous.svg
similarity index 100%
rename from icons/scalable/previous.svg
rename to icons/scalable/actions/previous.svg
diff --git a/icons/scalable/artist.svg b/icons/scalable/actions/view-media-artist.svg
similarity index 100%
rename from icons/scalable/artist.svg
rename to icons/scalable/actions/view-media-artist.svg
diff --git a/icons/scalable/genre.svg b/icons/scalable/actions/view-media-genre.svg
similarity index 100%
rename from icons/scalable/genre.svg
rename to icons/scalable/actions/view-media-genre.svg
diff --git a/icons/scalable/zoomin.svg b/icons/scalable/actions/zoom-in.svg
similarity index 100%
rename from icons/scalable/zoomin.svg
rename to icons/scalable/actions/zoom-in.svg
diff --git a/icons/scalable/zoomout.svg b/icons/scalable/actions/zoom-out.svg
similarity index 100%
rename from icons/scalable/zoomout.svg
rename to icons/scalable/actions/zoom-out.svg
diff --git a/icons/scalable/optical.svg b/icons/scalable/devices/media-optical.svg
similarity index 100%
rename from icons/scalable/optical.svg
rename to icons/scalable/devices/media-optical.svg
diff --git a/icons/scalable/projector.svg b/icons/scalable/devices/projector.svg
similarity index 100%
rename from icons/scalable/projector.svg
rename to icons/scalable/devices/projector.svg
diff --git a/icons/scalable/radio.svg b/icons/scalable/devices/radio.svg
similarity index 100%
rename from icons/scalable/radio.svg
rename to icons/scalable/devices/radio.svg
diff --git a/icons/scalable/file.svg b/icons/scalable/mimetypes/text-x-generic.svg
similarity index 100%
rename from icons/scalable/file.svg
rename to icons/scalable/mimetypes/text-x-generic.svg
diff --git a/icons/scalable/folder-music.svg b/icons/scalable/places/folder-music.svg
similarity index 100%
rename from icons/scalable/folder-music.svg
rename to icons/scalable/places/folder-music.svg
diff --git a/icons/scalable/folder.svg b/icons/scalable/places/folder.svg
similarity index 100%
rename from icons/scalable/folder.svg
rename to icons/scalable/places/folder.svg
diff --git a/icons/scalable/mail.svg b/icons/scalable/places/mailbox.svg
similarity index 100%
rename from icons/scalable/mail.svg
rename to icons/scalable/places/mailbox.svg
diff --git a/icons/scalable/mailempty.svg b/icons/scalable/status/mail-read.svg
similarity index 100%
rename from icons/scalable/mailempty.svg
rename to icons/scalable/status/mail-read.svg
diff --git a/icons/scalable/mailfull.svg b/icons/scalable/status/mail-unread.svg
similarity index 100%
rename from icons/scalable/mailfull.svg
rename to icons/scalable/status/mail-unread.svg