diff --git a/configure.ac b/configure.ac
index 81a28c669..271284f90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,22 @@ src/system/mtdutils/lib/Makefile
 data/Makefile
 data/fonts/Makefile
 data/icons/Makefile
-data/icons/screensaver/Makefile
+data/icons/buttons/Makefile
+data/icons/filetypes/Makefile
+data/icons/headers/Makefile
+data/icons/hints/Makefile
+data/icons/locale/Makefile
+data/icons/movieplayer/Makefile
+data/icons/radar/Makefile
+data/icons/slider/Makefile
+data/icons/status/Makefile
+data/icons/status/ca/Makefile
+data/icons/status/channel/Makefile
+data/icons/status/info/Makefile
+data/icons/status/markers/Makefile
+data/icons/status/progress/Makefile
+data/icons/status/various/Makefile
+data/icons/various/Makefile
 data/inetradio/Makefile
 data/initial/Makefile
 data/iso-codes/Makefile
@@ -353,6 +368,9 @@ data/lcd/clock/Makefile
 data/license/Makefile
 data/locale/Makefile
 data/neutrino-scripts/Makefile
+data/pictures/Makefile
+data/pictures/backgrounds/Makefile
+data/pictures/screensaver/Makefile
 data/scripts/Makefile
 data/themes/Makefile
 src/eitd/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index a1ac6379a..e62ac98b1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,15 @@
