diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index b33e28427..8966e9fe1 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -2,25 +2,20 @@ installdir = $(DATADIR)/neutrino/icons
 
 install_DATA = \
 	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 bosanski.png \
+	audio.png 16_9.png 16_9_gray.png \
+	language.png bayrisch.png ch-baslerdeutsch.png ch-berndeutsch.png deutsch.png dutch.png bosanski.png \
 	ellinika.png english.png francais.png french.png hungarian.png italiano.png \
 	polski.png portugues.png romania.png russkij.png nederlands.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 \
+	ca.png 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 \
+	movieplayer.raw power_white.raw pv_gray.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 \
@@ -30,17 +25,19 @@ install_DATA = \
 	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 \
+	fta.raw 16.raw b16.raw b2.raw b3.raw \
+	card.raw card_gray.raw card_green.raw \
 	net.raw net_gray.raw net_green.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 \
-	d_green.raw d_white.raw d_yellow.raw \
-	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 \
-	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
+	x_green.png x_white.png x_yellow.png \
+	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
diff --git a/data/icons/biss.raw b/data/icons/biss.raw
deleted file mode 100644
index 4075620f7..000000000
Binary files a/data/icons/biss.raw and /dev/null differ
diff --git a/data/icons/biss_gray.raw b/data/icons/biss_gray.raw
deleted file mode 100644
index fb9426eea..000000000
Binary files a/data/icons/biss_gray.raw and /dev/null differ
diff --git a/data/icons/biss_green.png b/data/icons/biss_green.png
new file mode 100644
index 000000000..7f3ce7a00
Binary files /dev/null and b/data/icons/biss_green.png differ
diff --git a/data/icons/biss_green.raw b/data/icons/biss_green.raw
deleted file mode 100644
index 25e816b8f..000000000
Binary files a/data/icons/biss_green.raw and /dev/null differ
diff --git a/data/icons/biss_white.png b/data/icons/biss_white.png
new file mode 100644
index 000000000..e121217f5
Binary files /dev/null and b/data/icons/biss_white.png differ
diff --git a/data/icons/biss_white.raw b/data/icons/biss_white.raw
deleted file mode 100644
index 2028ce842..000000000
Binary files a/data/icons/biss_white.raw and /dev/null differ
diff --git a/data/icons/biss_yellow.png b/data/icons/biss_yellow.png
new file mode 100644
index 000000000..dcafbfcf4
Binary files /dev/null and b/data/icons/biss_yellow.png differ
diff --git a/data/icons/biss_yellow.raw b/data/icons/biss_yellow.raw
deleted file mode 100644
index ecf9ce1ae..000000000
Binary files a/data/icons/biss_yellow.raw and /dev/null differ
diff --git a/data/icons/conax.raw b/data/icons/conax.raw
deleted file mode 100644
index d1eb58174..000000000
Binary files a/data/icons/conax.raw and /dev/null differ
diff --git a/data/icons/conax_gray.raw b/data/icons/conax_gray.raw
deleted file mode 100644
index 52cd06893..000000000
Binary files a/data/icons/conax_gray.raw and /dev/null differ
diff --git a/data/icons/conax_green.png b/data/icons/conax_green.png
new file mode 100644
index 000000000..02319d375
Binary files /dev/null and b/data/icons/conax_green.png differ
diff --git a/data/icons/conax_green.raw b/data/icons/conax_green.raw
deleted file mode 100644
index 15b0a1444..000000000
Binary files a/data/icons/conax_green.raw and /dev/null differ
diff --git a/data/icons/conax_white.png b/data/icons/conax_white.png
new file mode 100644
index 000000000..e7f93cc03
Binary files /dev/null and b/data/icons/conax_white.png differ
diff --git a/data/icons/conax_white.raw b/data/icons/conax_white.raw
deleted file mode 100644
index a43f37bac..000000000
Binary files a/data/icons/conax_white.raw and /dev/null differ
diff --git a/data/icons/conax_yellow.png b/data/icons/conax_yellow.png
new file mode 100644
index 000000000..cd539e6a4
Binary files /dev/null and b/data/icons/conax_yellow.png differ
diff --git a/data/icons/conax_yellow.raw b/data/icons/conax_yellow.raw
deleted file mode 100644
index 160efb0f1..000000000
Binary files a/data/icons/conax_yellow.raw and /dev/null differ
diff --git a/data/icons/cw.raw b/data/icons/cw.raw
deleted file mode 100644
index 453b309fc..000000000
Binary files a/data/icons/cw.raw and /dev/null differ
diff --git a/data/icons/cw_gray.raw b/data/icons/cw_gray.raw
deleted file mode 100644
index 28cdb3e36..000000000
Binary files a/data/icons/cw_gray.raw and /dev/null differ
diff --git a/data/icons/cw_green.png b/data/icons/cw_green.png
new file mode 100644
index 000000000..da779702e
Binary files /dev/null and b/data/icons/cw_green.png differ
diff --git a/data/icons/cw_green.raw b/data/icons/cw_green.raw
deleted file mode 100644
index ff99d0b84..000000000
Binary files a/data/icons/cw_green.raw and /dev/null differ
diff --git a/data/icons/cw_white.png b/data/icons/cw_white.png
new file mode 100644
index 000000000..c477abd4d
Binary files /dev/null and b/data/icons/cw_white.png differ
diff --git a/data/icons/cw_white.raw b/data/icons/cw_white.raw
deleted file mode 100644
index 87848ce61..000000000
Binary files a/data/icons/cw_white.raw and /dev/null differ
diff --git a/data/icons/cw_yellow.png b/data/icons/cw_yellow.png
new file mode 100644
index 000000000..12d4730c0
Binary files /dev/null and b/data/icons/cw_yellow.png differ
diff --git a/data/icons/cw_yellow.raw b/data/icons/cw_yellow.raw
deleted file mode 100644
index 317d4ce3a..000000000
Binary files a/data/icons/cw_yellow.raw and /dev/null differ
diff --git a/data/icons/d_green.png b/data/icons/d_green.png
new file mode 100644
index 000000000..44b6b316a
Binary files /dev/null and b/data/icons/d_green.png differ
diff --git a/data/icons/d_green.raw b/data/icons/d_green.raw
deleted file mode 100644
index a7011144b..000000000
Binary files a/data/icons/d_green.raw and /dev/null differ
diff --git a/data/icons/d_white.png b/data/icons/d_white.png
new file mode 100644
index 000000000..330980333
Binary files /dev/null and b/data/icons/d_white.png differ
diff --git a/data/icons/d_white.raw b/data/icons/d_white.raw
deleted file mode 100644
index 176bad2fb..000000000
Binary files a/data/icons/d_white.raw and /dev/null differ
diff --git a/data/icons/d_yellow.png b/data/icons/d_yellow.png
new file mode 100644
index 000000000..d69a6b5c7
Binary files /dev/null and b/data/icons/d_yellow.png differ
diff --git a/data/icons/d_yellow.raw b/data/icons/d_yellow.raw
deleted file mode 100644
index d6f82bd39..000000000
Binary files a/data/icons/d_yellow.raw and /dev/null differ
diff --git a/data/icons/ird_gray.raw b/data/icons/ird_gray.raw
deleted file mode 100644
index f9b5b48ec..000000000
Binary files a/data/icons/ird_gray.raw and /dev/null differ
diff --git a/data/icons/ird_green.png b/data/icons/ird_green.png
new file mode 100644
index 000000000..f09813773
Binary files /dev/null and b/data/icons/ird_green.png differ
diff --git a/data/icons/ird_green.raw b/data/icons/ird_green.raw
deleted file mode 100644
index 1fc529398..000000000
Binary files a/data/icons/ird_green.raw and /dev/null differ
diff --git a/data/icons/ird_white.png b/data/icons/ird_white.png
new file mode 100644
index 000000000..47f51fab1
Binary files /dev/null and b/data/icons/ird_white.png differ
diff --git a/data/icons/ird_white.raw b/data/icons/ird_white.raw
deleted file mode 100644
index b2e6ee4a0..000000000
Binary files a/data/icons/ird_white.raw and /dev/null differ
diff --git a/data/icons/ird_yellow.png b/data/icons/ird_yellow.png
new file mode 100644
index 000000000..71c58c8e9
Binary files /dev/null and b/data/icons/ird_yellow.png differ
diff --git a/data/icons/ird_yellow.raw b/data/icons/ird_yellow.raw
deleted file mode 100644
index 2772d9577..000000000
Binary files a/data/icons/ird_yellow.raw and /dev/null differ
diff --git a/data/icons/nagra.raw b/data/icons/nagra.raw
deleted file mode 100644
index eb096e57d..000000000
Binary files a/data/icons/nagra.raw and /dev/null differ
diff --git a/data/icons/nagra_gray.raw b/data/icons/nagra_gray.raw
deleted file mode 100644
index ab6124e92..000000000
Binary files a/data/icons/nagra_gray.raw and /dev/null differ
diff --git a/data/icons/nagra_green.png b/data/icons/nagra_green.png
new file mode 100644
index 000000000..e95c8aca9
Binary files /dev/null and b/data/icons/nagra_green.png differ
diff --git a/data/icons/nagra_green.raw b/data/icons/nagra_green.raw
deleted file mode 100644
index b5a3dcef9..000000000
Binary files a/data/icons/nagra_green.raw and /dev/null differ
diff --git a/data/icons/nagra_white.png b/data/icons/nagra_white.png
new file mode 100644
index 000000000..f284f1afb
Binary files /dev/null and b/data/icons/nagra_white.png differ
diff --git a/data/icons/nagra_white.raw b/data/icons/nagra_white.raw
deleted file mode 100644
index f0b6fdfd2..000000000
Binary files a/data/icons/nagra_white.raw and /dev/null differ
diff --git a/data/icons/nagra_yellow.png b/data/icons/nagra_yellow.png
new file mode 100644
index 000000000..db60936a6
Binary files /dev/null and b/data/icons/nagra_yellow.png differ
diff --git a/data/icons/nagra_yellow.raw b/data/icons/nagra_yellow.raw
deleted file mode 100644
index 0b27a5e4b..000000000
Binary files a/data/icons/nagra_yellow.raw and /dev/null differ
diff --git a/data/icons/nds.raw b/data/icons/nds.raw
deleted file mode 100644
index 64c00804f..000000000
Binary files a/data/icons/nds.raw and /dev/null differ
diff --git a/data/icons/nds_gray.raw b/data/icons/nds_gray.raw
deleted file mode 100644
index 86e42ad27..000000000
Binary files a/data/icons/nds_gray.raw and /dev/null differ
diff --git a/data/icons/nds_green.png b/data/icons/nds_green.png
new file mode 100644
index 000000000..e03ec4eb7
Binary files /dev/null and b/data/icons/nds_green.png differ
diff --git a/data/icons/nds_green.raw b/data/icons/nds_green.raw
deleted file mode 100644
index 75ba221f5..000000000
Binary files a/data/icons/nds_green.raw and /dev/null differ
diff --git a/data/icons/nds_white.png b/data/icons/nds_white.png
new file mode 100644
index 000000000..358b9c024
Binary files /dev/null and b/data/icons/nds_white.png differ
diff --git a/data/icons/nds_white.raw b/data/icons/nds_white.raw
deleted file mode 100644
index 88cbf405e..000000000
Binary files a/data/icons/nds_white.raw and /dev/null differ
diff --git a/data/icons/nds_yellow.png b/data/icons/nds_yellow.png
new file mode 100644
index 000000000..e0ef0d7b1
Binary files /dev/null and b/data/icons/nds_yellow.png differ
diff --git a/data/icons/nds_yellow.raw b/data/icons/nds_yellow.raw
deleted file mode 100644
index 6bfe77dcc..000000000
Binary files a/data/icons/nds_yellow.raw and /dev/null differ
diff --git a/data/icons/powervu_green.png b/data/icons/powervu_green.png
new file mode 100644
index 000000000..32a874957
Binary files /dev/null and b/data/icons/powervu_green.png differ
diff --git a/data/icons/powervu_green.raw b/data/icons/powervu_green.raw
deleted file mode 100644
index 2e6da01be..000000000
Binary files a/data/icons/powervu_green.raw and /dev/null differ
diff --git a/data/icons/powervu_white.png b/data/icons/powervu_white.png
new file mode 100644
index 000000000..7678ac6e2
Binary files /dev/null and b/data/icons/powervu_white.png differ
diff --git a/data/icons/powervu_white.raw b/data/icons/powervu_white.raw
deleted file mode 100644
index 9a74b8289..000000000
Binary files a/data/icons/powervu_white.raw and /dev/null differ
diff --git a/data/icons/powervu_yellow.png b/data/icons/powervu_yellow.png
new file mode 100644
index 000000000..5834cc4f0
Binary files /dev/null and b/data/icons/powervu_yellow.png differ
diff --git a/data/icons/powervu_yellow.raw b/data/icons/powervu_yellow.raw
deleted file mode 100644
index d3e8dca77..000000000
Binary files a/data/icons/powervu_yellow.raw and /dev/null differ
diff --git a/data/icons/seca.raw b/data/icons/seca.raw
deleted file mode 100644
index 9d295fb4b..000000000
Binary files a/data/icons/seca.raw and /dev/null differ
diff --git a/data/icons/seca_gray.raw b/data/icons/seca_gray.raw
deleted file mode 100644
index 9bf0a703a..000000000
Binary files a/data/icons/seca_gray.raw and /dev/null differ
diff --git a/data/icons/seca_green.png b/data/icons/seca_green.png
new file mode 100644
index 000000000..45c8c4e32
Binary files /dev/null and b/data/icons/seca_green.png differ
diff --git a/data/icons/seca_green.raw b/data/icons/seca_green.raw
deleted file mode 100644
index b58c8b34c..000000000
Binary files a/data/icons/seca_green.raw and /dev/null differ
diff --git a/data/icons/seca_white.png b/data/icons/seca_white.png
new file mode 100644
index 000000000..c9a600103
Binary files /dev/null and b/data/icons/seca_white.png differ
diff --git a/data/icons/seca_white.raw b/data/icons/seca_white.raw
deleted file mode 100644
index 5187c1796..000000000
Binary files a/data/icons/seca_white.raw and /dev/null differ
diff --git a/data/icons/seca_yellow.png b/data/icons/seca_yellow.png
new file mode 100644
index 000000000..4aedcb2b5
Binary files /dev/null and b/data/icons/seca_yellow.png differ
diff --git a/data/icons/seca_yellow.raw b/data/icons/seca_yellow.raw
deleted file mode 100644
index f654e8437..000000000
Binary files a/data/icons/seca_yellow.raw and /dev/null differ
diff --git a/data/icons/via.raw b/data/icons/via.raw
deleted file mode 100644
index 2c14506d0..000000000
Binary files a/data/icons/via.raw and /dev/null differ
diff --git a/data/icons/via_gray.raw b/data/icons/via_gray.raw
deleted file mode 100644
index c28853d7f..000000000
Binary files a/data/icons/via_gray.raw and /dev/null differ
diff --git a/data/icons/via_green.png b/data/icons/via_green.png
new file mode 100644
index 000000000..c8bb65742
Binary files /dev/null and b/data/icons/via_green.png differ
diff --git a/data/icons/via_green.raw b/data/icons/via_green.raw
deleted file mode 100644
index 3f5d0002e..000000000
Binary files a/data/icons/via_green.raw and /dev/null differ
diff --git a/data/icons/via_white.png b/data/icons/via_white.png
new file mode 100644
index 000000000..4ccc36893
Binary files /dev/null and b/data/icons/via_white.png differ
diff --git a/data/icons/via_white.raw b/data/icons/via_white.raw
deleted file mode 100644
index dc669e273..000000000
Binary files a/data/icons/via_white.raw and /dev/null differ
diff --git a/data/icons/via_yellow.png b/data/icons/via_yellow.png
new file mode 100644
index 000000000..859216b62
Binary files /dev/null and b/data/icons/via_yellow.png differ
diff --git a/data/icons/via_yellow.raw b/data/icons/via_yellow.raw
deleted file mode 100644
index af6d804de..000000000
Binary files a/data/icons/via_yellow.raw and /dev/null differ
diff --git a/data/icons/x_green.png b/data/icons/x_green.png
new file mode 100644
index 000000000..78922385e
Binary files /dev/null and b/data/icons/x_green.png differ
diff --git a/data/icons/x_green.raw b/data/icons/x_green.raw
deleted file mode 100755
index 137506b29..000000000
Binary files a/data/icons/x_green.raw and /dev/null differ
diff --git a/data/icons/x_white.png b/data/icons/x_white.png
new file mode 100644
index 000000000..d737a83b4
Binary files /dev/null and b/data/icons/x_white.png differ
diff --git a/data/icons/x_white.raw b/data/icons/x_white.raw
deleted file mode 100755
index 36303b0e2..000000000
Binary files a/data/icons/x_white.raw and /dev/null differ
diff --git a/data/icons/x_yellow.png b/data/icons/x_yellow.png
new file mode 100644
index 000000000..0f17b275b
Binary files /dev/null and b/data/icons/x_yellow.png differ
diff --git a/data/icons/x_yellow.raw b/data/icons/x_yellow.raw
deleted file mode 100755
index af21ac38e..000000000
Binary files a/data/icons/x_yellow.raw and /dev/null differ