diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index ea565a6a3..c91f0e185 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1110,7 +1110,7 @@ void CInfoViewer::loop(bool show_dot)
 				showRadiotext();
 
 			infoViewerBB->showIcon_16_9();
-			//infoViewerBB->showIcon_CA_Status(0);
+			//infoViewerBB->paint_ca_icons(0);
 			infoViewerBB->showIcon_Resolution();
 		} else if ((msg == NeutrinoMessages::EVT_RECORDMODE) && 
 			   (CMoviePlayerGui::getInstance().timeshift) && (CRecordManager::getInstance()->GetRecordCount() == 1)) {
@@ -1412,9 +1412,9 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
 	} else if (msg == NeutrinoMessages::EVT_ZAP_GOTPIDS) {
 		if ((*(t_channel_id *) data) == current_channel_id) {
 			if (is_visible && showButtonBar) {
+				//infoViewerBB->paint_ca_icons(0);
 				infoViewerBB->showIcon_VTXT();
 				infoViewerBB->showIcon_SubT();
-				//infoViewerBB->showIcon_CA_Status(0);
 				infoViewerBB->showIcon_Resolution();
 				infoViewerBB->showIcon_Tuner();
 			}
@@ -1429,7 +1429,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
 		//chanready = 1;
 		showSNR ();
 		if (is_visible && showButtonBar)
-			infoViewerBB->showIcon_CA_Status(0);
+			infoViewerBB->paint_ca_icons(0);
 		//Set_CA_Status (data);
 		return messages_return::handled;
 	} else if (msg == NeutrinoMessages::EVT_TIMER) {
@@ -2077,7 +2077,7 @@ void CInfoViewer::killTitle()
 void CInfoViewer::Set_CA_Status (int /*Status*/)
 {
 	if (is_visible && showButtonBar)
-		infoViewerBB->showIcon_CA_Status(1);
+		infoViewerBB->paint_ca_icons(1);
 }
 #endif
 /******************************************************************************
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 3c6cd5e65..4d1cba306 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -450,15 +450,16 @@ void CInfoViewerBB::paintshowButtonBar(bool noTimer/*=false*/)
 	// Buttons
 	showBBButtons();
 
+#if 0
+	scrambledCheck(true);
+#endif
+	paint_ca_icons(0);
+
 	// Icons, starting from right
 	showIcon_SubT();
 	showIcon_VTXT();
 	showIcon_DD();
 	showIcon_16_9();
-#if 0
-	scrambledCheck(true);
-#endif
-	showIcon_CA_Status(0);
 	showIcon_Resolution();
 	showIcon_Tuner();
 	showSysfsHdd();
@@ -626,7 +627,7 @@ void CInfoViewerBB::showIcon_Resolution()
 	showBBIcons(CInfoViewerBB::ICON_RES, icon_name);
 }
 
-void CInfoViewerBB::showOne_CAIcon()
+void CInfoViewerBB::showIcon_CA()
 {
 	std::string sIcon = "";
 #if 0
@@ -718,7 +719,7 @@ void CInfoViewerBB::showBarHdd(int percent)
 	}
 }
 
-void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_offset)
+void CInfoViewerBB::paint_ca_icon(int caid, const char *icon, int &icon_space_offset)
 {
 	char buf[20];
 	int endx = g_InfoViewer->BoxEndX - OFFSET_INNER_MID - (g_settings.infobar_casystem_frame ? FRAME_WIDTH_MIN + OFFSET_INNER_SMALL : 0);
@@ -784,14 +785,15 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o
 	}
 }
 
-void CInfoViewerBB::showIcon_CA_Status(int notfirst)
+void CInfoViewerBB::paint_ca_icons(int notfirst)
 {
 	if (g_settings.infobar_casystem_display == 3)
 		return;
+
 	if(NeutrinoModes::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){
 		if (g_settings.infobar_casystem_display == 2) {
 			fta = true;
-			showOne_CAIcon();
+			showIcon_CA();
 		}
 		return;
 	}
@@ -805,11 +807,11 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
 	if(!g_InfoViewer->chanready) {
 		if (g_settings.infobar_casystem_display == 2) {
 			fta = true;
-			showOne_CAIcon();
+			showIcon_CA();
 		}
 		else if(g_settings.infobar_casystem_display == 0) {
 			for (int i = 0; i < (int)(sizeof(caids)/sizeof(int)); i++) {
-				paint_ca_icons(caids[i], white, icon_space_offset);
+				paint_ca_icon(caids[i], white, icon_space_offset);
 			}
 		}
 		return;
@@ -821,7 +823,7 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
 
 	if (g_settings.infobar_casystem_display == 2) {
 		fta = channel->camap.empty();
-		showOne_CAIcon();
+		showIcon_CA();
 		return;
 	}
 
@@ -836,9 +838,9 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst)
 					break;
 			}
 			if(g_settings.infobar_casystem_display == 0)
-				paint_ca_icons(caids[i], (found ? yellow : white), icon_space_offset);
+				paint_ca_icon(caids[i], (found ? yellow : white), icon_space_offset);
 			else if(found)
-				paint_ca_icons(caids[i], yellow, icon_space_offset);
+				paint_ca_icon(caids[i], yellow, icon_space_offset);
 		}
 	}
 }
@@ -964,7 +966,7 @@ void CInfoViewerBB::scrambledCheck(bool force)
 	}
 	
 	if ((scrambledErr != scrambledErrSave) || (scrambledNoSig != scrambledNoSigSave) || force) {
-		showIcon_CA_Status(0);
+		paint_ca_icons(0);
 		showIcon_Resolution();
 		scrambledErrSave = scrambledErr;
 		scrambledNoSigSave = scrambledNoSig;
diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h
index 4f1f2bad6..7d998e15e 100644
--- a/src/gui/infoviewer_bb.h
+++ b/src/gui/infoviewer_bb.h
@@ -112,9 +112,8 @@ class CInfoViewerBB
 		void getBBIconInfo(void);
 		bool checkBBIcon(const char * const icon, int *w, int *h);
 
-		void paint_ca_icons(int, const char*, int&);
+		void paint_ca_icon(int, const char*, int&);
 		void paint_ca_bar();
-		void showOne_CAIcon();
 
 		static void* scrambledThread(void *arg);
 		void scrambledCheck(bool force=false);
@@ -132,8 +131,8 @@ class CInfoViewerBB
 		int bottom_bar_offset, InfoHeightY_Info;
 		bool is_visible;
 
+		void paint_ca_icons(int);
 		void showSysfsHdd(void);
-		void showIcon_CA_Status(int);
 		void showIcon_16_9();
 		void showIcon_RadioText(bool rt_available);
 		void showIcon_VTXT();
@@ -141,6 +140,7 @@ class CInfoViewerBB
 		void showIcon_Resolution();
 		void showIcon_Tuner(void);
 		void showIcon_DD(void);
+		void showIcon_CA();
 		void showBBButtons(bool paintFooter = false);
 		void paintshowButtonBar(bool noTimer = false);
 		void getBBButtonInfo(void);