diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp
index a64ffa682..b8f136553 100644
--- a/src/driver/glcd/glcd.cpp
+++ b/src/driver/glcd/glcd.cpp
@@ -467,96 +467,106 @@ void cGLCD::Exec()
 				ecmLocked = false;
 		}
 
-		if (recLocked) {
-			drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Red,
-				GLCD::cColor::Transparent, true, 0, 0);
-		} else {
-			drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Gray,
-				GLCD::cColor::Transparent, true, 0, 0);
-		}
-
-		if (muteLocked) {
-			drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Green,
-				GLCD::cColor::Transparent, true, 0, 0);
-		} else {
-			drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Gray,
-				GLCD::cColor::Transparent, true, 0, 0);
-		}
-
-		if (tsLocked) {
-			drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Red,
-				GLCD::cColor::Transparent, true, 0, 0);
-		} else {
-			drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Gray,
-				GLCD::cColor::Transparent, true, 0, 0);
-		}
-#if 0
-		if (ecmLocked) {
-			drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Green,
-				GLCD::cColor::Transparent, true, 0, 0);
-		} else {
-			drawText(t.glcd_icon_ecm_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "ecm", &font_smalltext, GLCD::cColor::Gray,
-				GLCD::cColor::Transparent, true, 0, 0);
-		}
-#endif
-		if (timerLocked) {
-			drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Green,
-				GLCD::cColor::Transparent, true, 0, 0);
-		} else {
-			drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Gray,
-				GLCD::cColor::Transparent, true, 0, 0);
-		}
-
-		if (ddLocked) {
-			drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Green,
-				GLCD::cColor::Transparent, true, 0, 0);
-		} else {
-			drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Gray,
-				GLCD::cColor::Transparent, true, 0, 0);
-		}
-
-		if (ismediaplayer) {
-			if (subLocked) {
-				drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
-					bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Green,
+		if (t.glcd_icon_rec_x_position)
+		{
+			if (recLocked) {
+				drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Red,
 					GLCD::cColor::Transparent, true, 0, 0);
 			} else {
-				drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
-					bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Gray,
-					GLCD::cColor::Transparent, true, 0, 0);
-			}
-		} else {
-			if (txtLocked) {
-				drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
-					bitmap->Width() - 1, SmalltextWidth, "rt", &font_smalltext, GLCD::cColor::Green,
-					GLCD::cColor::Transparent, true, 0, 0);
-			} else {
-				drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
-					bitmap->Width() - 1, SmalltextWidth, "rt", &font_smalltext, GLCD::cColor::Gray,
+				drawText(t.glcd_icon_rec_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "rec", &font_smalltext, GLCD::cColor::Gray,
 					GLCD::cColor::Transparent, true, 0, 0);
 			}
 		}
 
-		if (camLocked) {
-			drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Green,
-				GLCD::cColor::Transparent, true, 0, 0);
-		} else {
-			drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
-				bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Gray,
-				GLCD::cColor::Transparent, true, 0, 0);
+		if (t.glcd_icon_mute_x_position)
+		{
+			if (muteLocked) {
+				drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Green,
+					GLCD::cColor::Transparent, true, 0, 0);
+			} else {
+				drawText(t.glcd_icon_mute_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "mute", &font_smalltext, GLCD::cColor::Gray,
+					GLCD::cColor::Transparent, true, 0, 0);
+			}
+		}
+
+		if (t.glcd_icon_ts_x_position)
+		{
+			if (tsLocked) {
+				drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Red,
+					GLCD::cColor::Transparent, true, 0, 0);
+			} else {
+				drawText(t.glcd_icon_ts_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "ts", &font_smalltext, GLCD::cColor::Gray,
+					GLCD::cColor::Transparent, true, 0, 0);
+			}
+		}
+		if (t.glcd_icon_timer_x_position)
+		{
+			if (timerLocked) {
+				drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Yellow,
+					GLCD::cColor::Transparent, true, 0, 0);
+			} else {
+				drawText(t.glcd_icon_timer_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "timer", &font_smalltext, GLCD::cColor::Gray,
+					GLCD::cColor::Transparent, true, 0, 0);
+			}
+		}
+
+		if (t.glcd_icon_dd_x_position)
+		{
+			if (ddLocked) {
+				drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Green,
+					GLCD::cColor::Transparent, true, 0, 0);
+			} else {
+				drawText(t.glcd_icon_dd_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "dd", &font_smalltext, GLCD::cColor::Gray,
+					GLCD::cColor::Transparent, true, 0, 0);
+			}
+		}
+
+		if (t.glcd_icon_txt_x_position)
+		{
+			if (ismediaplayer) {
+				if (subLocked) {
+					drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
+						bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Green,
+						GLCD::cColor::Transparent, true, 0, 0);
+				} else {
+					drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
+						bitmap->Width() - 1, SmalltextWidth, "sub", &font_smalltext, GLCD::cColor::Gray,
+						GLCD::cColor::Transparent, true, 0, 0);
+				}
+			} else {
+				if (txtLocked) {
+					drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
+						bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Green,
+						GLCD::cColor::Transparent, true, 0, 0);
+				} else {
+					drawText(t.glcd_icon_txt_x_position, t.glcd_icons_y_position,
+						bitmap->Width() - 1, SmalltextWidth, "txt", &font_smalltext, GLCD::cColor::Gray,
+						GLCD::cColor::Transparent, true, 0, 0);
+				}
+			}
+		}
+
+		if (t.glcd_icon_cam_x_position)
+		{
+			if (camLocked) {
+				drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Green,
+					GLCD::cColor::Transparent, true, 0, 0);
+			} else {
+				drawText(t.glcd_icon_cam_x_position, t.glcd_icons_y_position,
+					bitmap->Width() - 1, SmalltextWidth, "cam", &font_smalltext, GLCD::cColor::Gray,
+					GLCD::cColor::Transparent, true, 0, 0);
+			}
 		}
 	}
 
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 66ca33b45..4d14bc5b8 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -498,7 +498,7 @@ void CInfoViewerBB::showIcon_SubT()
 
 	showBBIcons(CInfoViewerBB::ICON_SUBT, (have_sub) ? NEUTRINO_ICON_SUBT : NEUTRINO_ICON_SUBT_GREY);
 #ifdef ENABLE_GRAPHLCD
-	if (cc && cc->getSubtitleCount())
+	if (have_sub)
 		cGLCD::lockIcon(cGLCD::SUB);
 	else
 		cGLCD::unlockIcon(cGLCD::SUB);
@@ -511,7 +511,7 @@ void CInfoViewerBB::showIcon_VTXT()
 		return;
 	showBBIcons(CInfoViewerBB::ICON_VTXT, (g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0) ? NEUTRINO_ICON_VTXT : NEUTRINO_ICON_VTXT_GREY);
 #ifdef ENABLE_GRAPHLCD
-	if (g_RemoteControl->current_PIDs.PIDs.vtxtpid)
+	if (g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0)
 		cGLCD::lockIcon(cGLCD::TXT);
 	else
 		cGLCD::unlockIcon(cGLCD::TXT);
@@ -848,6 +848,13 @@ void CInfoViewerBB::paint_ca_icons(int notfirst)
 		return;
 	}
 
+#ifdef ENABLE_GRAPHLCD
+		if (fta)
+			cGLCD::unlockIcon(cGLCD::CAM);
+		else
+			cGLCD::lockIcon(cGLCD::CAM);
+#endif
+
 	if(!notfirst) {
 		for (int i = 0; i < (int)(sizeof(caids)/sizeof(int)); i++) {
 			bool found = false;