diff --git a/data/icons/0.png b/data/icons/0.png
new file mode 100644
index 000000000..a47544a19
Binary files /dev/null and b/data/icons/0.png differ
diff --git a/data/icons/0.raw b/data/icons/0.raw
deleted file mode 100644
index 4c7cad03c..000000000
Binary files a/data/icons/0.raw and /dev/null differ
diff --git a/data/icons/1.png b/data/icons/1.png
new file mode 100644
index 000000000..0c628b52d
Binary files /dev/null and b/data/icons/1.png differ
diff --git a/data/icons/1.raw b/data/icons/1.raw
deleted file mode 100644
index 97d379fdd..000000000
Binary files a/data/icons/1.raw and /dev/null differ
diff --git a/data/icons/16_9.png b/data/icons/16_9.png
new file mode 100644
index 000000000..43a80af50
Binary files /dev/null and b/data/icons/16_9.png differ
diff --git a/data/icons/16_9.raw b/data/icons/16_9.raw
deleted file mode 100644
index 1dfd0a709..000000000
Binary files a/data/icons/16_9.raw and /dev/null differ
diff --git a/data/icons/16_9_gray.png b/data/icons/16_9_gray.png
new file mode 100644
index 000000000..4798861bf
Binary files /dev/null and b/data/icons/16_9_gray.png differ
diff --git a/data/icons/16_9_gray.raw b/data/icons/16_9_gray.raw
deleted file mode 100644
index cef4c4882..000000000
Binary files a/data/icons/16_9_gray.raw and /dev/null differ
diff --git a/data/icons/2.png b/data/icons/2.png
new file mode 100644
index 000000000..5ff96b693
Binary files /dev/null and b/data/icons/2.png differ
diff --git a/data/icons/2.raw b/data/icons/2.raw
deleted file mode 100644
index 9e37b1efe..000000000
Binary files a/data/icons/2.raw and /dev/null differ
diff --git a/data/icons/3.png b/data/icons/3.png
new file mode 100644
index 000000000..5f46ab34a
Binary files /dev/null and b/data/icons/3.png differ
diff --git a/data/icons/3.raw b/data/icons/3.raw
deleted file mode 100644
index 41e7b42ec..000000000
Binary files a/data/icons/3.raw and /dev/null differ
diff --git a/data/icons/4.png b/data/icons/4.png
new file mode 100644
index 000000000..0ec4036ae
Binary files /dev/null and b/data/icons/4.png differ
diff --git a/data/icons/4.raw b/data/icons/4.raw
deleted file mode 100644
index ed31f741e..000000000
Binary files a/data/icons/4.raw and /dev/null differ
diff --git a/data/icons/5.png b/data/icons/5.png
new file mode 100644
index 000000000..4fde6be77
Binary files /dev/null and b/data/icons/5.png differ
diff --git a/data/icons/5.raw b/data/icons/5.raw
deleted file mode 100644
index c8208aafc..000000000
Binary files a/data/icons/5.raw and /dev/null differ
diff --git a/data/icons/6.png b/data/icons/6.png
new file mode 100644
index 000000000..567466765
Binary files /dev/null and b/data/icons/6.png differ
diff --git a/data/icons/6.raw b/data/icons/6.raw
deleted file mode 100644
index 59cc4da33..000000000
Binary files a/data/icons/6.raw and /dev/null differ
diff --git a/data/icons/7.png b/data/icons/7.png
new file mode 100644
index 000000000..f743fa2cb
Binary files /dev/null and b/data/icons/7.png differ
diff --git a/data/icons/7.raw b/data/icons/7.raw
deleted file mode 100644
index 539ae0ffe..000000000
Binary files a/data/icons/7.raw and /dev/null differ
diff --git a/data/icons/8.png b/data/icons/8.png
new file mode 100644
index 000000000..da75df7d5
Binary files /dev/null and b/data/icons/8.png differ
diff --git a/data/icons/8.raw b/data/icons/8.raw
deleted file mode 100644
index 544f7cf02..000000000
Binary files a/data/icons/8.raw and /dev/null differ
diff --git a/data/icons/9.png b/data/icons/9.png
new file mode 100644
index 000000000..97020c6ac
Binary files /dev/null and b/data/icons/9.png differ
diff --git a/data/icons/9.raw b/data/icons/9.raw
deleted file mode 100644
index 309abc74f..000000000
Binary files a/data/icons/9.raw and /dev/null differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index c1e5ff81e..3d82860af 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,29 +1,39 @@
 installdir = $(DATADIR)/neutrino/icons
 
 install_DATA = \
