diff --git a/data/icons/status/channel/Makefile.am b/data/icons/status/channel/Makefile.am
index 94419ca0e..bbb3ee71f 100644
--- a/data/icons/status/channel/Makefile.am
+++ b/data/icons/status/channel/Makefile.am
@@ -31,9 +31,36 @@ install_DATA = \
 	res_uhd.png \
 	subt.png \
 	subt_gray.png \
-	tuner_1.png \
-	tuner_2.png \
-	tuner_3.png \
-	tuner_4.png \
 	vtxt.png \
 	vtxt_gray.png
+
+install_DATA += \
+	tuner.png \
+	tuner_01.png \
+	tuner_02.png \
+	tuner_03.png \
+	tuner_04.png
+
+if ! BOXTYPE_CST
+install_DATA += \
+	tuner_05.png \
+	tuner_06.png \
+	tuner_07.png \
+	tuner_08.png \
+	tuner_09.png \
+	tuner_10.png \
+	tuner_11.png \
+	tuner_12.png \
+	tuner_13.png \
+	tuner_14.png \
+	tuner_15.png \
+	tuner_16.png \
+	tuner_17.png \
+	tuner_18.png \
+	tuner_19.png \
+	tuner_20.png \
+	tuner_21.png \
+	tuner_22.png \
+	tuner_23.png \
+	tuner_24.png
+endif
diff --git a/data/icons/status/channel/tuner.png b/data/icons/status/channel/tuner.png
new file mode 100644
index 000000000..f6c69e0ba
Binary files /dev/null and b/data/icons/status/channel/tuner.png differ
diff --git a/data/icons/status/channel/tuner_01.png b/data/icons/status/channel/tuner_01.png
new file mode 100644
index 000000000..ac1dc140a
Binary files /dev/null and b/data/icons/status/channel/tuner_01.png differ
diff --git a/data/icons/status/channel/tuner_02.png b/data/icons/status/channel/tuner_02.png
new file mode 100644
index 000000000..90eb80cf5
Binary files /dev/null and b/data/icons/status/channel/tuner_02.png differ
diff --git a/data/icons/status/channel/tuner_03.png b/data/icons/status/channel/tuner_03.png
new file mode 100644
index 000000000..279eebb79
Binary files /dev/null and b/data/icons/status/channel/tuner_03.png differ
diff --git a/data/icons/status/channel/tuner_04.png b/data/icons/status/channel/tuner_04.png
new file mode 100644
index 000000000..6392026d6
Binary files /dev/null and b/data/icons/status/channel/tuner_04.png differ
diff --git a/data/icons/status/channel/tuner_05.png b/data/icons/status/channel/tuner_05.png
new file mode 100644
index 000000000..bf921380d
Binary files /dev/null and b/data/icons/status/channel/tuner_05.png differ
diff --git a/data/icons/status/channel/tuner_06.png b/data/icons/status/channel/tuner_06.png
new file mode 100644
index 000000000..3a502878c
Binary files /dev/null and b/data/icons/status/channel/tuner_06.png differ
diff --git a/data/icons/status/channel/tuner_07.png b/data/icons/status/channel/tuner_07.png
new file mode 100644
index 000000000..840f32dd0
Binary files /dev/null and b/data/icons/status/channel/tuner_07.png differ
diff --git a/data/icons/status/channel/tuner_08.png b/data/icons/status/channel/tuner_08.png
new file mode 100644
index 000000000..2d76ddc50
Binary files /dev/null and b/data/icons/status/channel/tuner_08.png differ
diff --git a/data/icons/status/channel/tuner_09.png b/data/icons/status/channel/tuner_09.png
new file mode 100644
index 000000000..9ee9cd1c0
Binary files /dev/null and b/data/icons/status/channel/tuner_09.png differ
diff --git a/data/icons/status/channel/tuner_1.png b/data/icons/status/channel/tuner_1.png
deleted file mode 100644
index 14d8b838c..000000000
Binary files a/data/icons/status/channel/tuner_1.png and /dev/null differ
diff --git a/data/icons/status/channel/tuner_10.png b/data/icons/status/channel/tuner_10.png
new file mode 100644
index 000000000..56a628f58
Binary files /dev/null and b/data/icons/status/channel/tuner_10.png differ
diff --git a/data/icons/status/channel/tuner_11.png b/data/icons/status/channel/tuner_11.png
new file mode 100644
index 000000000..b9771b1c5
Binary files /dev/null and b/data/icons/status/channel/tuner_11.png differ
diff --git a/data/icons/status/channel/tuner_12.png b/data/icons/status/channel/tuner_12.png
new file mode 100644
index 000000000..97db30ac2
Binary files /dev/null and b/data/icons/status/channel/tuner_12.png differ
diff --git a/data/icons/status/channel/tuner_13.png b/data/icons/status/channel/tuner_13.png
new file mode 100644
index 000000000..91067ce71
Binary files /dev/null and b/data/icons/status/channel/tuner_13.png differ
diff --git a/data/icons/status/channel/tuner_14.png b/data/icons/status/channel/tuner_14.png
new file mode 100644
index 000000000..60e22877a
Binary files /dev/null and b/data/icons/status/channel/tuner_14.png differ
diff --git a/data/icons/status/channel/tuner_15.png b/data/icons/status/channel/tuner_15.png
new file mode 100644
index 000000000..1f0d975bf
Binary files /dev/null and b/data/icons/status/channel/tuner_15.png differ
diff --git a/data/icons/status/channel/tuner_16.png b/data/icons/status/channel/tuner_16.png
new file mode 100644
index 000000000..8d591496f
Binary files /dev/null and b/data/icons/status/channel/tuner_16.png differ
diff --git a/data/icons/status/channel/tuner_17.png b/data/icons/status/channel/tuner_17.png
new file mode 100644
index 000000000..12798b2f8
Binary files /dev/null and b/data/icons/status/channel/tuner_17.png differ
diff --git a/data/icons/status/channel/tuner_18.png b/data/icons/status/channel/tuner_18.png
new file mode 100644
index 000000000..f71a45a86
Binary files /dev/null and b/data/icons/status/channel/tuner_18.png differ
diff --git a/data/icons/status/channel/tuner_19.png b/data/icons/status/channel/tuner_19.png
new file mode 100644
index 000000000..d496e44f6
Binary files /dev/null and b/data/icons/status/channel/tuner_19.png differ
diff --git a/data/icons/status/channel/tuner_2.png b/data/icons/status/channel/tuner_2.png
deleted file mode 100644
index 9eed04f9b..000000000
Binary files a/data/icons/status/channel/tuner_2.png and /dev/null differ
diff --git a/data/icons/status/channel/tuner_20.png b/data/icons/status/channel/tuner_20.png
new file mode 100644
index 000000000..d16627f72
Binary files /dev/null and b/data/icons/status/channel/tuner_20.png differ
diff --git a/data/icons/status/channel/tuner_21.png b/data/icons/status/channel/tuner_21.png
new file mode 100644
index 000000000..8820a34be
Binary files /dev/null and b/data/icons/status/channel/tuner_21.png differ
diff --git a/data/icons/status/channel/tuner_22.png b/data/icons/status/channel/tuner_22.png
new file mode 100644
index 000000000..c23253a81
Binary files /dev/null and b/data/icons/status/channel/tuner_22.png differ
diff --git a/data/icons/status/channel/tuner_23.png b/data/icons/status/channel/tuner_23.png
new file mode 100644
index 000000000..453cf021b
Binary files /dev/null and b/data/icons/status/channel/tuner_23.png differ
diff --git a/data/icons/status/channel/tuner_24.png b/data/icons/status/channel/tuner_24.png
new file mode 100644
index 000000000..538cefc99
Binary files /dev/null and b/data/icons/status/channel/tuner_24.png differ
diff --git a/data/icons/status/channel/tuner_3.png b/data/icons/status/channel/tuner_3.png
deleted file mode 100644
index 63e9f86fc..000000000
Binary files a/data/icons/status/channel/tuner_3.png and /dev/null differ
diff --git a/data/icons/status/channel/tuner_4.png b/data/icons/status/channel/tuner_4.png
deleted file mode 100644
index 76ecc2b40..000000000
Binary files a/data/icons/status/channel/tuner_4.png and /dev/null differ
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 67c6ee4bc..be1fa0e9b 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -210,7 +210,7 @@ void CInfoViewerBB::getBBIconInfo()
 			break;
 		case CInfoViewerBB::ICON_TUNER:
 			if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !isTSMode && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id()))