-#SUBDIRS = fonts icons inetradio initial iso-codes license locale scripts themes neutrino-scripts //NI
-SUBDIRS = fonts icons inetradio iso-codes license locale scripts themes neutrino-scripts
+SUBDIRS = \
+	fonts \
+	icons \
+	inetradio \
+	#initial \
+	iso-codes \
+	license \
+	locale \
+	neutrino-scripts \
+	pictures \
+	scripts \
+	themes
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 4a154c7d9..bff4d209b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,302 +1,11 @@
-#NI
-SUBDIRS = screensaver
-
-installdir = $(ICONSDIR)
-
-locale = \
-	locale/deutsch.png \
-	locale/english.png
-
-locale_unmaintained = \
-	locale/unmaintained/bayrisch.png \
-	locale/unmaintained/bosanski.png \
-	locale/unmaintained/ch-baslerdeutsch.png \
-	locale/unmaintained/ch-berndeutsch.png \
-	locale/unmaintained/czech.png \
-	locale/unmaintained/francais.png \
-	locale/unmaintained/italiano.png \
-	locale/unmaintained/nederlands.png \
-	locale/unmaintained/polski.png \
-	locale/unmaintained/portugues.png \
-	locale/unmaintained/russkij.png \
-	locale/unmaintained/slovak.png \
-	locale/unmaintained/suomi.png \
-	locale/unmaintained/svenska.png
-
-install_DATA  = $(locale)
-#install_DATA += $(locale_unmaintained)
-
-install_DATA += \
-	0.png \
-	1.png \
-	16_9.png \
-	16_9_gray.png \
-	2.png \
-	3.png \
-	4.png \
-	5.png \
-	6.png \
-	7.png \
-	8.png \
-	9.png \
-	ats.png \
-	ats_gray.png \
-	audio.png \
-	audioplay.png \
-	biss_green.png \
-	biss_white.png \
-	biss_yellow.png \
-	blau.png \
-	bookmarkmanager.png \
-	border_lr.png \
-	border_ul.png \
-	btn_backward.png \
-	btn_forward.png \
-	btn_pause.png \
-	btn_play.png \
-	btn_record_active.png \
-	btn_record_inactive.png \
-	btn_stop.png \
-	ca.png \
-	ca2.png \
-	ca2_gray.png \
-	checkmark.png \
-	clock_face.png \
-	colors.png \
-	conax_green.png \
-	conax_white.png \
-	conax_yellow.png \
-	cw_green.png \
-	cw_white.png \
-	cw_yellow.png \
-	d_green.png \
-	d_white.png \
-	d_yellow.png \
-	dd.png \
-	dd_avail.png \
-	dd_gray.png \
-	down.png \
-	dummy.png \
-	dummy_small.png \
-	error.png \
-	epg.png \
-	features.png \
-	file.png \
-	folder.png \
-	games.png \
-	gelb.png \
-	gruen.png \
-	help.png \
-	help_small.png \
-	hidden.png \
-	hint_a_pic.png \
-	hint_adzap.png \
-	hint_aplay.png \
-	hint_audio.png \
-	hint_back.png \
-	hint_bedit.png \
-	hint_blank_screen.png \
-	hint_ci.png \
-	hint_dboxinfo.png \
-	hint_delete.png \
-	hint_extended.png \
-	hint_fileplay.png \
-	hint_games.png \
-	hint_hdd.png \
-	hint_hdd_info.png \
-	hint_iconsPKG0.png \
-	hint_iconsPKG1.png \
-	hint_iconsPKG2.png \
-	hint_iconsPKG3.png \
-	hint_imageinfo.png \
-	hint_imagelogo.png \
-	hint_inetradio.png \
-	hint_info.png \
-	hint_keys.png \
-	hint_language.png \
-	hint_lcd4linux.png \
-	hint_manage.png \
-	hint_mb.png \
-	hint_media.png \
-	hint_movie.png \
-	hint_network.png \
-	hint_next.png \
-	hint_osd.png \
-	hint_personalize.png \
-	hint_picview.png \
-	hint_plugin.png \
-	hint_protection.png \
-	hint_radiomode.png \
-	hint_reboot.png \
-	hint_recording.png \
-	hint_reload.png \
-	hint_restart.png \
-	hint_save.png \
-	hint_scan.png \
-	hint_scripts.png \
-	hint_service.png \
-	hint_settings.png \
-	hint_shutdown.png \
-	hint_sleeptimer.png \
-	hint_streaminfo.png \
-	hint_swupdate.png \
-	hint_timers.png \
-	hint_tvmode.png \
-	hint_tvradio_switch.png \
-	hint_vfd.png \
-	hint_video.png \
-	hint_vtxt.png \
-	hint_ytplay.png \
-	home.png \
-	icon_green.png \
-	icon_movieplayer.png \
-	icon_red.png \
-	icon_yellow.png \
-	icon_ytplay.png \
-	imdb.png \
-	important.png \
-	info.png \
-	info_small.png \
-	information.png \
-	ird_green.png \
-	ird_white.png \
-	ird_yellow.png \
-	keybinding.png \
-	language.png \
-	lcd.png \
-	left.png \
-	local.png \
-	lock.png \
-	lock_passive.png \
-	mainmenue.png \
-	menu.png \
-	menu_small.png \
-	mounted.png \
-	movie.png \
-	mp_b-skip.png \
-	mp_f-skip.png \
-	mp_pause.png \
-	mp_play.png \
-	mp_play_repeat_all.png \
-	mp_play_repeat_track.png \
-	mp3.jpg \
-	mp3.png \
-	multimedia.png \
-	mute.png \
-	mute_small.png \
-	mute_zap_gray.png \
-	mute_zap_green.png \
-	nagra_green.png \
-	nagra_white.png \
-	nagra_yellow.png \
-	nds_green.png \
-	nds_white.png \
-	nds_yellow.png \
-	network.png \
-	not_mounted.png \
-	notyet.png \
-	numericpad.png \
-	ok.png \
-	personalize.png \
-	pip.png \
-	power.png \
-	powervu_green.png \
-	powervu_white.png \
-	powervu_yellow.png \
-	progressbar.png \
-	progressbar_inactive_passive.png \
-	progressbar_passive.png \
-	radar.pal \
-	radar_red.pal \
-	radar0.raw \
-	radar1.raw \
-	radar2.raw \
-	radar3.raw \
-	radar4.raw \
-	radar5.raw \
-	radar6.raw \
-	radar7.raw \
-	radar8.raw \
-	radar9.raw \
-	radiomode.jpg \
-	radiotextget.png \
-	radiotextoff.png \
-	radiotextwait.png \
-	rclock.png \
-	rec.png \
-	rec_event_marker.png \
-	rec_gray.png \
-	recording.png \
-	res_000.png \
-	res_1080.png \
-	res_1280.png \
-	res_1440.png \
-	res_1920.png \
-	res_288.png \
-	res_352.png \
-	res_382.png \
-	res_480.png \
-	res_528.png \
-	res_544.png \
-	res_576.png \
-	res_704.png \
-	res_720.png \
-	res_hd.png \
-	res_sd.png \
-	right.png \
-	rot.png \
-	scan.jpg \
-	seca_green.png \
-	seca_white.png \
-	seca_yellow.png \
-	settings.png \
-	shell.png \
-	shutdown.jpg \
-	softupdate.png \
-	stars.png \
-	stars_bg.png \
-	star-off.png \
-	star-on.png \
-	start.jpg \
-	streaming.png \
-	subt.png \
-	subt_gray.png \
-	timer.png \
-	tmdb.png \
-	tuner_1.png \
-	tuner_2.png \
-	tuner_3.png \
-	tuner_4.png \
-	up.png \
-	upnp.png \
-	via_green.png \
-	via_white.png \
-	via_yellow.png \
-	video.png \
-	volume.png \
-	volumebar.png \
-	volumebar_passive.png \
-	volumebody.png \
-	volumeslider2.png \
-	volumeslider2alpha.png \
-	volumeslider2blue.png \
-	volumeslider2green.png \
-	volumeslider2red.png \
-	vtxt.png \
-	vtxt_gray.png \
-	warning.png \
-	x_green.png \
-	x_white.png \
-	x_yellow.png \
-	zap.png
-
-# NI Infoicons
-install_DATA += \
-	info0_off.png \
-	info0_on.png \
-	info1_off.png \
-	info1_on.png \
-	info2_off.png \
-	info2_on.png \
-	info3_off.png \
-	info3_on.png
+SUBDIRS = \
+	buttons \
+	filetypes \
+	headers \
+	hints \
+	locale \
+	movieplayer \
+	radar \
+	slider \
+	status \
+	various
diff --git a/data/icons/audioplay.png b/data/icons/audioplay.png
deleted file mode 100644
index cf19b7ea9..000000000
Binary files a/data/icons/audioplay.png and /dev/null differ
diff --git a/data/icons/0.png b/data/icons/buttons/0.png
similarity index 100%
rename from data/icons/0.png
rename to data/icons/buttons/0.png
diff --git a/data/icons/1.png b/data/icons/buttons/1.png
similarity index 100%
rename from data/icons/1.png
rename to data/icons/buttons/1.png
diff --git a/data/icons/2.png b/data/icons/buttons/2.png
similarity index 100%
rename from data/icons/2.png
rename to data/icons/buttons/2.png
diff --git a/data/icons/3.png b/data/icons/buttons/3.png
similarity index 100%
rename from data/icons/3.png
rename to data/icons/buttons/3.png
diff --git a/data/icons/4.png b/data/icons/buttons/4.png
similarity index 100%
rename from data/icons/4.png
rename to data/icons/buttons/4.png
diff --git a/data/icons/5.png b/data/icons/buttons/5.png
similarity index 100%
rename from data/icons/5.png
rename to data/icons/buttons/5.png
diff --git a/data/icons/6.png b/data/icons/buttons/6.png
similarity index 100%
rename from data/icons/6.png
rename to data/icons/buttons/6.png
diff --git a/data/icons/7.png b/data/icons/buttons/7.png
similarity index 100%
rename from data/icons/7.png
rename to data/icons/buttons/7.png
diff --git a/data/icons/8.png b/data/icons/buttons/8.png
similarity index 100%
rename from data/icons/8.png
rename to data/icons/buttons/8.png
diff --git a/data/icons/9.png b/data/icons/buttons/9.png
similarity index 100%
rename from data/icons/9.png
rename to data/icons/buttons/9.png
diff --git a/data/icons/buttons/Makefile.am b/data/icons/buttons/Makefile.am
new file mode 100644
index 000000000..c708942ea
--- /dev/null
+++ b/data/icons/buttons/Makefile.am
@@ -0,0 +1,42 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	0.png \
+	1.png \
+	2.png \
+	3.png \
+	4.png \
+	5.png \
+	6.png \
+	7.png \
+	8.png \
+	9.png \
+	blau.png \
+	btn_backward.png \
+	btn_forward.png \
+	btn_pause.png \
+	btn_play.png \
+	btn_record_active.png \
+	btn_record_inactive.png \
+	btn_stop.png \
+	down.png \
+	dummy.png \
+	dummy_small.png \
+	gelb.png \
+	gruen.png \
+	help.png \
+	help_small.png \
+	home.png \
+	info.png \
+	info_small.png \
+	left.png \
+	menu.png \
+	menu_small.png \
+	mute_small.png \
+	mute_zap_gray.png \
+	mute_zap_green.png \
+	ok.png \
+	power.png \
+	right.png \
+	rot.png \
+	up.png
diff --git a/data/icons/blau.png b/data/icons/buttons/blau.png
similarity index 100%
rename from data/icons/blau.png
rename to data/icons/buttons/blau.png
diff --git a/data/icons/btn_backward.png b/data/icons/buttons/btn_backward.png
similarity index 100%
rename from data/icons/btn_backward.png
rename to data/icons/buttons/btn_backward.png
diff --git a/data/icons/btn_forward.png b/data/icons/buttons/btn_forward.png
similarity index 100%
rename from data/icons/btn_forward.png
rename to data/icons/buttons/btn_forward.png
diff --git a/data/icons/btn_pause.png b/data/icons/buttons/btn_pause.png
similarity index 100%
rename from data/icons/btn_pause.png
rename to data/icons/buttons/btn_pause.png
diff --git a/data/icons/btn_play.png b/data/icons/buttons/btn_play.png
similarity index 100%
rename from data/icons/btn_play.png
rename to data/icons/buttons/btn_play.png
diff --git a/data/icons/btn_record_active.png b/data/icons/buttons/btn_record_active.png
similarity index 100%
rename from data/icons/btn_record_active.png
rename to data/icons/buttons/btn_record_active.png
diff --git a/data/icons/btn_record_inactive.png b/data/icons/buttons/btn_record_inactive.png
similarity index 100%
rename from data/icons/btn_record_inactive.png
rename to data/icons/buttons/btn_record_inactive.png
diff --git a/data/icons/btn_stop.png b/data/icons/buttons/btn_stop.png
similarity index 100%
rename from data/icons/btn_stop.png
rename to data/icons/buttons/btn_stop.png
diff --git a/data/icons/down.png b/data/icons/buttons/down.png
similarity index 100%
rename from data/icons/down.png
rename to data/icons/buttons/down.png
diff --git a/data/icons/dummy.png b/data/icons/buttons/dummy.png
similarity index 100%
rename from data/icons/dummy.png
rename to data/icons/buttons/dummy.png
diff --git a/data/icons/dummy_small.png b/data/icons/buttons/dummy_small.png
similarity index 100%
rename from data/icons/dummy_small.png
rename to data/icons/buttons/dummy_small.png
diff --git a/data/icons/gelb.png b/data/icons/buttons/gelb.png
similarity index 100%
rename from data/icons/gelb.png
rename to data/icons/buttons/gelb.png
diff --git a/data/icons/gruen.png b/data/icons/buttons/gruen.png
similarity index 100%
rename from data/icons/gruen.png
rename to data/icons/buttons/gruen.png
diff --git a/data/icons/help.png b/data/icons/buttons/help.png
similarity index 100%
rename from data/icons/help.png
rename to data/icons/buttons/help.png
diff --git a/data/icons/help_small.png b/data/icons/buttons/help_small.png
similarity index 100%
rename from data/icons/help_small.png
rename to data/icons/buttons/help_small.png
diff --git a/data/icons/home.png b/data/icons/buttons/home.png
similarity index 100%
rename from data/icons/home.png
rename to data/icons/buttons/home.png
diff --git a/data/icons/info.png b/data/icons/buttons/info.png
similarity index 100%
rename from data/icons/info.png
rename to data/icons/buttons/info.png
diff --git a/data/icons/info_small.png b/data/icons/buttons/info_small.png
similarity index 100%
rename from data/icons/info_small.png
rename to data/icons/buttons/info_small.png
diff --git a/data/icons/left.png b/data/icons/buttons/left.png
similarity index 100%
rename from data/icons/left.png
rename to data/icons/buttons/left.png
diff --git a/data/icons/menu.png b/data/icons/buttons/menu.png
similarity index 100%
rename from data/icons/menu.png
rename to data/icons/buttons/menu.png
diff --git a/data/icons/menu_small.png b/data/icons/buttons/menu_small.png
similarity index 100%
rename from data/icons/menu_small.png
rename to data/icons/buttons/menu_small.png
diff --git a/data/icons/mute_small.png b/data/icons/buttons/mute_small.png
similarity index 100%
rename from data/icons/mute_small.png
rename to data/icons/buttons/mute_small.png
diff --git a/data/icons/mute_zap_gray.png b/data/icons/buttons/mute_zap_gray.png
similarity index 100%
rename from data/icons/mute_zap_gray.png
rename to data/icons/buttons/mute_zap_gray.png
diff --git a/data/icons/mute_zap_green.png b/data/icons/buttons/mute_zap_green.png
similarity index 100%
rename from data/icons/mute_zap_green.png
rename to data/icons/buttons/mute_zap_green.png
diff --git a/data/icons/ok.png b/data/icons/buttons/ok.png
similarity index 100%
rename from data/icons/ok.png
rename to data/icons/buttons/ok.png
diff --git a/data/icons/0-green.png b/data/icons/buttons/orphaned/0-green.png
similarity index 100%
rename from data/icons/0-green.png
rename to data/icons/buttons/orphaned/0-green.png
diff --git a/data/icons/0-red.png b/data/icons/buttons/orphaned/0-red.png
similarity index 100%
rename from data/icons/0-red.png
rename to data/icons/buttons/orphaned/0-red.png
diff --git a/data/icons/1-green.png b/data/icons/buttons/orphaned/1-green.png
similarity index 100%
rename from data/icons/1-green.png
rename to data/icons/buttons/orphaned/1-green.png
diff --git a/data/icons/1-red.png b/data/icons/buttons/orphaned/1-red.png
similarity index 100%
rename from data/icons/1-red.png
rename to data/icons/buttons/orphaned/1-red.png
diff --git a/data/icons/2-green.png b/data/icons/buttons/orphaned/2-green.png
similarity index 100%
rename from data/icons/2-green.png
rename to data/icons/buttons/orphaned/2-green.png
diff --git a/data/icons/2-red.png b/data/icons/buttons/orphaned/2-red.png
similarity index 100%
rename from data/icons/2-red.png
rename to data/icons/buttons/orphaned/2-red.png
diff --git a/data/icons/3-green.png b/data/icons/buttons/orphaned/3-green.png
similarity index 100%
rename from data/icons/3-green.png
rename to data/icons/buttons/orphaned/3-green.png
diff --git a/data/icons/3-red.png b/data/icons/buttons/orphaned/3-red.png
similarity index 100%
rename from data/icons/3-red.png
rename to data/icons/buttons/orphaned/3-red.png
diff --git a/data/icons/4-green.png b/data/icons/buttons/orphaned/4-green.png
similarity index 100%
rename from data/icons/4-green.png
rename to data/icons/buttons/orphaned/4-green.png
diff --git a/data/icons/4-red.png b/data/icons/buttons/orphaned/4-red.png
similarity index 100%
rename from data/icons/4-red.png
rename to data/icons/buttons/orphaned/4-red.png
diff --git a/data/icons/5-green.png b/data/icons/buttons/orphaned/5-green.png
similarity index 100%
rename from data/icons/5-green.png
rename to data/icons/buttons/orphaned/5-green.png
diff --git a/data/icons/5-red.png b/data/icons/buttons/orphaned/5-red.png
similarity index 100%
rename from data/icons/5-red.png
rename to data/icons/buttons/orphaned/5-red.png
diff --git a/data/icons/6-green.png b/data/icons/buttons/orphaned/6-green.png
similarity index 100%
rename from data/icons/6-green.png
rename to data/icons/buttons/orphaned/6-green.png
diff --git a/data/icons/6-red.png b/data/icons/buttons/orphaned/6-red.png
similarity index 100%
rename from data/icons/6-red.png
rename to data/icons/buttons/orphaned/6-red.png
diff --git a/data/icons/7-green.png b/data/icons/buttons/orphaned/7-green.png
similarity index 100%
rename from data/icons/7-green.png
rename to data/icons/buttons/orphaned/7-green.png
diff --git a/data/icons/7-red.png b/data/icons/buttons/orphaned/7-red.png
similarity index 100%
rename from data/icons/7-red.png
rename to data/icons/buttons/orphaned/7-red.png
diff --git a/data/icons/8-green.png b/data/icons/buttons/orphaned/8-green.png
similarity index 100%
rename from data/icons/8-green.png
rename to data/icons/buttons/orphaned/8-green.png
diff --git a/data/icons/8-red.png b/data/icons/buttons/orphaned/8-red.png
similarity index 100%
rename from data/icons/8-red.png
rename to data/icons/buttons/orphaned/8-red.png
diff --git a/data/icons/9-green.png b/data/icons/buttons/orphaned/9-green.png
similarity index 100%
rename from data/icons/9-green.png
rename to data/icons/buttons/orphaned/9-green.png
diff --git a/data/icons/9-red.png b/data/icons/buttons/orphaned/9-red.png
similarity index 100%
rename from data/icons/9-red.png
rename to data/icons/buttons/orphaned/9-red.png
diff --git a/data/icons/longpress.png b/data/icons/buttons/orphaned/longpress.png
similarity index 100%
rename from data/icons/longpress.png
rename to data/icons/buttons/orphaned/longpress.png
diff --git a/data/icons/power.png b/data/icons/buttons/power.png
similarity index 100%
rename from data/icons/power.png
rename to data/icons/buttons/power.png
diff --git a/data/icons/right.png b/data/icons/buttons/right.png
similarity index 100%
rename from data/icons/right.png
rename to data/icons/buttons/right.png
diff --git a/data/icons/rot.png b/data/icons/buttons/rot.png
similarity index 100%
rename from data/icons/rot.png
rename to data/icons/buttons/rot.png
diff --git a/data/icons/up.png b/data/icons/buttons/up.png
similarity index 100%
rename from data/icons/up.png
rename to data/icons/buttons/up.png
diff --git a/data/icons/filetypes/Makefile.am b/data/icons/filetypes/Makefile.am
new file mode 100644
index 000000000..ec9f09d5a
--- /dev/null
+++ b/data/icons/filetypes/Makefile.am
@@ -0,0 +1,6 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	file.png \
+	folder.png \
+	movie.png
diff --git a/data/icons/file.png b/data/icons/filetypes/file.png
similarity index 100%
rename from data/icons/file.png
rename to data/icons/filetypes/file.png
diff --git a/data/icons/folder.png b/data/icons/filetypes/folder.png
similarity index 100%
rename from data/icons/folder.png
rename to data/icons/filetypes/folder.png
diff --git a/data/icons/movie.png b/data/icons/filetypes/movie.png
similarity index 100%
rename from data/icons/movie.png
rename to data/icons/filetypes/movie.png
diff --git a/data/icons/headers/Makefile.am b/data/icons/headers/Makefile.am
new file mode 100644
index 000000000..29328dcbf
--- /dev/null
+++ b/data/icons/headers/Makefile.am
@@ -0,0 +1,31 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	audio.png \
+	bookmarkmanager.png \
+	colors.png \
+	error.png \
+	features.png \
+	games.png \
+	icon_green.png \
+	icon_movieplayer.png \
+	icon_red.png \
+	icon_yellow.png \
+	icon_ytplay.png \
+	information.png \
+	keybinding.png \
+	language.png \
+	lcd.png \
+	mainmenue.png \
+	mp3.png \
+	multimedia.png \
+	network.png \
+	personalize.png \
+	recording.png \
+	settings.png \
+	shell.png \
+	softupdate.png \
+	streaming.png \
+	timer.png \
+	upnp.png \
+	video.png
diff --git a/data/icons/audio.png b/data/icons/headers/audio.png
similarity index 100%
rename from data/icons/audio.png
rename to data/icons/headers/audio.png
diff --git a/data/icons/bookmarkmanager.png b/data/icons/headers/bookmarkmanager.png
similarity index 100%
rename from data/icons/bookmarkmanager.png
rename to data/icons/headers/bookmarkmanager.png
diff --git a/data/icons/colors.png b/data/icons/headers/colors.png
similarity index 100%
rename from data/icons/colors.png
rename to data/icons/headers/colors.png
diff --git a/data/icons/error.png b/data/icons/headers/error.png
similarity index 100%
rename from data/icons/error.png
rename to data/icons/headers/error.png
diff --git a/data/icons/features.png b/data/icons/headers/features.png
similarity index 100%
rename from data/icons/features.png
rename to data/icons/headers/features.png
diff --git a/data/icons/games.png b/data/icons/headers/games.png
similarity index 100%
rename from data/icons/games.png
rename to data/icons/headers/games.png
diff --git a/data/icons/icon_blue.png b/data/icons/headers/icon_blue.png
similarity index 100%
rename from data/icons/icon_blue.png
rename to data/icons/headers/icon_blue.png
diff --git a/data/icons/icon_green.png b/data/icons/headers/icon_green.png
similarity index 100%
rename from data/icons/icon_green.png
rename to data/icons/headers/icon_green.png
diff --git a/data/icons/icon_movieplayer.png b/data/icons/headers/icon_movieplayer.png
similarity index 100%
rename from data/icons/icon_movieplayer.png
rename to data/icons/headers/icon_movieplayer.png
diff --git a/data/icons/icon_red.png b/data/icons/headers/icon_red.png
similarity index 100%
rename from data/icons/icon_red.png
rename to data/icons/headers/icon_red.png
diff --git a/data/icons/icon_yellow.png b/data/icons/headers/icon_yellow.png
similarity index 100%
rename from data/icons/icon_yellow.png
rename to data/icons/headers/icon_yellow.png
diff --git a/data/icons/icon_ytplay.png b/data/icons/headers/icon_ytplay.png
similarity index 100%
rename from data/icons/icon_ytplay.png
rename to data/icons/headers/icon_ytplay.png
diff --git a/data/icons/information.png b/data/icons/headers/information.png
similarity index 100%
rename from data/icons/information.png
rename to data/icons/headers/information.png
diff --git a/data/icons/keybinding.png b/data/icons/headers/keybinding.png
similarity index 100%
rename from data/icons/keybinding.png
rename to data/icons/headers/keybinding.png
diff --git a/data/icons/language.png b/data/icons/headers/language.png
similarity index 100%
rename from data/icons/language.png
rename to data/icons/headers/language.png
diff --git a/data/icons/lcd.png b/data/icons/headers/lcd.png
similarity index 100%
rename from data/icons/lcd.png
rename to data/icons/headers/lcd.png
diff --git a/data/icons/mainmenue.png b/data/icons/headers/mainmenue.png
similarity index 100%
rename from data/icons/mainmenue.png
rename to data/icons/headers/mainmenue.png
diff --git a/data/icons/mp3.png b/data/icons/headers/mp3.png
similarity index 100%
rename from data/icons/mp3.png
rename to data/icons/headers/mp3.png
diff --git a/data/icons/multimedia.png b/data/icons/headers/multimedia.png
similarity index 100%
rename from data/icons/multimedia.png
rename to data/icons/headers/multimedia.png
diff --git a/data/icons/network.png b/data/icons/headers/network.png
similarity index 100%
rename from data/icons/network.png
rename to data/icons/headers/network.png
diff --git a/data/icons/personalize.png b/data/icons/headers/personalize.png
similarity index 100%
rename from data/icons/personalize.png
rename to data/icons/headers/personalize.png
diff --git a/data/icons/recording.png b/data/icons/headers/recording.png
similarity index 100%
rename from data/icons/recording.png
rename to data/icons/headers/recording.png
diff --git a/data/icons/settings.png b/data/icons/headers/settings.png
similarity index 100%
rename from data/icons/settings.png
rename to data/icons/headers/settings.png
diff --git a/data/icons/shell.png b/data/icons/headers/shell.png
similarity index 100%
rename from data/icons/shell.png
rename to data/icons/headers/shell.png
diff --git a/data/icons/softupdate.png b/data/icons/headers/softupdate.png
similarity index 100%
rename from data/icons/softupdate.png
rename to data/icons/headers/softupdate.png
diff --git a/data/icons/streaming.png b/data/icons/headers/streaming.png
similarity index 100%
rename from data/icons/streaming.png
rename to data/icons/headers/streaming.png
diff --git a/data/icons/timer.png b/data/icons/headers/timer.png
similarity index 100%
rename from data/icons/timer.png
rename to data/icons/headers/timer.png
diff --git a/data/icons/upnp.png b/data/icons/headers/upnp.png
similarity index 100%
rename from data/icons/upnp.png
rename to data/icons/headers/upnp.png
diff --git a/data/icons/video.png b/data/icons/headers/video.png
similarity index 100%
rename from data/icons/video.png
rename to data/icons/headers/video.png
diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am
new file mode 100644
index 000000000..b64106667
--- /dev/null
+++ b/data/icons/hints/Makefile.am
@@ -0,0 +1,60 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	hint_a_pic.png \
+	hint_adzap.png \
+	hint_aplay.png \
+	hint_audio.png \
+	hint_back.png \
+	hint_bedit.png \
+	hint_blank_screen.png \
+	hint_ci.png \
+	hint_dboxinfo.png \
+	hint_delete.png \
+	hint_extended.png \
+	hint_fileplay.png \
+	hint_games.png \
+	hint_hdd.png \
+	hint_hdd_info.png \
+	hint_iconsPKG0.png \
+	hint_iconsPKG1.png \
+	hint_iconsPKG2.png \
+	hint_iconsPKG3.png \
+	hint_imageinfo.png \
+	hint_imagelogo.png \
+	hint_inetradio.png \
+	hint_info.png \
+	hint_keys.png \
+	hint_language.png \
+	hint_manage.png \
+	hint_mb.png \
+	hint_media.png \
+	hint_movie.png \
+	hint_network.png \
+	hint_next.png \
+	hint_osd.png \
+	hint_personalize.png \
+	hint_picview.png \
+	hint_plugin.png \
+	hint_protection.png \
+	hint_radiomode.png \
+	hint_reboot.png \
+	hint_recording.png \
+	hint_reload.png \
+	hint_restart.png \
+	hint_save.png \
+	hint_scan.png \
+	hint_scripts.png \
+	hint_service.png \
+	hint_settings.png \
+	hint_shutdown.png \
+	hint_sleeptimer.png \
+	hint_streaminfo.png \
+	hint_swupdate.png \
+	hint_timers.png \
+	hint_tvmode.png \
+	hint_tvradio_switch.png \
+	hint_vfd.png \
+	hint_video.png \
+	hint_vtxt.png \
+	hint_ytplay.png
diff --git a/data/icons/hint_a_pic.png b/data/icons/hints/hint_a_pic.png
similarity index 100%
rename from data/icons/hint_a_pic.png
rename to data/icons/hints/hint_a_pic.png
diff --git a/data/icons/hint_adzap.png b/data/icons/hints/hint_adzap.png
similarity index 100%
rename from data/icons/hint_adzap.png
rename to data/icons/hints/hint_adzap.png
diff --git a/data/icons/hint_aplay.png b/data/icons/hints/hint_aplay.png
similarity index 100%
rename from data/icons/hint_aplay.png
rename to data/icons/hints/hint_aplay.png
diff --git a/data/icons/hint_audio.png b/data/icons/hints/hint_audio.png
similarity index 100%
rename from data/icons/hint_audio.png
rename to data/icons/hints/hint_audio.png
diff --git a/data/icons/hint_back.png b/data/icons/hints/hint_back.png
similarity index 100%
rename from data/icons/hint_back.png
rename to data/icons/hints/hint_back.png
diff --git a/data/icons/hint_bedit.png b/data/icons/hints/hint_bedit.png
similarity index 100%
rename from data/icons/hint_bedit.png
rename to data/icons/hints/hint_bedit.png
diff --git a/data/icons/hint_blank_screen.png b/data/icons/hints/hint_blank_screen.png
similarity index 100%
rename from data/icons/hint_blank_screen.png
rename to data/icons/hints/hint_blank_screen.png
diff --git a/data/icons/hint_ci.png b/data/icons/hints/hint_ci.png
similarity index 100%
rename from data/icons/hint_ci.png
rename to data/icons/hints/hint_ci.png
diff --git a/data/icons/hint_dboxinfo.png b/data/icons/hints/hint_dboxinfo.png
similarity index 100%
rename from data/icons/hint_dboxinfo.png
rename to data/icons/hints/hint_dboxinfo.png
diff --git a/data/icons/hint_delete.png b/data/icons/hints/hint_delete.png
similarity index 100%
rename from data/icons/hint_delete.png
rename to data/icons/hints/hint_delete.png
diff --git a/data/icons/hint_extended.png b/data/icons/hints/hint_extended.png
similarity index 100%
rename from data/icons/hint_extended.png
rename to data/icons/hints/hint_extended.png
diff --git a/data/icons/hint_fileplay.png b/data/icons/hints/hint_fileplay.png
similarity index 100%
rename from data/icons/hint_fileplay.png
rename to data/icons/hints/hint_fileplay.png
diff --git a/data/icons/hint_games.png b/data/icons/hints/hint_games.png
similarity index 100%
rename from data/icons/hint_games.png
rename to data/icons/hints/hint_games.png
diff --git a/data/icons/hint_hdd.png b/data/icons/hints/hint_hdd.png
similarity index 100%
rename from data/icons/hint_hdd.png
rename to data/icons/hints/hint_hdd.png
diff --git a/data/icons/hint_hdd_info.png b/data/icons/hints/hint_hdd_info.png
similarity index 100%
rename from data/icons/hint_hdd_info.png
rename to data/icons/hints/hint_hdd_info.png
diff --git a/data/icons/hint_iconsPKG0.png b/data/icons/hints/hint_iconsPKG0.png
similarity index 100%
rename from data/icons/hint_iconsPKG0.png
rename to data/icons/hints/hint_iconsPKG0.png
diff --git a/data/icons/hint_iconsPKG1.png b/data/icons/hints/hint_iconsPKG1.png
similarity index 100%
rename from data/icons/hint_iconsPKG1.png
rename to data/icons/hints/hint_iconsPKG1.png
diff --git a/data/icons/hint_iconsPKG2.png b/data/icons/hints/hint_iconsPKG2.png
similarity index 100%
rename from data/icons/hint_iconsPKG2.png
rename to data/icons/hints/hint_iconsPKG2.png
diff --git a/data/icons/hint_iconsPKG3.png b/data/icons/hints/hint_iconsPKG3.png
similarity index 100%
rename from data/icons/hint_iconsPKG3.png
rename to data/icons/hints/hint_iconsPKG3.png
diff --git a/data/icons/hint_imageinfo.png b/data/icons/hints/hint_imageinfo.png
similarity index 100%
rename from data/icons/hint_imageinfo.png
rename to data/icons/hints/hint_imageinfo.png
diff --git a/data/icons/hint_imagelogo.png b/data/icons/hints/hint_imagelogo.png
similarity index 100%
rename from data/icons/hint_imagelogo.png
rename to data/icons/hints/hint_imagelogo.png
diff --git a/data/icons/hint_inetradio.png b/data/icons/hints/hint_inetradio.png
similarity index 100%
rename from data/icons/hint_inetradio.png
rename to data/icons/hints/hint_inetradio.png
diff --git a/data/icons/hint_info.png b/data/icons/hints/hint_info.png
similarity index 100%
rename from data/icons/hint_info.png
rename to data/icons/hints/hint_info.png
diff --git a/data/icons/hint_keys.png b/data/icons/hints/hint_keys.png
similarity index 100%
rename from data/icons/hint_keys.png
rename to data/icons/hints/hint_keys.png
diff --git a/data/icons/hint_language.png b/data/icons/hints/hint_language.png
similarity index 100%
rename from data/icons/hint_language.png
rename to data/icons/hints/hint_language.png
diff --git a/data/icons/hint_lcd4linux.png b/data/icons/hints/hint_lcd4linux.png
similarity index 100%
rename from data/icons/hint_lcd4linux.png
rename to data/icons/hints/hint_lcd4linux.png
diff --git a/data/icons/hint_manage.png b/data/icons/hints/hint_manage.png
similarity index 100%
rename from data/icons/hint_manage.png
rename to data/icons/hints/hint_manage.png
diff --git a/data/icons/hint_mb.png b/data/icons/hints/hint_mb.png
similarity index 100%
rename from data/icons/hint_mb.png
rename to data/icons/hints/hint_mb.png
diff --git a/data/icons/hint_media.png b/data/icons/hints/hint_media.png
similarity index 100%
rename from data/icons/hint_media.png
rename to data/icons/hints/hint_media.png
diff --git a/data/icons/hint_movie.png b/data/icons/hints/hint_movie.png
similarity index 100%
rename from data/icons/hint_movie.png
rename to data/icons/hints/hint_movie.png
diff --git a/data/icons/hint_network.png b/data/icons/hints/hint_network.png
similarity index 100%
rename from data/icons/hint_network.png
rename to data/icons/hints/hint_network.png
diff --git a/data/icons/hint_next.png b/data/icons/hints/hint_next.png
similarity index 100%
rename from data/icons/hint_next.png
rename to data/icons/hints/hint_next.png
diff --git a/data/icons/hint_nkplay.png b/data/icons/hints/hint_nkplay.png
similarity index 100%
rename from data/icons/hint_nkplay.png
rename to data/icons/hints/hint_nkplay.png
diff --git a/data/icons/hint_osd.png b/data/icons/hints/hint_osd.png
similarity index 100%
rename from data/icons/hint_osd.png
rename to data/icons/hints/hint_osd.png
diff --git a/data/icons/hint_personalize.png b/data/icons/hints/hint_personalize.png
similarity index 100%
rename from data/icons/hint_personalize.png
rename to data/icons/hints/hint_personalize.png
diff --git a/data/icons/hint_picview.png b/data/icons/hints/hint_picview.png
similarity index 100%
rename from data/icons/hint_picview.png
rename to data/icons/hints/hint_picview.png
diff --git a/data/icons/hint_plugin.png b/data/icons/hints/hint_plugin.png
similarity index 100%
rename from data/icons/hint_plugin.png
rename to data/icons/hints/hint_plugin.png
diff --git a/data/icons/hint_protection.png b/data/icons/hints/hint_protection.png
similarity index 100%
rename from data/icons/hint_protection.png
rename to data/icons/hints/hint_protection.png
diff --git a/data/icons/hint_radiomode.png b/data/icons/hints/hint_radiomode.png
similarity index 100%
rename from data/icons/hint_radiomode.png
rename to data/icons/hints/hint_radiomode.png
diff --git a/data/icons/hint_rass.png b/data/icons/hints/hint_rass.png
similarity index 100%
rename from data/icons/hint_rass.png
rename to data/icons/hints/hint_rass.png
diff --git a/data/icons/hint_reboot.png b/data/icons/hints/hint_reboot.png
similarity index 100%
rename from data/icons/hint_reboot.png
rename to data/icons/hints/hint_reboot.png
diff --git a/data/icons/hint_recording.png b/data/icons/hints/hint_recording.png
similarity index 100%
rename from data/icons/hint_recording.png
rename to data/icons/hints/hint_recording.png
diff --git a/data/icons/hint_reload.png b/data/icons/hints/hint_reload.png
similarity index 100%
rename from data/icons/hint_reload.png
rename to data/icons/hints/hint_reload.png
diff --git a/data/icons/hint_restart.png b/data/icons/hints/hint_restart.png
similarity index 100%
rename from data/icons/hint_restart.png
rename to data/icons/hints/hint_restart.png
diff --git a/data/icons/hint_save.png b/data/icons/hints/hint_save.png
similarity index 100%
rename from data/icons/hint_save.png
rename to data/icons/hints/hint_save.png
diff --git a/data/icons/hint_scan.png b/data/icons/hints/hint_scan.png
similarity index 100%
rename from data/icons/hint_scan.png
rename to data/icons/hints/hint_scan.png
diff --git a/data/icons/hint_scripts.png b/data/icons/hints/hint_scripts.png
similarity index 100%
rename from data/icons/hint_scripts.png
rename to data/icons/hints/hint_scripts.png
diff --git a/data/icons/hint_service.png b/data/icons/hints/hint_service.png
similarity index 100%
rename from data/icons/hint_service.png
rename to data/icons/hints/hint_service.png
diff --git a/data/icons/hint_settings.png b/data/icons/hints/hint_settings.png
similarity index 100%
rename from data/icons/hint_settings.png
rename to data/icons/hints/hint_settings.png
diff --git a/data/icons/hint_shutdown.png b/data/icons/hints/hint_shutdown.png
similarity index 100%
rename from data/icons/hint_shutdown.png
rename to data/icons/hints/hint_shutdown.png
diff --git a/data/icons/hint_sleeptimer.png b/data/icons/hints/hint_sleeptimer.png
similarity index 100%
rename from data/icons/hint_sleeptimer.png
rename to data/icons/hints/hint_sleeptimer.png
diff --git a/data/icons/hint_spark.png b/data/icons/hints/hint_spark.png
similarity index 100%
rename from data/icons/hint_spark.png
rename to data/icons/hints/hint_spark.png
diff --git a/data/icons/hint_streaminfo.png b/data/icons/hints/hint_streaminfo.png
similarity index 100%
rename from data/icons/hint_streaminfo.png
rename to data/icons/hints/hint_streaminfo.png
diff --git a/data/icons/hint_swupdate.png b/data/icons/hints/hint_swupdate.png
similarity index 100%
rename from data/icons/hint_swupdate.png
rename to data/icons/hints/hint_swupdate.png
diff --git a/data/icons/hint_timers.png b/data/icons/hints/hint_timers.png
similarity index 100%
rename from data/icons/hint_timers.png
rename to data/icons/hints/hint_timers.png
diff --git a/data/icons/hint_tvmode.png b/data/icons/hints/hint_tvmode.png
similarity index 100%
rename from data/icons/hint_tvmode.png
rename to data/icons/hints/hint_tvmode.png
diff --git a/data/icons/hint_tvradio_switch.png b/data/icons/hints/hint_tvradio_switch.png
similarity index 100%
rename from data/icons/hint_tvradio_switch.png
rename to data/icons/hints/hint_tvradio_switch.png
diff --git a/data/icons/hint_vfd.png b/data/icons/hints/hint_vfd.png
similarity index 100%
rename from data/icons/hint_vfd.png
rename to data/icons/hints/hint_vfd.png
diff --git a/data/icons/hint_video.png b/data/icons/hints/hint_video.png
similarity index 100%
rename from data/icons/hint_video.png
rename to data/icons/hints/hint_video.png
diff --git a/data/icons/hint_vtxt.png b/data/icons/hints/hint_vtxt.png
similarity index 100%
rename from data/icons/hint_vtxt.png
rename to data/icons/hints/hint_vtxt.png
diff --git a/data/icons/hint_ytplay.png b/data/icons/hints/hint_ytplay.png
similarity index 100%
rename from data/icons/hint_ytplay.png
rename to data/icons/hints/hint_ytplay.png
diff --git a/data/icons/icon_nkplay.png b/data/icons/icon_nkplay.png
deleted file mode 100644
index ce3b052f2..000000000
Binary files a/data/icons/icon_nkplay.png and /dev/null differ
diff --git a/data/icons/local.png b/data/icons/local.png
deleted file mode 100644
index 19027c10e..000000000
Binary files a/data/icons/local.png and /dev/null differ
diff --git a/data/icons/locale/Makefile.am b/data/icons/locale/Makefile.am
new file mode 100644
index 000000000..386924c4c
--- /dev/null
+++ b/data/icons/locale/Makefile.am
@@ -0,0 +1,23 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	deutsch.png \
+	english.png \
+	nederlands.png \
+	slovak.png
+
+unmaintained = \
+	unmaintained/bayrisch.png \
+	unmaintained/bosanski.png \
+	unmaintained/ch-baslerdeutsch.png \
+	unmaintained/ch-berndeutsch.png \
+	unmaintained/czech.png \
+	unmaintained/francais.png \
+	unmaintained/italiano.png \
+	unmaintained/polski.png \
+	unmaintained/portugues.png \
+	unmaintained/russkij.png \
+	unmaintained/suomi.png \
+	unmaintained/svenska.png
+
+install_DATA += $(unmaintained)
diff --git a/data/icons/locale/unmaintained/nederlands.png b/data/icons/locale/nederlands.png
similarity index 100%
rename from data/icons/locale/unmaintained/nederlands.png
rename to data/icons/locale/nederlands.png
diff --git a/data/icons/locale/unmaintained/slovak.png b/data/icons/locale/slovak.png
similarity index 100%
rename from data/icons/locale/unmaintained/slovak.png
rename to data/icons/locale/slovak.png
diff --git a/data/icons/movieplayer/Makefile.am b/data/icons/movieplayer/Makefile.am
new file mode 100644
index 000000000..8594e7d67
--- /dev/null
+++ b/data/icons/movieplayer/Makefile.am
@@ -0,0 +1,9 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	mp_b-skip.png \
+	mp_f-skip.png \
+	mp_pause.png \
+	mp_play.png \
+	mp_play_repeat_all.png \
+	mp_play_repeat_track.png
diff --git a/data/icons/mp_b-skip.png b/data/icons/movieplayer/mp_b-skip.png
similarity index 100%
rename from data/icons/mp_b-skip.png
rename to data/icons/movieplayer/mp_b-skip.png
diff --git a/data/icons/mp_f-skip.png b/data/icons/movieplayer/mp_f-skip.png
similarity index 100%
rename from data/icons/mp_f-skip.png
rename to data/icons/movieplayer/mp_f-skip.png
diff --git a/data/icons/mp_pause.png b/data/icons/movieplayer/mp_pause.png
similarity index 100%
rename from data/icons/mp_pause.png
rename to data/icons/movieplayer/mp_pause.png
diff --git a/data/icons/mp_play.png b/data/icons/movieplayer/mp_play.png
similarity index 100%
rename from data/icons/mp_play.png
rename to data/icons/movieplayer/mp_play.png
diff --git a/data/icons/mp_play_repeat_all.png b/data/icons/movieplayer/mp_play_repeat_all.png
similarity index 100%
rename from data/icons/mp_play_repeat_all.png
rename to data/icons/movieplayer/mp_play_repeat_all.png
diff --git a/data/icons/mp_play_repeat_track.png b/data/icons/movieplayer/mp_play_repeat_track.png
similarity index 100%
rename from data/icons/mp_play_repeat_track.png
rename to data/icons/movieplayer/mp_play_repeat_track.png
diff --git a/data/icons/mp3-0.jpg b/data/icons/mp3-0.jpg
deleted file mode 100644
index 0bb50cb38..000000000
Binary files a/data/icons/mp3-0.jpg and /dev/null differ
diff --git a/data/icons/mp3-1.jpg b/data/icons/mp3-1.jpg
deleted file mode 100644
index 6c0294f90..000000000
Binary files a/data/icons/mp3-1.jpg and /dev/null differ
diff --git a/data/icons/mp3-2.jpg b/data/icons/mp3-2.jpg
deleted file mode 100644
index ab1594883..000000000
Binary files a/data/icons/mp3-2.jpg and /dev/null differ
diff --git a/data/icons/mp3-3.jpg b/data/icons/mp3-3.jpg
deleted file mode 100644
index eed32fede..000000000
Binary files a/data/icons/mp3-3.jpg and /dev/null differ
diff --git a/data/icons/mp3-4.jpg b/data/icons/mp3-4.jpg
deleted file mode 100644
index 86ad3a372..000000000
Binary files a/data/icons/mp3-4.jpg and /dev/null differ
diff --git a/data/icons/mp3-5.jpg b/data/icons/mp3-5.jpg
deleted file mode 100644
index 3fa627a06..000000000
Binary files a/data/icons/mp3-5.jpg and /dev/null differ
diff --git a/data/icons/mp3-6.jpg b/data/icons/mp3-6.jpg
deleted file mode 100644
index 150aa866d..000000000
Binary files a/data/icons/mp3-6.jpg and /dev/null differ
diff --git a/data/icons/mp3-7.jpg b/data/icons/mp3-7.jpg
deleted file mode 100644
index c2bd4b5ed..000000000
Binary files a/data/icons/mp3-7.jpg and /dev/null differ
diff --git a/data/icons/notyet.png b/data/icons/notyet.png
deleted file mode 100644
index c22f319c3..000000000
Binary files a/data/icons/notyet.png and /dev/null differ
diff --git a/data/icons/radar/Makefile.am b/data/icons/radar/Makefile.am
new file mode 100644
index 000000000..96ed45e36
--- /dev/null
+++ b/data/icons/radar/Makefile.am
@@ -0,0 +1,15 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	radar.pal \
+	radar_red.pal \
+	radar0.raw \
+	radar1.raw \
+	radar2.raw \
+	radar3.raw \
+	radar4.raw \
+	radar5.raw \
+	radar6.raw \
+	radar7.raw \
+	radar8.raw \
+	radar9.raw
diff --git a/data/icons/radar.pal b/data/icons/radar/radar.pal
similarity index 100%
rename from data/icons/radar.pal
rename to data/icons/radar/radar.pal
diff --git a/data/icons/radar0.raw b/data/icons/radar/radar0.raw
similarity index 100%
rename from data/icons/radar0.raw
rename to data/icons/radar/radar0.raw
diff --git a/data/icons/radar1.raw b/data/icons/radar/radar1.raw
similarity index 100%
rename from data/icons/radar1.raw
rename to data/icons/radar/radar1.raw
diff --git a/data/icons/radar2.raw b/data/icons/radar/radar2.raw
similarity index 100%
rename from data/icons/radar2.raw
rename to data/icons/radar/radar2.raw
diff --git a/data/icons/radar3.raw b/data/icons/radar/radar3.raw
similarity index 100%
rename from data/icons/radar3.raw
rename to data/icons/radar/radar3.raw
diff --git a/data/icons/radar4.raw b/data/icons/radar/radar4.raw
similarity index 100%
rename from data/icons/radar4.raw
rename to data/icons/radar/radar4.raw
diff --git a/data/icons/radar5.raw b/data/icons/radar/radar5.raw
similarity index 100%
rename from data/icons/radar5.raw
rename to data/icons/radar/radar5.raw
diff --git a/data/icons/radar6.raw b/data/icons/radar/radar6.raw
similarity index 100%
rename from data/icons/radar6.raw
rename to data/icons/radar/radar6.raw
diff --git a/data/icons/radar7.raw b/data/icons/radar/radar7.raw
similarity index 100%
rename from data/icons/radar7.raw
rename to data/icons/radar/radar7.raw
diff --git a/data/icons/radar8.raw b/data/icons/radar/radar8.raw
similarity index 100%
rename from data/icons/radar8.raw
rename to data/icons/radar/radar8.raw
diff --git a/data/icons/radar9.raw b/data/icons/radar/radar9.raw
similarity index 100%
rename from data/icons/radar9.raw
rename to data/icons/radar/radar9.raw
diff --git a/data/icons/radar_red.pal b/data/icons/radar/radar_red.pal
similarity index 100%
rename from data/icons/radar_red.pal
rename to data/icons/radar/radar_red.pal
diff --git a/data/icons/slider/Makefile.am b/data/icons/slider/Makefile.am
new file mode 100644
index 000000000..ad3b0a21f
--- /dev/null
+++ b/data/icons/slider/Makefile.am
@@ -0,0 +1,9 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	volumebody.png \
+	volumeslider2.png \
+	volumeslider2alpha.png \
+	volumeslider2blue.png \
+	volumeslider2green.png \
+	volumeslider2red.png
diff --git a/data/icons/volumebody.png b/data/icons/slider/volumebody.png
similarity index 100%
rename from data/icons/volumebody.png
rename to data/icons/slider/volumebody.png
diff --git a/data/icons/volumeslider2.png b/data/icons/slider/volumeslider2.png
similarity index 100%
rename from data/icons/volumeslider2.png
rename to data/icons/slider/volumeslider2.png
diff --git a/data/icons/volumeslider2alpha.png b/data/icons/slider/volumeslider2alpha.png
similarity index 100%
rename from data/icons/volumeslider2alpha.png
rename to data/icons/slider/volumeslider2alpha.png
diff --git a/data/icons/volumeslider2blue.png b/data/icons/slider/volumeslider2blue.png
similarity index 100%
rename from data/icons/volumeslider2blue.png
rename to data/icons/slider/volumeslider2blue.png
diff --git a/data/icons/volumeslider2green.png b/data/icons/slider/volumeslider2green.png
similarity index 100%
rename from data/icons/volumeslider2green.png
rename to data/icons/slider/volumeslider2green.png
diff --git a/data/icons/volumeslider2red.png b/data/icons/slider/volumeslider2red.png
similarity index 100%
rename from data/icons/volumeslider2red.png
rename to data/icons/slider/volumeslider2red.png
diff --git a/data/icons/status/Makefile.am b/data/icons/status/Makefile.am
new file mode 100644
index 000000000..82ae80b82
--- /dev/null
+++ b/data/icons/status/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = \
+	ca \
+	channel \
+	info \
+	markers \
+	progress \
+	various
diff --git a/data/icons/status/ca/Makefile.am b/data/icons/status/ca/Makefile.am
new file mode 100644
index 000000000..2da5da09e
--- /dev/null
+++ b/data/icons/status/ca/Makefile.am
@@ -0,0 +1,36 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	biss_green.png \
+	biss_white.png \
+	biss_yellow.png \
+	conax_green.png \
+	conax_white.png \
+	conax_yellow.png \
+	cw_green.png \
+	cw_white.png \
+	cw_yellow.png \
+	d_green.png \
+	d_white.png \
+	d_yellow.png \
+	ird_green.png \
+	ird_white.png \
+	ird_yellow.png \
+	nagra_green.png \
+	nagra_white.png \
+	nagra_yellow.png \
+	nds_green.png \
+	nds_white.png \
+	nds_yellow.png \
+	powervu_green.png \
+	powervu_white.png \
+	powervu_yellow.png \
+	seca_green.png \
+	seca_white.png \
+	seca_yellow.png \
+	via_green.png \
+	via_white.png \
+	via_yellow.png \
+	x_green.png \
+	x_white.png \
+	x_yellow.png
diff --git a/data/icons/biss_green.png b/data/icons/status/ca/biss_green.png
similarity index 100%
rename from data/icons/biss_green.png
rename to data/icons/status/ca/biss_green.png
diff --git a/data/icons/biss_white.png b/data/icons/status/ca/biss_white.png
similarity index 100%
rename from data/icons/biss_white.png
rename to data/icons/status/ca/biss_white.png
diff --git a/data/icons/biss_yellow.png b/data/icons/status/ca/biss_yellow.png
similarity index 100%
rename from data/icons/biss_yellow.png
rename to data/icons/status/ca/biss_yellow.png
diff --git a/data/icons/conax_green.png b/data/icons/status/ca/conax_green.png
similarity index 100%
rename from data/icons/conax_green.png
rename to data/icons/status/ca/conax_green.png
diff --git a/data/icons/conax_white.png b/data/icons/status/ca/conax_white.png
similarity index 100%
rename from data/icons/conax_white.png
rename to data/icons/status/ca/conax_white.png
diff --git a/data/icons/conax_yellow.png b/data/icons/status/ca/conax_yellow.png
similarity index 100%
rename from data/icons/conax_yellow.png
rename to data/icons/status/ca/conax_yellow.png
diff --git a/data/icons/cw_green.png b/data/icons/status/ca/cw_green.png
similarity index 100%
rename from data/icons/cw_green.png
rename to data/icons/status/ca/cw_green.png
diff --git a/data/icons/cw_white.png b/data/icons/status/ca/cw_white.png
similarity index 100%
rename from data/icons/cw_white.png
rename to data/icons/status/ca/cw_white.png
diff --git a/data/icons/cw_yellow.png b/data/icons/status/ca/cw_yellow.png
similarity index 100%
rename from data/icons/cw_yellow.png
rename to data/icons/status/ca/cw_yellow.png
diff --git a/data/icons/d_green.png b/data/icons/status/ca/d_green.png
similarity index 100%
rename from data/icons/d_green.png
rename to data/icons/status/ca/d_green.png
diff --git a/data/icons/d_white.png b/data/icons/status/ca/d_white.png
similarity index 100%
rename from data/icons/d_white.png
rename to data/icons/status/ca/d_white.png
diff --git a/data/icons/d_yellow.png b/data/icons/status/ca/d_yellow.png
similarity index 100%
rename from data/icons/d_yellow.png
rename to data/icons/status/ca/d_yellow.png
diff --git a/data/icons/ird_green.png b/data/icons/status/ca/ird_green.png
similarity index 100%
rename from data/icons/ird_green.png
rename to data/icons/status/ca/ird_green.png
diff --git a/data/icons/ird_white.png b/data/icons/status/ca/ird_white.png
similarity index 100%
rename from data/icons/ird_white.png
rename to data/icons/status/ca/ird_white.png
diff --git a/data/icons/ird_yellow.png b/data/icons/status/ca/ird_yellow.png
similarity index 100%
rename from data/icons/ird_yellow.png
rename to data/icons/status/ca/ird_yellow.png
diff --git a/data/icons/nagra_green.png b/data/icons/status/ca/nagra_green.png
similarity index 100%
rename from data/icons/nagra_green.png
rename to data/icons/status/ca/nagra_green.png
diff --git a/data/icons/nagra_white.png b/data/icons/status/ca/nagra_white.png
similarity index 100%
rename from data/icons/nagra_white.png
rename to data/icons/status/ca/nagra_white.png
diff --git a/data/icons/nagra_yellow.png b/data/icons/status/ca/nagra_yellow.png
similarity index 100%
rename from data/icons/nagra_yellow.png
rename to data/icons/status/ca/nagra_yellow.png
diff --git a/data/icons/nds_green.png b/data/icons/status/ca/nds_green.png
similarity index 100%
rename from data/icons/nds_green.png
rename to data/icons/status/ca/nds_green.png
diff --git a/data/icons/nds_white.png b/data/icons/status/ca/nds_white.png
similarity index 100%
rename from data/icons/nds_white.png
rename to data/icons/status/ca/nds_white.png
diff --git a/data/icons/nds_yellow.png b/data/icons/status/ca/nds_yellow.png
similarity index 100%
rename from data/icons/nds_yellow.png
rename to data/icons/status/ca/nds_yellow.png
diff --git a/data/icons/powervu_green.png b/data/icons/status/ca/powervu_green.png
similarity index 100%
rename from data/icons/powervu_green.png
rename to data/icons/status/ca/powervu_green.png
diff --git a/data/icons/powervu_white.png b/data/icons/status/ca/powervu_white.png
similarity index 100%
rename from data/icons/powervu_white.png
rename to data/icons/status/ca/powervu_white.png
diff --git a/data/icons/powervu_yellow.png b/data/icons/status/ca/powervu_yellow.png
similarity index 100%
rename from data/icons/powervu_yellow.png
rename to data/icons/status/ca/powervu_yellow.png
diff --git a/data/icons/seca_green.png b/data/icons/status/ca/seca_green.png
similarity index 100%
rename from data/icons/seca_green.png
rename to data/icons/status/ca/seca_green.png
diff --git a/data/icons/seca_white.png b/data/icons/status/ca/seca_white.png
similarity index 100%
rename from data/icons/seca_white.png
rename to data/icons/status/ca/seca_white.png
diff --git a/data/icons/seca_yellow.png b/data/icons/status/ca/seca_yellow.png
similarity index 100%
rename from data/icons/seca_yellow.png
rename to data/icons/status/ca/seca_yellow.png
diff --git a/data/icons/via_green.png b/data/icons/status/ca/via_green.png
similarity index 100%
rename from data/icons/via_green.png
rename to data/icons/status/ca/via_green.png
diff --git a/data/icons/via_white.png b/data/icons/status/ca/via_white.png
similarity index 100%
rename from data/icons/via_white.png
rename to data/icons/status/ca/via_white.png
diff --git a/data/icons/via_yellow.png b/data/icons/status/ca/via_yellow.png
similarity index 100%
rename from data/icons/via_yellow.png
rename to data/icons/status/ca/via_yellow.png
diff --git a/data/icons/x_green.png b/data/icons/status/ca/x_green.png
similarity index 100%
rename from data/icons/x_green.png
rename to data/icons/status/ca/x_green.png
diff --git a/data/icons/x_white.png b/data/icons/status/ca/x_white.png
similarity index 100%
rename from data/icons/x_white.png
rename to data/icons/status/ca/x_white.png
diff --git a/data/icons/x_yellow.png b/data/icons/status/ca/x_yellow.png
similarity index 100%
rename from data/icons/x_yellow.png
rename to data/icons/status/ca/x_yellow.png
diff --git a/data/icons/16_9.png b/data/icons/status/channel/16_9.png
similarity index 100%
rename from data/icons/16_9.png
rename to data/icons/status/channel/16_9.png
diff --git a/data/icons/16_9_gray.png b/data/icons/status/channel/16_9_gray.png
similarity index 100%
rename from data/icons/16_9_gray.png
rename to data/icons/status/channel/16_9_gray.png
diff --git a/data/icons/status/channel/Makefile.am b/data/icons/status/channel/Makefile.am
new file mode 100644
index 000000000..13e953abc
--- /dev/null
+++ b/data/icons/status/channel/Makefile.am
@@ -0,0 +1,37 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	16_9.png \
+	16_9_gray.png \
+	ca2.png \
+	ca2_gray.png \
+	dd.png \
+	dd_avail.png \
+	dd_gray.png \
+	radiotextget.png \
+	radiotextoff.png \
+	radiotextwait.png \
+	res_000.png \
+	res_1080.png \
+	res_1280.png \
+	res_1440.png \
+	res_1920.png \
+	res_288.png \
+	res_352.png \
+	res_382.png \
+	res_480.png \
+	res_528.png \
+	res_544.png \
+	res_576.png \
+	res_704.png \
+	res_720.png \
+	res_hd.png \
+	res_sd.png \
+	subt.png \
+	subt_gray.png \
+	tuner_1.png \
+	tuner_2.png \
+	tuner_3.png \
+	tuner_4.png \
+	vtxt.png \
+	vtxt_gray.png
diff --git a/data/icons/ca2.png b/data/icons/status/channel/ca2.png
similarity index 100%
rename from data/icons/ca2.png
rename to data/icons/status/channel/ca2.png
diff --git a/data/icons/ca2_gray.png b/data/icons/status/channel/ca2_gray.png
similarity index 100%
rename from data/icons/ca2_gray.png
rename to data/icons/status/channel/ca2_gray.png
diff --git a/data/icons/dd.png b/data/icons/status/channel/dd.png
similarity index 100%
rename from data/icons/dd.png
rename to data/icons/status/channel/dd.png
diff --git a/data/icons/dd_avail.png b/data/icons/status/channel/dd_avail.png
similarity index 100%
rename from data/icons/dd_avail.png
rename to data/icons/status/channel/dd_avail.png
diff --git a/data/icons/dd_gray.png b/data/icons/status/channel/dd_gray.png
similarity index 100%
rename from data/icons/dd_gray.png
rename to data/icons/status/channel/dd_gray.png
diff --git a/data/icons/radiotextget.png b/data/icons/status/channel/radiotextget.png
similarity index 100%
rename from data/icons/radiotextget.png
rename to data/icons/status/channel/radiotextget.png
diff --git a/data/icons/radiotextoff.png b/data/icons/status/channel/radiotextoff.png
similarity index 100%
rename from data/icons/radiotextoff.png
rename to data/icons/status/channel/radiotextoff.png
diff --git a/data/icons/radiotextwait.png b/data/icons/status/channel/radiotextwait.png
similarity index 100%
rename from data/icons/radiotextwait.png
rename to data/icons/status/channel/radiotextwait.png
diff --git a/data/icons/res_000.png b/data/icons/status/channel/res_000.png
similarity index 100%
rename from data/icons/res_000.png
rename to data/icons/status/channel/res_000.png
diff --git a/data/icons/res_1080.png b/data/icons/status/channel/res_1080.png
similarity index 100%
rename from data/icons/res_1080.png
rename to data/icons/status/channel/res_1080.png
diff --git a/data/icons/res_1280.png b/data/icons/status/channel/res_1280.png
similarity index 100%
rename from data/icons/res_1280.png
rename to data/icons/status/channel/res_1280.png
diff --git a/data/icons/res_1440.png b/data/icons/status/channel/res_1440.png
similarity index 100%
rename from data/icons/res_1440.png
rename to data/icons/status/channel/res_1440.png
diff --git a/data/icons/res_1920.png b/data/icons/status/channel/res_1920.png
similarity index 100%
rename from data/icons/res_1920.png
rename to data/icons/status/channel/res_1920.png
diff --git a/data/icons/res_288.png b/data/icons/status/channel/res_288.png
similarity index 100%
rename from data/icons/res_288.png
rename to data/icons/status/channel/res_288.png
diff --git a/data/icons/res_352.png b/data/icons/status/channel/res_352.png
similarity index 100%
rename from data/icons/res_352.png
rename to data/icons/status/channel/res_352.png
diff --git a/data/icons/res_382.png b/data/icons/status/channel/res_382.png
similarity index 100%
rename from data/icons/res_382.png
rename to data/icons/status/channel/res_382.png
diff --git a/data/icons/res_480.png b/data/icons/status/channel/res_480.png
similarity index 100%
rename from data/icons/res_480.png
rename to data/icons/status/channel/res_480.png
diff --git a/data/icons/res_528.png b/data/icons/status/channel/res_528.png
similarity index 100%
rename from data/icons/res_528.png
rename to data/icons/status/channel/res_528.png
diff --git a/data/icons/res_544.png b/data/icons/status/channel/res_544.png
similarity index 100%
rename from data/icons/res_544.png
rename to data/icons/status/channel/res_544.png
diff --git a/data/icons/res_576.png b/data/icons/status/channel/res_576.png
similarity index 100%
rename from data/icons/res_576.png
rename to data/icons/status/channel/res_576.png
diff --git a/data/icons/res_704.png b/data/icons/status/channel/res_704.png
similarity index 100%
rename from data/icons/res_704.png
rename to data/icons/status/channel/res_704.png
diff --git a/data/icons/res_720.png b/data/icons/status/channel/res_720.png
similarity index 100%
rename from data/icons/res_720.png
rename to data/icons/status/channel/res_720.png
diff --git a/data/icons/res_hd.png b/data/icons/status/channel/res_hd.png
similarity index 100%
rename from data/icons/res_hd.png
rename to data/icons/status/channel/res_hd.png
diff --git a/data/icons/res_sd.png b/data/icons/status/channel/res_sd.png
similarity index 100%
rename from data/icons/res_sd.png
rename to data/icons/status/channel/res_sd.png
diff --git a/data/icons/subt.png b/data/icons/status/channel/subt.png
similarity index 100%
rename from data/icons/subt.png
rename to data/icons/status/channel/subt.png
diff --git a/data/icons/subt_gray.png b/data/icons/status/channel/subt_gray.png
similarity index 100%
rename from data/icons/subt_gray.png
rename to data/icons/status/channel/subt_gray.png
diff --git a/data/icons/tuner_1.png b/data/icons/status/channel/tuner_1.png
similarity index 100%
rename from data/icons/tuner_1.png
rename to data/icons/status/channel/tuner_1.png
diff --git a/data/icons/tuner_2.png b/data/icons/status/channel/tuner_2.png
similarity index 100%
rename from data/icons/tuner_2.png
rename to data/icons/status/channel/tuner_2.png
diff --git a/data/icons/tuner_3.png b/data/icons/status/channel/tuner_3.png
similarity index 100%
rename from data/icons/tuner_3.png
rename to data/icons/status/channel/tuner_3.png
diff --git a/data/icons/tuner_4.png b/data/icons/status/channel/tuner_4.png
similarity index 100%
rename from data/icons/tuner_4.png
rename to data/icons/status/channel/tuner_4.png
diff --git a/data/icons/vtxt.png b/data/icons/status/channel/vtxt.png
similarity index 100%
rename from data/icons/vtxt.png
rename to data/icons/status/channel/vtxt.png
diff --git a/data/icons/vtxt_gray.png b/data/icons/status/channel/vtxt_gray.png
similarity index 100%
rename from data/icons/vtxt_gray.png
rename to data/icons/status/channel/vtxt_gray.png
diff --git a/data/icons/status/info/Makefile.am b/data/icons/status/info/Makefile.am
new file mode 100644
index 000000000..2753cb3d8
--- /dev/null
+++ b/data/icons/status/info/Makefile.am
@@ -0,0 +1,12 @@
+installdir = $(ICONSDIR)
+
+# NI Infoicons
+install_DATA = \
+	info0_off.png \
+	info0_on.png \
+	info1_off.png \
+	info1_on.png \
+	info2_off.png \
+	info2_on.png \
+	info3_off.png \
+	info3_on.png
diff --git a/data/icons/info0_off.png b/data/icons/status/info/info0_off.png
similarity index 100%
rename from data/icons/info0_off.png
rename to data/icons/status/info/info0_off.png
diff --git a/data/icons/info0_on.png b/data/icons/status/info/info0_on.png
similarity index 100%
rename from data/icons/info0_on.png
rename to data/icons/status/info/info0_on.png
diff --git a/data/icons/info1_off.png b/data/icons/status/info/info1_off.png
similarity index 100%
rename from data/icons/info1_off.png
rename to data/icons/status/info/info1_off.png
diff --git a/data/icons/info1_on.png b/data/icons/status/info/info1_on.png
similarity index 100%
rename from data/icons/info1_on.png
rename to data/icons/status/info/info1_on.png
diff --git a/data/icons/info2_off.png b/data/icons/status/info/info2_off.png
similarity index 100%
rename from data/icons/info2_off.png
rename to data/icons/status/info/info2_off.png
diff --git a/data/icons/info2_on.png b/data/icons/status/info/info2_on.png
similarity index 100%
rename from data/icons/info2_on.png
rename to data/icons/status/info/info2_on.png
diff --git a/data/icons/info3_off.png b/data/icons/status/info/info3_off.png
similarity index 100%
rename from data/icons/info3_off.png
rename to data/icons/status/info/info3_off.png
diff --git a/data/icons/info3_on.png b/data/icons/status/info/info3_on.png
similarity index 100%
rename from data/icons/info3_on.png
rename to data/icons/status/info/info3_on.png
diff --git a/data/icons/status/markers/Makefile.am b/data/icons/status/markers/Makefile.am
new file mode 100644
index 000000000..0a6cb8725
--- /dev/null
+++ b/data/icons/status/markers/Makefile.am
@@ -0,0 +1,6 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	checkmark.png \
+	important.png \
+	warning.png
diff --git a/data/icons/checkmark.png b/data/icons/status/markers/checkmark.png
old mode 100755
new mode 100644
similarity index 100%
rename from data/icons/checkmark.png
rename to data/icons/status/markers/checkmark.png
diff --git a/data/icons/important.png b/data/icons/status/markers/important.png
similarity index 100%
rename from data/icons/important.png
rename to data/icons/status/markers/important.png
diff --git a/data/icons/warning.png b/data/icons/status/markers/warning.png
similarity index 100%
rename from data/icons/warning.png
rename to data/icons/status/markers/warning.png
diff --git a/data/icons/status/progress/Makefile.am b/data/icons/status/progress/Makefile.am
new file mode 100644
index 000000000..7cbe2b5f1
--- /dev/null
+++ b/data/icons/status/progress/Makefile.am
@@ -0,0 +1,8 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	progressbar.png \
+	progressbar_inactive_passive.png \
+	progressbar_passive.png \
+	volumebar.png \
+	volumebar_passive.png
diff --git a/data/icons/progressbar.png b/data/icons/status/progress/progressbar.png
similarity index 100%
rename from data/icons/progressbar.png
rename to data/icons/status/progress/progressbar.png
diff --git a/data/icons/progressbar_inactive_passive.png b/data/icons/status/progress/progressbar_inactive_passive.png
similarity index 100%
rename from data/icons/progressbar_inactive_passive.png
rename to data/icons/status/progress/progressbar_inactive_passive.png
diff --git a/data/icons/progressbar_passive.png b/data/icons/status/progress/progressbar_passive.png
similarity index 100%
rename from data/icons/progressbar_passive.png
rename to data/icons/status/progress/progressbar_passive.png
diff --git a/data/icons/volumebar.png b/data/icons/status/progress/volumebar.png
similarity index 100%
rename from data/icons/volumebar.png
rename to data/icons/status/progress/volumebar.png
diff --git a/data/icons/volumebar_passive.png b/data/icons/status/progress/volumebar_passive.png
similarity index 100%
rename from data/icons/volumebar_passive.png
rename to data/icons/status/progress/volumebar_passive.png
diff --git a/data/icons/status/various/Makefile.am b/data/icons/status/various/Makefile.am
new file mode 100644
index 000000000..900ba7931
--- /dev/null
+++ b/data/icons/status/various/Makefile.am
@@ -0,0 +1,19 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	ats.png \
+	ats_gray.png \
+	ca.png \
+	epg.png \
+	hidden.png \
+	lock.png \
+	lock_passive.png \
+	mounted.png \
+	mute.png \
+	not_mounted.png \
+	pip.png \
+	rclock.png \
+	rec.png \
+	rec_event_marker.png \
+	rec_gray.png \
+	zap.png
diff --git a/data/icons/ats.png b/data/icons/status/various/ats.png
similarity index 100%
rename from data/icons/ats.png
rename to data/icons/status/various/ats.png
diff --git a/data/icons/ats_gray.png b/data/icons/status/various/ats_gray.png
similarity index 100%
rename from data/icons/ats_gray.png
rename to data/icons/status/various/ats_gray.png
diff --git a/data/icons/ca.png b/data/icons/status/various/ca.png
similarity index 100%
rename from data/icons/ca.png
rename to data/icons/status/various/ca.png
diff --git a/data/icons/epg.png b/data/icons/status/various/epg.png
similarity index 100%
rename from data/icons/epg.png
rename to data/icons/status/various/epg.png
diff --git a/data/icons/hidden.png b/data/icons/status/various/hidden.png
similarity index 100%
rename from data/icons/hidden.png
rename to data/icons/status/various/hidden.png
diff --git a/data/icons/lock.png b/data/icons/status/various/lock.png
similarity index 100%
rename from data/icons/lock.png
rename to data/icons/status/various/lock.png
diff --git a/data/icons/lock_passive.png b/data/icons/status/various/lock_passive.png
similarity index 100%
rename from data/icons/lock_passive.png
rename to data/icons/status/various/lock_passive.png
diff --git a/data/icons/mounted.png b/data/icons/status/various/mounted.png
similarity index 100%
rename from data/icons/mounted.png
rename to data/icons/status/various/mounted.png
diff --git a/data/icons/mute.png b/data/icons/status/various/mute.png
similarity index 100%
rename from data/icons/mute.png
rename to data/icons/status/various/mute.png
diff --git a/data/icons/not_mounted.png b/data/icons/status/various/not_mounted.png
similarity index 100%
rename from data/icons/not_mounted.png
rename to data/icons/status/various/not_mounted.png
diff --git a/data/icons/pip.png b/data/icons/status/various/pip.png
similarity index 100%
rename from data/icons/pip.png
rename to data/icons/status/various/pip.png
diff --git a/data/icons/rclock.png b/data/icons/status/various/rclock.png
similarity index 100%
rename from data/icons/rclock.png
rename to data/icons/status/various/rclock.png
diff --git a/data/icons/rec.png b/data/icons/status/various/rec.png
similarity index 100%
rename from data/icons/rec.png
rename to data/icons/status/various/rec.png
diff --git a/data/icons/rec_event_marker.png b/data/icons/status/various/rec_event_marker.png
similarity index 100%
rename from data/icons/rec_event_marker.png
rename to data/icons/status/various/rec_event_marker.png
diff --git a/data/icons/rec_gray.png b/data/icons/status/various/rec_gray.png
similarity index 100%
rename from data/icons/rec_gray.png
rename to data/icons/status/various/rec_gray.png
diff --git a/data/icons/zap.png b/data/icons/status/various/zap.png
old mode 100755
new mode 100644
similarity index 100%
rename from data/icons/zap.png
rename to data/icons/status/various/zap.png
diff --git a/data/icons/various/Makefile.am b/data/icons/various/Makefile.am
new file mode 100644
index 000000000..797e8996f
--- /dev/null
+++ b/data/icons/various/Makefile.am
@@ -0,0 +1,14 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	border_lr.png \
+	border_ul.png \
+	clock_face.png \
+	imdb.png \
+	numericpad.png \
+	star-off.png \
+	star-on.png \
+	stars.png \
+	stars_bg.png \
+	tmdb.png \
+	volume.png
diff --git a/data/icons/border_lr.png b/data/icons/various/border_lr.png
similarity index 100%
rename from data/icons/border_lr.png
rename to data/icons/various/border_lr.png
diff --git a/data/icons/border_ul.png b/data/icons/various/border_ul.png
similarity index 100%
rename from data/icons/border_ul.png
rename to data/icons/various/border_ul.png
diff --git a/data/icons/clock_face.png b/data/icons/various/clock_face.png
similarity index 100%
rename from data/icons/clock_face.png
rename to data/icons/various/clock_face.png
diff --git a/data/icons/imdb.png b/data/icons/various/imdb.png
similarity index 100%
rename from data/icons/imdb.png
rename to data/icons/various/imdb.png
diff --git a/data/icons/numericpad.png b/data/icons/various/numericpad.png
similarity index 100%
rename from data/icons/numericpad.png
rename to data/icons/various/numericpad.png
diff --git a/data/icons/rass.png b/data/icons/various/rass.png
similarity index 100%
rename from data/icons/rass.png
rename to data/icons/various/rass.png
diff --git a/data/icons/star-off.png b/data/icons/various/star-off.png
similarity index 100%
rename from data/icons/star-off.png
rename to data/icons/various/star-off.png
diff --git a/data/icons/star-on.png b/data/icons/various/star-on.png
similarity index 100%
rename from data/icons/star-on.png
rename to data/icons/various/star-on.png
diff --git a/data/icons/stars.png b/data/icons/various/stars.png
similarity index 100%
rename from data/icons/stars.png
rename to data/icons/various/stars.png
diff --git a/data/icons/stars_bg.png b/data/icons/various/stars_bg.png
similarity index 100%
rename from data/icons/stars_bg.png
rename to data/icons/various/stars_bg.png
diff --git a/data/icons/tmdb.png b/data/icons/various/tmdb.png
similarity index 100%
rename from data/icons/tmdb.png
rename to data/icons/various/tmdb.png
diff --git a/data/icons/volume.png b/data/icons/various/volume.png
similarity index 100%
rename from data/icons/volume.png
rename to data/icons/various/volume.png
diff --git a/data/pictures/Makefile.am b/data/pictures/Makefile.am
new file mode 100644
index 000000000..a264ce47b
--- /dev/null
+++ b/data/pictures/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	backgrounds \
+	screensaver
diff --git a/data/icons/mp3.jpg b/data/pictures/backgrounds/1280x720/mp3.jpg
similarity index 100%
rename from data/icons/mp3.jpg
rename to data/pictures/backgrounds/1280x720/mp3.jpg
diff --git a/data/icons/radiomode.jpg b/data/pictures/backgrounds/1280x720/radiomode.jpg
similarity index 100%
rename from data/icons/radiomode.jpg
rename to data/pictures/backgrounds/1280x720/radiomode.jpg
diff --git a/data/icons/scan.jpg b/data/pictures/backgrounds/1280x720/scan.jpg
similarity index 100%
rename from data/icons/scan.jpg
rename to data/pictures/backgrounds/1280x720/scan.jpg
diff --git a/data/icons/shutdown.jpg b/data/pictures/backgrounds/1280x720/shutdown.jpg
similarity index 100%
rename from data/icons/shutdown.jpg
rename to data/pictures/backgrounds/1280x720/shutdown.jpg
diff --git a/data/icons/start.jpg b/data/pictures/backgrounds/1280x720/start.jpg
similarity index 100%
rename from data/icons/start.jpg
rename to data/pictures/backgrounds/1280x720/start.jpg
diff --git a/data/pictures/backgrounds/Makefile.am b/data/pictures/backgrounds/Makefile.am
new file mode 100644
index 000000000..bff2e1b4f
--- /dev/null
+++ b/data/pictures/backgrounds/Makefile.am
@@ -0,0 +1,10 @@
+installdir = $(ICONSDIR)
+
+resolution = 1280x720
+
+install_DATA = \
+	$(resolution)/mp3.jpg \
+	$(resolution)/radiomode.jpg \
+	$(resolution)/scan.jpg \
+	$(resolution)/shutdown.jpg \
+	$(resolution)/start.jpg
diff --git a/data/icons/screensaver/black.jpg b/data/pictures/screensaver/1280x720/black.jpg
similarity index 100%
rename from data/icons/screensaver/black.jpg
rename to data/pictures/screensaver/1280x720/black.jpg
diff --git a/data/icons/screensaver/Makefile.am b/data/pictures/screensaver/Makefile.am
similarity index 53%
rename from data/icons/screensaver/Makefile.am
rename to data/pictures/screensaver/Makefile.am
index ac90de4f6..07b3b90b2 100644
--- a/data/icons/screensaver/Makefile.am
+++ b/data/pictures/screensaver/Makefile.am
@@ -1,4 +1,6 @@
 installdir = $(ICONSDIR)/screensaver
 
+resolution = 1280x720
+
 install_DATA = \
-	black.jpg
+	$(resolution)/black.jpg
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 7be3dc15a..4b60711eb 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -394,7 +394,7 @@ void CComponentsHeader::initClock()
 	//set clock form properties
 	if (cch_cl_obj){
 		cch_cl_obj->setYPos(cch_items_y);
-		cch_cl_obj->setHeight(height - 1); //NI
+		cch_cl_obj->setHeight(height);
 
 		//disallow paint of clock, if disabled and exit method
 		if (!cch_cl_enable){