-	16_9.raw 16_9_gray.raw audio.raw blau.raw border_lr.raw border_ul.raw \
-	colors.raw dbox.raw dd.raw dd_avail.raw dd_gray.raw error.raw features.raw \
-	file.raw folder.raw games.raw gelb.raw gruen.raw help.raw help_small.raw \
-	home.raw info.raw keybinding.raw language.raw lcd.raw lock.raw mainmenue.raw \
-	mounted.raw mute.raw network.raw not_mounted.raw numericpad.raw ok.raw power.raw \
-	radar0.raw radar1.raw radar2.raw radar3.raw radar4.raw radar5.raw radar6.raw \
-	radar7.raw radar8.raw radar9.raw recording.raw \
-	rot.raw settings.raw shell.raw softupdate.raw \
-	streaming.raw timer.raw video.raw volume.raw volumebody.raw volumeslider2.raw \
-	volumeslider2alpha.raw volumeslider2blue.raw volumeslider2green.raw \
-	volumeslider2red.raw vtxt.raw vtxt_gray.raw movie.raw movieplayer.raw \
-	hidden.raw bookmarkmanager.raw mute_small.raw dbox_small.raw \
-	0.raw 1.raw 2.raw 3.raw 4.raw 5.raw 6.raw 7.raw 8.raw 9.raw \
-	up.raw right.raw down.raw left.raw fta.raw ca.raw \
-	16.raw b16.raw b2.raw b3.raw ca.gif card.raw card_gray.raw card_green.raw ddfill.raw \
-	deutsch.gif dutch.gif ellinika.gif english.gif french.gif hungarian.gif italiano.gif \
-	language.gif polski.gif portugues.gif romania.gif russkij.gif local.raw \
-	mainmenue.gif mute_zap_gray.raw mute_zap_green.raw notyet.raw \
-	power_white.raw pv_gray.raw x_green.raw x_white.raw x_yellow.raw \
+	0.png 1.png 2.png 3.png 4.png 5.png 6.png 7.png 8.png 9.png \
+	16_9.png 16_9_gray.png \
+	audio.png \
+	fta.raw 16.raw b16.raw b2.raw b3.raw \
+	bayrisch.png ch-baslerdeutsch.png ch-berndeutsch.png deutsch.png dutch.png \
+	ellinika.png english.png francais.png french.png hungarian.png italiano.png \
+	polski.png portugues.png romania.png russkij.png netherlands.png suomi.png svenska.png \
+	language.png \
+	blau.png gelb.png gruen.png rot.png \
+	bookmarkmanager.png border_lr.png border_ul.png \
+	ca.png \
+	card.raw card_gray.raw card_green.raw \
+	colors.png dbox.png dbox_small.png \
+	dd.png dd_avail.png dd_gray.png ddfill.png \
+	down.png up.png right.png left.png \
+	error.png features.png file.png folder.png games.png \
+	help.png help_small.png hidden.png home.png info.png \
+	keybinding.png lcd.png local.png lock.png mainmenue.png \
+	mounted.png movie.png \
+	movieplayer.raw \
+	mp3.png mute.png mute_small.png mute_zap_gray.png mute_zap_green.png \
+	network.png not_mounted.png notyet.png numericpad.png ok.png power.png \
+	radar.pal radar0.raw radar1.raw radar2.raw radar3.raw radar4.raw \
+	radar5.raw radar6.raw radar7.raw radar8.raw radar9.raw \
+	recording.png settings.png shell.png softupdate.png streaming.png \
+	subt.png subt_gray.png timer.png video.png \
+	volume.png volumebody.png volumeslider2.png volumeslider2alpha.png \
+	volumeslider2blue.png volumeslider2green.png volumeslider2red.png \
+	vtxt.png vtxt_gray.png \
+	x_green.raw x_white.raw x_yellow.raw \
 	mp3.jpg mp3-0.jpg mp3-1.jpg mp3-2.jpg mp3-3.jpg mp3-4.jpg mp3-5.jpg mp3-6.jpg mp3-7.jpg \
 	radiomode.jpg scan.jpg shutdown.jpg start.jpg \
 	net.raw net_gray.raw net_green.raw \
-	subt.raw subt_gray.raw mp3.raw \
 	biss.raw biss_gray.raw biss_green.raw biss_white.raw biss_yellow.raw \
 	conax.raw conax_gray.raw conax_green.raw conax_white.raw conax_yellow.raw \
 	cw.raw cw_gray.raw cw_green.raw cw_white.raw cw_yellow.raw \
@@ -31,6 +41,6 @@ install_DATA = \
 	ird.raw ird_gray.raw ird_green.raw ird_white.raw ird_yellow.raw \
 	nagra.raw nagra_gray.raw nagra_green.raw nagra_white.raw nagra_yellow.raw \
 	nds.raw nds_gray.raw nds_green.raw nds_white.raw nds_yellow.raw \
-	powervu_green.raw powervu_white.raw powervu_yellow.raw \
+	power_white.raw pv_gray.raw powervu_green.raw powervu_white.raw powervu_yellow.raw \
 	seca.raw seca_gray.raw seca_green.raw seca_white.raw seca_yellow.raw \
 	via.raw via_gray.raw via_green.raw via_white.raw via_yellow.raw
