diff --git a/configure.ac b/configure.ac
index 9b85820ec..b6c48a2bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,6 +339,7 @@ data/icons/radar/Makefile
 data/icons/slider/Makefile
 data/icons/status/Makefile
 data/icons/status/ca/Makefile
+data/icons/status/camd/Makefile
 data/icons/status/channel/Makefile
 data/icons/status/info/Makefile
 data/icons/status/markers/Makefile
diff --git a/data/icons/status/Makefile.am b/data/icons/status/Makefile.am
index 5489bd956..f44df6400 100644
--- a/data/icons/status/Makefile.am
+++ b/data/icons/status/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = \
 	ca \
+	camd \
 	channel \
 	info \
 	markers \
diff --git a/data/icons/status/ca/Makefile.am b/data/icons/status/ca/Makefile.am
index dec8eeae7..8378a40b7 100644
--- a/data/icons/status/ca/Makefile.am
+++ b/data/icons/status/ca/Makefile.am
@@ -4,9 +4,6 @@ install_DATA = \
 	biss_green.png \
 	biss_white.png \
 	biss_yellow.png \
-	cccam_green.png \
-	ci+_green.png \
-	ci+_grey.png \
 	conax_green.png \
 	conax_white.png \
 	conax_yellow.png \
@@ -16,37 +13,21 @@ install_DATA = \
 	d_green.png \
 	d_white.png \
 	d_yellow.png \
-	dec_card.png \
-	dec_fta.png \
-	dec_int.png \
-	dec_na.png \
-	dec_net.png \
-	doscam_green.png \
-	doscam_yellow.png \
-	gbox_green.png \
 	ird_green.png \
 	ird_white.png \
 	ird_yellow.png \
-	mgcamd_green.png \
 	nagra_green.png \
 	nagra_white.png \
 	nagra_yellow.png \
-	ncam_green.png \
 	nds_green.png \
 	nds_white.png \
 	nds_yellow.png \
-	newcs_green.png \
-	oscam_green.png \
-	oscam_yellow.png \
-	osemu_green.png \
-	osemu_yellow.png \
 	powervu_green.png \
 	powervu_white.png \
 	powervu_yellow.png \
 	seca_green.png \
 	seca_white.png \
 	seca_yellow.png \
-	srv_green.png \
 	tan_green.png \
 	tan_white.png \
 	tan_yellow.png \
