diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 2555dc7cb..1cbb2be53 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -734,10 +734,10 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o
 	int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL;
 	int px = 0;
 	static std::map<int, std::pair<int,const char*> > icon_map;
-	const int icon_space = OFFSET_INNER_SMALL, icon_number = 11; //NI
+	const int icon_space = OFFSET_INNER_SMALL, icon_number = 12;
 
-	static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0,0}; //NI
-	static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0,0}; //NI
+	static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0,0,0};
+	static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0,0,0};
 	static bool init_flag = false;
 
 	if (!init_flag) {
@@ -755,7 +755,8 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o
 		icon_map[0x1800] = std::make_pair(index++,"nagra");
 		icon_map[0x0B00] = std::make_pair(index++,"conax");
 		icon_map[0x0D00] = std::make_pair(index++,"cw");
-		icon_map[0x0900] = std::make_pair(index  ,"nds");
+		icon_map[0x0900] = std::make_pair(index++,"nds");
+		icon_map[0x1000] = std::make_pair(index  ,"tan");
 
 		for (it=icon_map.begin(); it!=icon_map.end(); ++it) {
 			snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, (*it).second.first==0 ? "na" : "white"); //NI
@@ -808,7 +809,7 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
 		return;
 	}
 
-	int caids[] = {  0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600,  0x2600, 0x4a00, 0x0E00, 0x0000 }; //NI
+	int caids[] = { 0x1000, 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600,  0x2600, 0x4a00, 0x0E00, 0x0000 };
 	const char *green = "green"; //NI
 	const char *white = "white";
 	const char *yellow = "yellow";
diff --git a/src/gui/streaminfo1.cpp b/src/gui/streaminfo1.cpp
index 494cbe8b9..fcb6b5445 100644
--- a/src/gui/streaminfo1.cpp
+++ b/src/gui/streaminfo1.cpp
@@ -876,7 +876,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 	}
 }
 
-#define NUM_CAIDS 11
+#define NUM_CAIDS 12
 void CStreamInfo2::paintCASystem(int xpos, int ypos)
 {
 	unsigned short i;
@@ -884,7 +884,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
 	if (box_h2 > ypos+(iheight*2))
 		frameBuffer->paintBox(0, ypos+(iheight*2), box_width, box_h2, COL_MENUCONTENT_PLUS_0);
 
-	std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
+	std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:"};
 	bool caids[NUM_CAIDS];
 	int array[NUM_CAIDS];
 	char tmp[100];
@@ -936,6 +936,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
 			case 0x0E:
 				idx = 10;
 				break;
+			case 0x10:
+				idx = 11;
+				break;
 			default:
 				break;
 		}
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 21613ba7b..48f6ac7d0 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -1191,7 +1191,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 		paintCASystem(xpos, ypos);
 }
 
-#define NUM_CAIDS 11
+#define NUM_CAIDS 12
 void CStreamInfo2::paintCASystem(int xpos, int ypos)
 {
 	int ypos1 = ypos;
@@ -1199,7 +1199,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
 	if (box_h2 > 0)
 		frameBuffer->paintBoxRel (0, ypos, box_width, box_h2, COL_MENUCONTENT_PLUS_0);
 
-	std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
+	std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:"};
 	bool caids[NUM_CAIDS];
 	int array[NUM_CAIDS];
 	char tmp[100];
@@ -1269,6 +1269,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
 			case 0x0E:
 				idx = 10;
 				break;
+			case 0x10:
+				idx = 11;
+				break;
 			default:
 				break;
 		}