diff --git a/data/icons/audio.png b/data/icons/audio.png
new file mode 100644
index 000000000..dd46d40bb
Binary files /dev/null and b/data/icons/audio.png differ
diff --git a/data/icons/audio.raw b/data/icons/audio.raw
deleted file mode 100644
index f90b8c1c6..000000000
Binary files a/data/icons/audio.raw and /dev/null differ
diff --git a/data/icons/bayrisch.png b/data/icons/bayrisch.png
new file mode 100644
index 000000000..e3c1b08ac
Binary files /dev/null and b/data/icons/bayrisch.png differ
diff --git a/data/icons/blau.png b/data/icons/blau.png
new file mode 100644
index 000000000..dbb25f2e8
Binary files /dev/null and b/data/icons/blau.png differ
diff --git a/data/icons/blau.raw b/data/icons/blau.raw
deleted file mode 100644
index 6514d89c2..000000000
Binary files a/data/icons/blau.raw and /dev/null differ
diff --git a/data/icons/bookmarkmanager.png b/data/icons/bookmarkmanager.png
new file mode 100644
index 000000000..1a3a27fc6
Binary files /dev/null and b/data/icons/bookmarkmanager.png differ
diff --git a/data/icons/bookmarkmanager.raw b/data/icons/bookmarkmanager.raw
deleted file mode 100755
index 788c83e40..000000000
Binary files a/data/icons/bookmarkmanager.raw and /dev/null differ
diff --git a/data/icons/border_lr.png b/data/icons/border_lr.png
new file mode 100644
index 000000000..473973377
Binary files /dev/null and b/data/icons/border_lr.png differ
diff --git a/data/icons/border_lr.raw b/data/icons/border_lr.raw
deleted file mode 100644
index 6124b20a8..000000000
Binary files a/data/icons/border_lr.raw and /dev/null differ
diff --git a/data/icons/border_ul.png b/data/icons/border_ul.png
new file mode 100644
index 000000000..b43bc8e77
Binary files /dev/null and b/data/icons/border_ul.png differ
diff --git a/data/icons/border_ul.raw b/data/icons/border_ul.raw
deleted file mode 100644
index 3393a7115..000000000
Binary files a/data/icons/border_ul.raw and /dev/null differ
diff --git a/data/icons/ca.gif b/data/icons/ca.gif
deleted file mode 100755
index 9ccfd470b..000000000
Binary files a/data/icons/ca.gif and /dev/null differ
diff --git a/data/icons/ca.png b/data/icons/ca.png
new file mode 100644
index 000000000..d1b57a1f9
Binary files /dev/null and b/data/icons/ca.png differ
diff --git a/data/icons/ca.raw b/data/icons/ca.raw
deleted file mode 100644
index 72e6921df..000000000
Binary files a/data/icons/ca.raw and /dev/null differ
diff --git a/data/icons/ch-baslerdeutsch.png b/data/icons/ch-baslerdeutsch.png
new file mode 100644
index 000000000..43b6af0b0
Binary files /dev/null and b/data/icons/ch-baslerdeutsch.png differ
diff --git a/data/icons/ch-berndeutsch.png b/data/icons/ch-berndeutsch.png
new file mode 100644
index 000000000..28062c3f3
Binary files /dev/null and b/data/icons/ch-berndeutsch.png differ
diff --git a/data/icons/colors.png b/data/icons/colors.png
new file mode 100644
index 000000000..3ea6c8d21
Binary files /dev/null and b/data/icons/colors.png differ
diff --git a/data/icons/colors.raw b/data/icons/colors.raw
deleted file mode 100644
index 04032bf79..000000000
Binary files a/data/icons/colors.raw and /dev/null differ
diff --git a/data/icons/dbox.png b/data/icons/dbox.png
new file mode 100644
index 000000000..c5a91af7a
Binary files /dev/null and b/data/icons/dbox.png differ
diff --git a/data/icons/dbox.raw b/data/icons/dbox.raw
deleted file mode 100644
index b73f3e5ee..000000000
Binary files a/data/icons/dbox.raw and /dev/null differ
diff --git a/data/icons/dbox_small.png b/data/icons/dbox_small.png
new file mode 100644
index 000000000..adc7150b1
Binary files /dev/null and b/data/icons/dbox_small.png differ
diff --git a/data/icons/dbox_small.raw b/data/icons/dbox_small.raw
deleted file mode 100644
index cffb98e1a..000000000
Binary files a/data/icons/dbox_small.raw and /dev/null differ
diff --git a/data/icons/dd.png b/data/icons/dd.png
new file mode 100644
index 000000000..c12092dcc
Binary files /dev/null and b/data/icons/dd.png differ
diff --git a/data/icons/dd.raw b/data/icons/dd.raw
deleted file mode 100644
index d0da4717e..000000000
Binary files a/data/icons/dd.raw and /dev/null differ
diff --git a/data/icons/dd_avail.png b/data/icons/dd_avail.png
new file mode 100644
index 000000000..bf84d0999
Binary files /dev/null and b/data/icons/dd_avail.png differ
diff --git a/data/icons/dd_avail.raw b/data/icons/dd_avail.raw
deleted file mode 100644
index e24eae9b2..000000000
Binary files a/data/icons/dd_avail.raw and /dev/null differ
diff --git a/data/icons/dd_gray.png b/data/icons/dd_gray.png
new file mode 100644
index 000000000..bf84d0999
Binary files /dev/null and b/data/icons/dd_gray.png differ
diff --git a/data/icons/dd_gray.raw b/data/icons/dd_gray.raw
deleted file mode 100644
index f90074789..000000000
Binary files a/data/icons/dd_gray.raw and /dev/null differ
diff --git a/data/icons/ddfill.png b/data/icons/ddfill.png
new file mode 100644
index 000000000..03fff6c4a
Binary files /dev/null and b/data/icons/ddfill.png differ
diff --git a/data/icons/ddfill.raw b/data/icons/ddfill.raw
deleted file mode 100755
index 5feff1063..000000000
Binary files a/data/icons/ddfill.raw and /dev/null differ
diff --git a/data/icons/deutsch.gif b/data/icons/deutsch.gif
deleted file mode 100755
index d7c93cfc7..000000000
Binary files a/data/icons/deutsch.gif and /dev/null differ
diff --git a/data/icons/deutsch.png b/data/icons/deutsch.png
new file mode 100644
index 000000000..06e4d0bb2
Binary files /dev/null and b/data/icons/deutsch.png differ
diff --git a/data/icons/down.png b/data/icons/down.png
new file mode 100644
index 000000000..1cdbce100
Binary files /dev/null and b/data/icons/down.png differ
diff --git a/data/icons/down.raw b/data/icons/down.raw
deleted file mode 100644
index 568ab860c..000000000
Binary files a/data/icons/down.raw and /dev/null differ
diff --git a/data/icons/dutch.gif b/data/icons/dutch.gif
deleted file mode 100755
index c6f821380..000000000
Binary files a/data/icons/dutch.gif and /dev/null differ
diff --git a/data/icons/dutch.png b/data/icons/dutch.png
new file mode 100644
index 000000000..7dba570c5
Binary files /dev/null and b/data/icons/dutch.png differ
diff --git a/data/icons/ellinika.gif b/data/icons/ellinika.gif
deleted file mode 100644
index 37f7a7ce3..000000000
Binary files a/data/icons/ellinika.gif and /dev/null differ
diff --git a/data/icons/ellinika.png b/data/icons/ellinika.png
new file mode 100644
index 000000000..b35e40669
Binary files /dev/null and b/data/icons/ellinika.png differ
diff --git a/data/icons/english.gif b/data/icons/english.gif
deleted file mode 100755
index 3fbc55744..000000000
Binary files a/data/icons/english.gif and /dev/null differ
diff --git a/data/icons/english.png b/data/icons/english.png
new file mode 100644
index 000000000..109a10816
Binary files /dev/null and b/data/icons/english.png differ
diff --git a/data/icons/error.png b/data/icons/error.png
new file mode 100644
index 000000000..0f12e6f55
Binary files /dev/null and b/data/icons/error.png differ
diff --git a/data/icons/error.raw b/data/icons/error.raw
deleted file mode 100644
index c4d9dfcd3..000000000
Binary files a/data/icons/error.raw and /dev/null differ
diff --git a/data/icons/features.png b/data/icons/features.png
new file mode 100644
index 000000000..831090041
Binary files /dev/null and b/data/icons/features.png differ
diff --git a/data/icons/features.raw b/data/icons/features.raw
deleted file mode 100644
index 6827fa5ef..000000000
Binary files a/data/icons/features.raw and /dev/null differ
diff --git a/data/icons/file.png b/data/icons/file.png
new file mode 100644
index 000000000..1755e896b
Binary files /dev/null and b/data/icons/file.png differ
diff --git a/data/icons/file.raw b/data/icons/file.raw
deleted file mode 100644
index 4d4e911be..000000000
Binary files a/data/icons/file.raw and /dev/null differ
diff --git a/data/icons/folder.png b/data/icons/folder.png
new file mode 100644
index 000000000..241aca5dc
Binary files /dev/null and b/data/icons/folder.png differ
diff --git a/data/icons/folder.raw b/data/icons/folder.raw
deleted file mode 100644
index 0c4ab46f8..000000000
Binary files a/data/icons/folder.raw and /dev/null differ
diff --git a/data/icons/francais.png b/data/icons/francais.png
new file mode 100644
index 000000000..b7529f3ae
Binary files /dev/null and b/data/icons/francais.png differ
diff --git a/data/icons/french.gif b/data/icons/french.gif
deleted file mode 100755
index 6faed971a..000000000
Binary files a/data/icons/french.gif and /dev/null differ
diff --git a/data/icons/french.png b/data/icons/french.png
new file mode 100644
index 000000000..b7529f3ae
Binary files /dev/null and b/data/icons/french.png differ
diff --git a/data/icons/games.png b/data/icons/games.png
new file mode 100644
index 000000000..cb9350ab8
Binary files /dev/null and b/data/icons/games.png differ
diff --git a/data/icons/games.raw b/data/icons/games.raw
deleted file mode 100644
index 06202519c..000000000
Binary files a/data/icons/games.raw and /dev/null differ
diff --git a/data/icons/gelb.png b/data/icons/gelb.png
new file mode 100644
index 000000000..bc8d97fcb
Binary files /dev/null and b/data/icons/gelb.png differ
diff --git a/data/icons/gelb.raw b/data/icons/gelb.raw
deleted file mode 100644
index f864848a3..000000000
Binary files a/data/icons/gelb.raw and /dev/null differ
diff --git a/data/icons/gruen.png b/data/icons/gruen.png
new file mode 100644
index 000000000..7b1d4ab61
Binary files /dev/null and b/data/icons/gruen.png differ
diff --git a/data/icons/gruen.raw b/data/icons/gruen.raw
deleted file mode 100644
index d742246dc..000000000
Binary files a/data/icons/gruen.raw and /dev/null differ
diff --git a/data/icons/help.png b/data/icons/help.png
new file mode 100644
index 000000000..33801cee8
Binary files /dev/null and b/data/icons/help.png differ
diff --git a/data/icons/help.raw b/data/icons/help.raw
deleted file mode 100644
index 5c100306f..000000000
Binary files a/data/icons/help.raw and /dev/null differ
diff --git a/data/icons/help_small.png b/data/icons/help_small.png
new file mode 100644
index 000000000..c690a5079
Binary files /dev/null and b/data/icons/help_small.png differ
diff --git a/data/icons/help_small.raw b/data/icons/help_small.raw
deleted file mode 100644
index 4549a5d13..000000000
Binary files a/data/icons/help_small.raw and /dev/null differ
diff --git a/data/icons/hidden.png b/data/icons/hidden.png
new file mode 100644
index 000000000..6b812b4e2
Binary files /dev/null and b/data/icons/hidden.png differ
diff --git a/data/icons/hidden.raw b/data/icons/hidden.raw
deleted file mode 100644
index 7f64e7fd2..000000000
Binary files a/data/icons/hidden.raw and /dev/null differ
diff --git a/data/icons/home.png b/data/icons/home.png
new file mode 100644
index 000000000..512739485
Binary files /dev/null and b/data/icons/home.png differ
diff --git a/data/icons/home.raw b/data/icons/home.raw
deleted file mode 100644
index 2e7849273..000000000
Binary files a/data/icons/home.raw and /dev/null differ
diff --git a/data/icons/hungarian.gif b/data/icons/hungarian.gif
deleted file mode 100755
index 5e9ad6860..000000000
Binary files a/data/icons/hungarian.gif and /dev/null differ
diff --git a/data/icons/hungarian.png b/data/icons/hungarian.png
new file mode 100644
index 000000000..b41feb509
Binary files /dev/null and b/data/icons/hungarian.png differ
diff --git a/data/icons/info.png b/data/icons/info.png
new file mode 100644
index 000000000..de6790b99
Binary files /dev/null and b/data/icons/info.png differ
diff --git a/data/icons/info.raw b/data/icons/info.raw
deleted file mode 100644
index 6827fa5ef..000000000
Binary files a/data/icons/info.raw and /dev/null differ
diff --git a/data/icons/italiano.gif b/data/icons/italiano.gif
deleted file mode 100755
index c3790ed24..000000000
Binary files a/data/icons/italiano.gif and /dev/null differ
diff --git a/data/icons/italiano.png b/data/icons/italiano.png
new file mode 100644
index 000000000..965fca98f
Binary files /dev/null and b/data/icons/italiano.png differ
diff --git a/data/icons/keybinding.png b/data/icons/keybinding.png
new file mode 100644
index 000000000..5f205a3b7
Binary files /dev/null and b/data/icons/keybinding.png differ
diff --git a/data/icons/keybinding.raw b/data/icons/keybinding.raw
deleted file mode 100644
index 8d38cd8dc..000000000
Binary files a/data/icons/keybinding.raw and /dev/null differ
diff --git a/data/icons/language.gif b/data/icons/language.gif
deleted file mode 100755
index d83ff57cc..000000000
Binary files a/data/icons/language.gif and /dev/null differ
diff --git a/data/icons/language.png b/data/icons/language.png
new file mode 100644
index 000000000..41b0247b9
Binary files /dev/null and b/data/icons/language.png differ
diff --git a/data/icons/language.raw b/data/icons/language.raw
deleted file mode 100644
index d322ffd7e..000000000
Binary files a/data/icons/language.raw and /dev/null differ
diff --git a/data/icons/lcd.png b/data/icons/lcd.png
new file mode 100644
index 000000000..e61794a11
Binary files /dev/null and b/data/icons/lcd.png differ
diff --git a/data/icons/lcd.raw b/data/icons/lcd.raw
deleted file mode 100644
index 3c476ee25..000000000
Binary files a/data/icons/lcd.raw and /dev/null differ
diff --git a/data/icons/left.png b/data/icons/left.png
new file mode 100644
index 000000000..a48aa666b
Binary files /dev/null and b/data/icons/left.png differ
diff --git a/data/icons/left.raw b/data/icons/left.raw
deleted file mode 100644
index b63814e3d..000000000
Binary files a/data/icons/left.raw and /dev/null differ
diff --git a/data/icons/local.png b/data/icons/local.png
new file mode 100644
index 000000000..76bb86970
Binary files /dev/null and b/data/icons/local.png differ
diff --git a/data/icons/local.raw b/data/icons/local.raw
deleted file mode 100755
index f282e4d51..000000000
Binary files a/data/icons/local.raw and /dev/null differ
diff --git a/data/icons/lock.png b/data/icons/lock.png
new file mode 100644
index 000000000..869ebf9b8
Binary files /dev/null and b/data/icons/lock.png differ
diff --git a/data/icons/lock.raw b/data/icons/lock.raw
deleted file mode 100644
index 04b6e6994..000000000
Binary files a/data/icons/lock.raw and /dev/null differ
diff --git a/data/icons/mainmenue.gif b/data/icons/mainmenue.gif
deleted file mode 100755
index f747412b5..000000000
Binary files a/data/icons/mainmenue.gif and /dev/null differ
diff --git a/data/icons/mainmenue.png b/data/icons/mainmenue.png
new file mode 100644
index 000000000..dc9388806
Binary files /dev/null and b/data/icons/mainmenue.png differ
diff --git a/data/icons/mainmenue.raw b/data/icons/mainmenue.raw
deleted file mode 100644
index 9d913c7c9..000000000
Binary files a/data/icons/mainmenue.raw and /dev/null differ
diff --git a/data/icons/mounted.png b/data/icons/mounted.png
new file mode 100644
index 000000000..7fd0e4658
Binary files /dev/null and b/data/icons/mounted.png differ
diff --git a/data/icons/mounted.raw b/data/icons/mounted.raw
deleted file mode 100644
index 81acf7670..000000000
Binary files a/data/icons/mounted.raw and /dev/null differ
diff --git a/data/icons/movie.png b/data/icons/movie.png
new file mode 100644
index 000000000..6c8858250
Binary files /dev/null and b/data/icons/movie.png differ
diff --git a/data/icons/movie.raw b/data/icons/movie.raw
deleted file mode 100644
index ea1085a35..000000000
Binary files a/data/icons/movie.raw and /dev/null differ
diff --git a/data/icons/mp3.png b/data/icons/mp3.png
new file mode 100644
index 000000000..6c8858250
Binary files /dev/null and b/data/icons/mp3.png differ
diff --git a/data/icons/mp3.raw b/data/icons/mp3.raw
deleted file mode 100644
index ea1085a35..000000000
Binary files a/data/icons/mp3.raw and /dev/null differ
diff --git a/data/icons/mute.png b/data/icons/mute.png
new file mode 100644
index 000000000..eb8ca50fc
Binary files /dev/null and b/data/icons/mute.png differ
diff --git a/data/icons/mute.raw b/data/icons/mute.raw
deleted file mode 100644
index c87a418d9..000000000
Binary files a/data/icons/mute.raw and /dev/null differ
diff --git a/data/icons/mute_small.png b/data/icons/mute_small.png
new file mode 100644
index 000000000..e7be6740f
Binary files /dev/null and b/data/icons/mute_small.png differ
diff --git a/data/icons/mute_small.raw b/data/icons/mute_small.raw
deleted file mode 100644
index 6ff04f998..000000000
Binary files a/data/icons/mute_small.raw and /dev/null differ
diff --git a/data/icons/mute_zap_gray.png b/data/icons/mute_zap_gray.png
new file mode 100644
index 000000000..0e5b170e0
Binary files /dev/null and b/data/icons/mute_zap_gray.png differ
diff --git a/data/icons/mute_zap_gray.raw b/data/icons/mute_zap_gray.raw
deleted file mode 100755
index 0f92e5de0..000000000
Binary files a/data/icons/mute_zap_gray.raw and /dev/null differ
diff --git a/data/icons/mute_zap_green.png b/data/icons/mute_zap_green.png
new file mode 100644
index 000000000..4cd7fcac6
Binary files /dev/null and b/data/icons/mute_zap_green.png differ
diff --git a/data/icons/mute_zap_green.raw b/data/icons/mute_zap_green.raw
deleted file mode 100755
index 091f93df7..000000000
Binary files a/data/icons/mute_zap_green.raw and /dev/null differ
diff --git a/data/icons/nederlands.png b/data/icons/nederlands.png
new file mode 100644
index 000000000..109da2313
Binary files /dev/null and b/data/icons/nederlands.png differ
diff --git a/data/icons/network.png b/data/icons/network.png
new file mode 100644
index 000000000..00260bcbf
Binary files /dev/null and b/data/icons/network.png differ
diff --git a/data/icons/network.raw b/data/icons/network.raw
deleted file mode 100644
index f551a5389..000000000
Binary files a/data/icons/network.raw and /dev/null differ
diff --git a/data/icons/not_mounted.png b/data/icons/not_mounted.png
new file mode 100644
index 000000000..60832214c
Binary files /dev/null and b/data/icons/not_mounted.png differ
diff --git a/data/icons/not_mounted.raw b/data/icons/not_mounted.raw
deleted file mode 100644
index 9c17e7a77..000000000
Binary files a/data/icons/not_mounted.raw and /dev/null differ
diff --git a/data/icons/notyet.png b/data/icons/notyet.png
new file mode 100644
index 000000000..314e33e28
Binary files /dev/null and b/data/icons/notyet.png differ
diff --git a/data/icons/notyet.raw b/data/icons/notyet.raw
deleted file mode 100755
index 8ef15ab9f..000000000
Binary files a/data/icons/notyet.raw and /dev/null differ
diff --git a/data/icons/numericpad.png b/data/icons/numericpad.png
new file mode 100644
index 000000000..94b61c2b1
Binary files /dev/null and b/data/icons/numericpad.png differ
diff --git a/data/icons/numericpad.raw b/data/icons/numericpad.raw
deleted file mode 100644
index 5806fa487..000000000
Binary files a/data/icons/numericpad.raw and /dev/null differ
diff --git a/data/icons/ok.png b/data/icons/ok.png
new file mode 100644
index 000000000..60bd02987
Binary files /dev/null and b/data/icons/ok.png differ
diff --git a/data/icons/ok.raw b/data/icons/ok.raw
deleted file mode 100644
index bf98a4d23..000000000
Binary files a/data/icons/ok.raw and /dev/null differ
diff --git a/data/icons/polski.gif b/data/icons/polski.gif
deleted file mode 100755
index c8eeaab64..000000000
Binary files a/data/icons/polski.gif and /dev/null differ
diff --git a/data/icons/polski.png b/data/icons/polski.png
new file mode 100644
index 000000000..2afcc3a2d
Binary files /dev/null and b/data/icons/polski.png differ
diff --git a/data/icons/portugues.gif b/data/icons/portugues.gif
deleted file mode 100755
index 9955ab3c6..000000000
Binary files a/data/icons/portugues.gif and /dev/null differ
diff --git a/data/icons/portugues.png b/data/icons/portugues.png
new file mode 100644
index 000000000..36b621e82
Binary files /dev/null and b/data/icons/portugues.png differ
diff --git a/data/icons/power.png b/data/icons/power.png
new file mode 100644
index 000000000..15554fefa
Binary files /dev/null and b/data/icons/power.png differ
diff --git a/data/icons/power.raw b/data/icons/power.raw
deleted file mode 100644
index 7e9c26209..000000000
Binary files a/data/icons/power.raw and /dev/null differ
diff --git a/data/icons/radar.pal b/data/icons/radar.pal
new file mode 100644
index 000000000..c558075ea
Binary files /dev/null and b/data/icons/radar.pal differ
diff --git a/data/icons/recording.png b/data/icons/recording.png
new file mode 100644
index 000000000..edcf8ad24
Binary files /dev/null and b/data/icons/recording.png differ
diff --git a/data/icons/recording.raw b/data/icons/recording.raw
deleted file mode 100644
index f5123ea2c..000000000
Binary files a/data/icons/recording.raw and /dev/null differ
diff --git a/data/icons/right.png b/data/icons/right.png
new file mode 100644
index 000000000..980212193
Binary files /dev/null and b/data/icons/right.png differ
diff --git a/data/icons/right.raw b/data/icons/right.raw
deleted file mode 100644
index 5022257aa..000000000
Binary files a/data/icons/right.raw and /dev/null differ
diff --git a/data/icons/romania.gif b/data/icons/romania.gif
deleted file mode 100755
index d839b5be9..000000000
Binary files a/data/icons/romania.gif and /dev/null differ
diff --git a/data/icons/romania.png b/data/icons/romania.png
new file mode 100644
index 000000000..a079ca74b
Binary files /dev/null and b/data/icons/romania.png differ
diff --git a/data/icons/rot.png b/data/icons/rot.png
new file mode 100644
index 000000000..cc9a061aa
Binary files /dev/null and b/data/icons/rot.png differ
diff --git a/data/icons/rot.raw b/data/icons/rot.raw
deleted file mode 100644
index 8d0b5386c..000000000
Binary files a/data/icons/rot.raw and /dev/null differ
diff --git a/data/icons/russkij.gif b/data/icons/russkij.gif
deleted file mode 100755
index 2b6017d9d..000000000
Binary files a/data/icons/russkij.gif and /dev/null differ
diff --git a/data/icons/russkij.png b/data/icons/russkij.png
new file mode 100644
index 000000000..fffac38b7
Binary files /dev/null and b/data/icons/russkij.png differ
diff --git a/data/icons/settings.png b/data/icons/settings.png
new file mode 100644
index 000000000..2383ab6ac
Binary files /dev/null and b/data/icons/settings.png differ
diff --git a/data/icons/settings.raw b/data/icons/settings.raw
deleted file mode 100644
index fbe8d5b9e..000000000
Binary files a/data/icons/settings.raw and /dev/null differ
diff --git a/data/icons/shell.png b/data/icons/shell.png
new file mode 100644
index 000000000..fa92beb83
Binary files /dev/null and b/data/icons/shell.png differ
diff --git a/data/icons/shell.raw b/data/icons/shell.raw
deleted file mode 100644
index 3387e59a2..000000000
Binary files a/data/icons/shell.raw and /dev/null differ
diff --git a/data/icons/softupdate.png b/data/icons/softupdate.png
new file mode 100644
index 000000000..acec253c4
Binary files /dev/null and b/data/icons/softupdate.png differ
diff --git a/data/icons/softupdate.raw b/data/icons/softupdate.raw
deleted file mode 100644
index f56892173..000000000
Binary files a/data/icons/softupdate.raw and /dev/null differ
diff --git a/data/icons/streaming.png b/data/icons/streaming.png
new file mode 100644
index 000000000..ccf1dba42
Binary files /dev/null and b/data/icons/streaming.png differ
diff --git a/data/icons/streaming.raw b/data/icons/streaming.raw
deleted file mode 100644
index f551a5389..000000000
Binary files a/data/icons/streaming.raw and /dev/null differ
diff --git a/data/icons/subt.png b/data/icons/subt.png
new file mode 100644
index 000000000..0cf8d2cdd
Binary files /dev/null and b/data/icons/subt.png differ
diff --git a/data/icons/subt.raw b/data/icons/subt.raw
deleted file mode 100644
index 341ace228..000000000
Binary files a/data/icons/subt.raw and /dev/null differ
diff --git a/data/icons/subt_gray.png b/data/icons/subt_gray.png
new file mode 100644
index 000000000..581a52c08
Binary files /dev/null and b/data/icons/subt_gray.png differ
diff --git a/data/icons/subt_gray.raw b/data/icons/subt_gray.raw
deleted file mode 100644
index 6dc22da97..000000000
Binary files a/data/icons/subt_gray.raw and /dev/null differ
diff --git a/data/icons/suomi.png b/data/icons/suomi.png
new file mode 100644
index 000000000..1a48e4dc3
Binary files /dev/null and b/data/icons/suomi.png differ
diff --git a/data/icons/svenska.png b/data/icons/svenska.png
new file mode 100644
index 000000000..b7c5f77ad
Binary files /dev/null and b/data/icons/svenska.png differ
diff --git a/data/icons/timer.png b/data/icons/timer.png
new file mode 100644
index 000000000..1a3a27fc6
Binary files /dev/null and b/data/icons/timer.png differ
diff --git a/data/icons/timer.raw b/data/icons/timer.raw
deleted file mode 100644
index 788c83e40..000000000
Binary files a/data/icons/timer.raw and /dev/null differ
diff --git a/data/icons/up.png b/data/icons/up.png
new file mode 100644
index 000000000..fce225a16
Binary files /dev/null and b/data/icons/up.png differ
diff --git a/data/icons/up.raw b/data/icons/up.raw
deleted file mode 100644
index a6df634d6..000000000
Binary files a/data/icons/up.raw and /dev/null differ
diff --git a/data/icons/video.png b/data/icons/video.png
new file mode 100644
index 000000000..d8e9822dd
Binary files /dev/null and b/data/icons/video.png differ
diff --git a/data/icons/video.raw b/data/icons/video.raw
deleted file mode 100644
index 9c561cde8..000000000
Binary files a/data/icons/video.raw and /dev/null differ
diff --git a/data/icons/volume.png b/data/icons/volume.png
new file mode 100644
index 000000000..530bdef95
Binary files /dev/null and b/data/icons/volume.png differ
diff --git a/data/icons/volume.raw b/data/icons/volume.raw
deleted file mode 100644
index 64fbc9c12..000000000
Binary files a/data/icons/volume.raw and /dev/null differ
diff --git a/data/icons/volumebody.png b/data/icons/volumebody.png
new file mode 100644
index 000000000..c921998b3
Binary files /dev/null and b/data/icons/volumebody.png differ
diff --git a/data/icons/volumebody.raw b/data/icons/volumebody.raw
deleted file mode 100644
index 2f2a8e779..000000000
Binary files a/data/icons/volumebody.raw and /dev/null differ
diff --git a/data/icons/volumeslider2.png b/data/icons/volumeslider2.png
new file mode 100644
index 000000000..fd4d4da27
Binary files /dev/null and b/data/icons/volumeslider2.png differ
diff --git a/data/icons/volumeslider2.raw b/data/icons/volumeslider2.raw
deleted file mode 100644
index 2f584e91a..000000000
Binary files a/data/icons/volumeslider2.raw and /dev/null differ
diff --git a/data/icons/volumeslider2alpha.png b/data/icons/volumeslider2alpha.png
new file mode 100644
index 000000000..fd4d4da27
Binary files /dev/null and b/data/icons/volumeslider2alpha.png differ
diff --git a/data/icons/volumeslider2alpha.raw b/data/icons/volumeslider2alpha.raw
deleted file mode 100644
index 24744c390..000000000
Binary files a/data/icons/volumeslider2alpha.raw and /dev/null differ
diff --git a/data/icons/volumeslider2blue.png b/data/icons/volumeslider2blue.png
new file mode 100644
index 000000000..75c39e0cb
Binary files /dev/null and b/data/icons/volumeslider2blue.png differ
diff --git a/data/icons/volumeslider2blue.raw b/data/icons/volumeslider2blue.raw
deleted file mode 100644
index 2a07eadf8..000000000
Binary files a/data/icons/volumeslider2blue.raw and /dev/null differ
diff --git a/data/icons/volumeslider2green.png b/data/icons/volumeslider2green.png
new file mode 100644
index 000000000..5026d5384
Binary files /dev/null and b/data/icons/volumeslider2green.png differ
diff --git a/data/icons/volumeslider2green.raw b/data/icons/volumeslider2green.raw
deleted file mode 100644
index 8d55d33ca..000000000
Binary files a/data/icons/volumeslider2green.raw and /dev/null differ
diff --git a/data/icons/volumeslider2red.png b/data/icons/volumeslider2red.png
new file mode 100644
index 000000000..be8d6493d
Binary files /dev/null and b/data/icons/volumeslider2red.png differ
diff --git a/data/icons/volumeslider2red.raw b/data/icons/volumeslider2red.raw
deleted file mode 100644
index e89cba548..000000000
Binary files a/data/icons/volumeslider2red.raw and /dev/null differ
diff --git a/data/icons/vtxt.png b/data/icons/vtxt.png
new file mode 100644
index 000000000..3cc80eb42
Binary files /dev/null and b/data/icons/vtxt.png differ
diff --git a/data/icons/vtxt.raw b/data/icons/vtxt.raw
deleted file mode 100644
index 42a2f7216..000000000
Binary files a/data/icons/vtxt.raw and /dev/null differ
diff --git a/data/icons/vtxt_gray.png b/data/icons/vtxt_gray.png
new file mode 100644
index 000000000..128c14c24
Binary files /dev/null and b/data/icons/vtxt_gray.png differ
diff --git a/data/icons/vtxt_gray.raw b/data/icons/vtxt_gray.raw
deleted file mode 100644
index e00777956..000000000
Binary files a/data/icons/vtxt_gray.raw and /dev/null differ