diff --git a/data/icons/status/camd/Makefile.am b/data/icons/status/camd/Makefile.am
new file mode 100644
index 000000000..4e83590a3
--- /dev/null
+++ b/data/icons/status/camd/Makefile.am
@@ -0,0 +1,22 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	cccam_green.png \
+	ci+_green.png \
+	ci+_grey.png \
+	dec_card.png \
+	dec_fta.png \
+	dec_int.png \
+	dec_na.png \
+	dec_net.png \
+	doscam_green.png \
+	doscam_yellow.png \
+	gbox_green.png \
+	mgcamd_green.png \
+	ncam_green.png \
+	ncam_yellow.png \
+	newcs_green.png \
+	oscam_green.png \
+	oscam_yellow.png \
+	osemu_green.png \
+	osemu_yellow.png
diff --git a/data/icons/status/camd/cccam_green.png b/data/icons/status/camd/cccam_green.png
new file mode 100644
index 000000000..005d54464
Binary files /dev/null and b/data/icons/status/camd/cccam_green.png differ
diff --git a/data/icons/status/camd/ci+_green.png b/data/icons/status/camd/ci+_green.png
new file mode 100644
index 000000000..5bf5166ae
Binary files /dev/null and b/data/icons/status/camd/ci+_green.png differ
diff --git a/data/icons/status/camd/ci+_grey.png b/data/icons/status/camd/ci+_grey.png
new file mode 100644
index 000000000..58557a743
Binary files /dev/null and b/data/icons/status/camd/ci+_grey.png differ
diff --git a/data/icons/status/camd/dec_card.png b/data/icons/status/camd/dec_card.png
new file mode 100644
index 000000000..5ac6b5e63
Binary files /dev/null and b/data/icons/status/camd/dec_card.png differ
diff --git a/data/icons/status/camd/dec_fta.png b/data/icons/status/camd/dec_fta.png
new file mode 100644
index 000000000..7b6406b94
Binary files /dev/null and b/data/icons/status/camd/dec_fta.png differ
diff --git a/data/icons/status/camd/dec_int.png b/data/icons/status/camd/dec_int.png
new file mode 100644
index 000000000..91705a516
Binary files /dev/null and b/data/icons/status/camd/dec_int.png differ
diff --git a/data/icons/status/camd/dec_na.png b/data/icons/status/camd/dec_na.png
new file mode 100644
index 000000000..cddde30a2
Binary files /dev/null and b/data/icons/status/camd/dec_na.png differ
diff --git a/data/icons/status/camd/dec_net.png b/data/icons/status/camd/dec_net.png
new file mode 100644
index 000000000..b5eb10473
Binary files /dev/null and b/data/icons/status/camd/dec_net.png differ
diff --git a/data/icons/status/camd/doscam_green.png b/data/icons/status/camd/doscam_green.png
new file mode 100644
index 000000000..6bdf44330
Binary files /dev/null and b/data/icons/status/camd/doscam_green.png differ
diff --git a/data/icons/status/camd/doscam_yellow.png b/data/icons/status/camd/doscam_yellow.png
new file mode 100644
index 000000000..835e125ac
Binary files /dev/null and b/data/icons/status/camd/doscam_yellow.png differ
diff --git a/data/icons/status/camd/gbox_green.png b/data/icons/status/camd/gbox_green.png
new file mode 100644
index 000000000..c14529889
Binary files /dev/null and b/data/icons/status/camd/gbox_green.png differ
diff --git a/data/icons/status/camd/mgcamd_green.png b/data/icons/status/camd/mgcamd_green.png
new file mode 100644
index 000000000..df32b2a39
Binary files /dev/null and b/data/icons/status/camd/mgcamd_green.png differ
diff --git a/data/icons/status/camd/ncam_green.png b/data/icons/status/camd/ncam_green.png
new file mode 100644
index 000000000..444780441
Binary files /dev/null and b/data/icons/status/camd/ncam_green.png differ
diff --git a/data/icons/status/camd/ncam_yellow.png b/data/icons/status/camd/ncam_yellow.png
new file mode 100644
index 000000000..d29d0dbe6
Binary files /dev/null and b/data/icons/status/camd/ncam_yellow.png differ
diff --git a/data/icons/status/camd/newcs_green.png b/data/icons/status/camd/newcs_green.png
new file mode 100644
index 000000000..4d9ef77fd
Binary files /dev/null and b/data/icons/status/camd/newcs_green.png differ
diff --git a/data/icons/status/camd/oscam_green.png b/data/icons/status/camd/oscam_green.png
new file mode 100644
index 000000000..d812902f2
Binary files /dev/null and b/data/icons/status/camd/oscam_green.png differ
diff --git a/data/icons/status/camd/oscam_yellow.png b/data/icons/status/camd/oscam_yellow.png
new file mode 100644
index 000000000..53809cba3
Binary files /dev/null and b/data/icons/status/camd/oscam_yellow.png differ
diff --git a/data/icons/status/camd/osemu_green.png b/data/icons/status/camd/osemu_green.png
new file mode 100644
index 000000000..7f007190d
Binary files /dev/null and b/data/icons/status/camd/osemu_green.png differ
diff --git a/data/icons/status/camd/osemu_yellow.png b/data/icons/status/camd/osemu_yellow.png
new file mode 100644
index 000000000..323e9db4a
Binary files /dev/null and b/data/icons/status/camd/osemu_yellow.png differ
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 0a0504f8f..a84b53241 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -1055,7 +1055,7 @@ void CInfoViewerBB::paint_cam_icons()
 		if ( getpidof(icon_name[i]) ) {
 			buf.str("");
 			buf << icon_name[i] << "_green";
-			if(strstr(icon_name[i], "doscam") || strstr(icon_name[i], "oscam") || strstr(icon_name[i], "osemu")) {
+			if(strstr(icon_name[i], "doscam") || strstr(icon_name[i], "ncam") || strstr(icon_name[i], "oscam") || strstr(icon_name[i], "osemu")) {
 				if(camCI && useCI && filter_channels) {
 					buf.str("");
 					buf << icon_name[i] << "_yellow";