-				iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h);
+				iconView = checkBBIcon(NEUTRINO_ICON_TUNER, &w, &h);
 			break;
 		default:
 			break;
@@ -695,22 +695,13 @@ void CInfoViewerBB::showIcon_Tuner()
 		return;
 	}
 
-	std::string icon_name;
-	switch (CFEManager::getInstance()->getLiveFE()->getNumber()) {
-		case 1:
-			icon_name = NEUTRINO_ICON_TUNER_2;
-			break;
-		case 2:
-			icon_name = NEUTRINO_ICON_TUNER_3;
-			break;
-		case 3:
-			icon_name = NEUTRINO_ICON_TUNER_4;
-			break;
-		case 0:
-		default:
-			icon_name = NEUTRINO_ICON_TUNER_1;
-			break;
-	}
+	char icon_name[12];
+	snprintf(icon_name, sizeof(icon_name), "%s_%02d", NEUTRINO_ICON_TUNER, CFEManager::getInstance()->getLiveFE()->getNumber() + 1);
+
+	int w = 0, h = 0;
+	if (!checkBBIcon(icon_name, &w, &h))
+		snprintf(icon_name, sizeof(icon_name), "%s", NEUTRINO_ICON_TUNER);
+
 	showBBIcons(CInfoViewerBB::ICON_TUNER, icon_name);
 }
 
diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h
index 1b8425352..b2233ce7a 100644
--- a/src/gui/widget/icons.h
+++ b/src/gui/widget/icons.h
@@ -275,10 +275,7 @@
 #define NEUTRINO_ICON_SCRAMBLED2_GREY	"ca2_gray"
 #define NEUTRINO_ICON_SUBT		"subt"
 #define NEUTRINO_ICON_SUBT_GREY		"subt_gray"
-#define NEUTRINO_ICON_TUNER_1		"tuner_1"
-#define NEUTRINO_ICON_TUNER_2		"tuner_2"
-#define NEUTRINO_ICON_TUNER_3		"tuner_3"
-#define NEUTRINO_ICON_TUNER_4		"tuner_4"
+#define NEUTRINO_ICON_TUNER		"tuner"
 #define NEUTRINO_ICON_VTXT		"vtxt"
 #define NEUTRINO_ICON_VTXT_GREY		"vtxt_gray"