From c32faa8302443ba1ba4894866c4b39d75c546ed5 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 30 Dec 2020 23:08:55 +0100
Subject: [PATCH] - infoviewer: rework tuner icons

 Conflicts:
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png

Signed-off-by: Thilo Graf <dbt@novatux.de>

I think it's not an excellent idea to have many icons for all possible
tuner numbers. We should use one and only icon without any number
and paint a text over the icon. This should be possible with a simple
cc text object that contains a defined png-file file as background
and a digit as text.
---
 data/icons/status/channel/Makefile.am  |  35 ++++++++++++++++++++++---
 data/icons/status/channel/tuner.png    | Bin 0 -> 219 bytes
 data/icons/status/channel/tuner_01.png | Bin 0 -> 207 bytes
 data/icons/status/channel/tuner_02.png | Bin 0 -> 233 bytes
 data/icons/status/channel/tuner_03.png | Bin 0 -> 238 bytes
 data/icons/status/channel/tuner_04.png | Bin 0 -> 216 bytes
 data/icons/status/channel/tuner_05.png | Bin 0 -> 229 bytes
 data/icons/status/channel/tuner_06.png | Bin 0 -> 221 bytes
 data/icons/status/channel/tuner_07.png | Bin 0 -> 235 bytes
 data/icons/status/channel/tuner_08.png | Bin 0 -> 242 bytes
 data/icons/status/channel/tuner_09.png | Bin 0 -> 227 bytes
 data/icons/status/channel/tuner_1.png  | Bin 724 -> 0 bytes
 data/icons/status/channel/tuner_10.png | Bin 0 -> 202 bytes
 data/icons/status/channel/tuner_11.png | Bin 0 -> 159 bytes
 data/icons/status/channel/tuner_12.png | Bin 0 -> 196 bytes
 data/icons/status/channel/tuner_13.png | Bin 0 -> 205 bytes
 data/icons/status/channel/tuner_14.png | Bin 0 -> 163 bytes
 data/icons/status/channel/tuner_15.png | Bin 0 -> 195 bytes
 data/icons/status/channel/tuner_16.png | Bin 0 -> 212 bytes
 data/icons/status/channel/tuner_17.png | Bin 0 -> 199 bytes
 data/icons/status/channel/tuner_18.png | Bin 0 -> 233 bytes
 data/icons/status/channel/tuner_19.png | Bin 0 -> 209 bytes
 data/icons/status/channel/tuner_2.png  | Bin 758 -> 0 bytes
 data/icons/status/channel/tuner_20.png | Bin 0 -> 222 bytes
 data/icons/status/channel/tuner_21.png | Bin 0 -> 196 bytes
 data/icons/status/channel/tuner_22.png | Bin 0 -> 203 bytes
 data/icons/status/channel/tuner_23.png | Bin 0 -> 223 bytes
 data/icons/status/channel/tuner_24.png | Bin 0 -> 197 bytes
 data/icons/status/channel/tuner_3.png  | Bin 834 -> 0 bytes
 data/icons/status/channel/tuner_4.png  | Bin 764 -> 0 bytes
 src/gui/infoviewer_bb.cpp              |  25 ++++++------------
 src/gui/widget/icons.h                 |   5 +---
 32 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 data/icons/status/channel/tuner.png
 create mode 100644 data/icons/status/channel/tuner_01.png
 create mode 100644 data/icons/status/channel/tuner_02.png
 create mode 100644 data/icons/status/channel/tuner_03.png
 create mode 100644 data/icons/status/channel/tuner_04.png
 create mode 100644 data/icons/status/channel/tuner_05.png
 create mode 100644 data/icons/status/channel/tuner_06.png
 create mode 100644 data/icons/status/channel/tuner_07.png
 create mode 100644 data/icons/status/channel/tuner_08.png
 create mode 100644 data/icons/status/channel/tuner_09.png
 delete mode 100644 data/icons/status/channel/tuner_1.png
 create mode 100644 data/icons/status/channel/tuner_10.png
 create mode 100644 data/icons/status/channel/tuner_11.png
 create mode 100644 data/icons/status/channel/tuner_12.png
 create mode 100644 data/icons/status/channel/tuner_13.png
 create mode 100644 data/icons/status/channel/tuner_14.png
 create mode 100644 data/icons/status/channel/tuner_15.png
 create mode 100644 data/icons/status/channel/tuner_16.png
 create mode 100644 data/icons/status/channel/tuner_17.png
 create mode 100644 data/icons/status/channel/tuner_18.png
 create mode 100644 data/icons/status/channel/tuner_19.png
 delete mode 100644 data/icons/status/channel/tuner_2.png
 create mode 100644 data/icons/status/channel/tuner_20.png
 create mode 100644 data/icons/status/channel/tuner_21.png
 create mode 100644 data/icons/status/channel/tuner_22.png
 create mode 100644 data/icons/status/channel/tuner_23.png
 create mode 100644 data/icons/status/channel/tuner_24.png
 delete mode 100644 data/icons/status/channel/tuner_3.png
 delete mode 100644 data/icons/status/channel/tuner_4.png

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 0000000000000000000000000000000000000000..f6c69e0bad2b8dd5ffd247de2503867a4a93cc8b
GIT binary patch
literal 219
zcmV<103`p3P)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst0001@Nkl<ZcwVKG
zF$%&k7=^#oM(h=GkB$z-!BGU4;w4<Vb@UP*KwKQWL57ar!y_0mgMv$-<(Gtf+c&&C
zejZWX)}M7n6yE7p9iI2<K^%tKsqS+no*e~gqzB3%mLI&hahkf^uwWzjsG$L%XT@yl
za>EiB#x4hX=DazI4n@NI;fBDP|4#OB7Att((t!rS;~Vk=-Wg&scvtGSz9f9n{TKO5
VC_u?hIkNx&002ovPDHLkV1k=iTH*iz

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_01.png b/data/icons/status/channel/tuner_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac1dc140a3a64bb95f6d233624f63542461b398f
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3scD`rjv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;H{E=@SOVQ!+mKwi2>dIMA2-++$L
zW_f0IW)NU+wl6d*FfcH%U{YjeR%aG*__^d~Vny~3M&5F^w)aOeZ!m=Zn44%T$E(9r
zU?9w~k<q=X`q%ezO}3;)k;Cub>#Ui$?6l{JMHd;~D5@yh?{U2fbRmPMtDnm{r-UW|
D1kFaJ

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_02.png b/data/icons/status/channel/tuner_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..90eb80cf5eb2af1bdef858892eb9afdcb09e73ec
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sSTbkjv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;H{E=@SOVQ!+mKwi2Bd!b_vi~MZf
zIvyDwg#!m4oNr)wQ6rYZ$;ReB;Uv!-1-%YlCIvgyx`f07oJJ4({`k$|<#_tKa|7c;
zb(RG;`0XVuB)%=)DS3pQ(LKj3C*en5fw7_485XCM2PYa>FDQTf`%mwvgU*DcAAjez
hnqDfg<cu_tV&Lu9dY*GFe+|&>44$rjF6*2UngAjJRE_`u

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_03.png b/data/icons/status/channel/tuner_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..279eebb79bc68d2095dc0c6b8028921a37cb2ec4
GIT binary patch
literal 238
zcmV<K01^L*P)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst0002BNkl<ZcwW7e
z!3n}Z5JlgHEF>+Y3lAy41{A?dumJJqCB>uw@gnFg$1Ol?!x9`}Aqpacum*M!e5d&g
z%bS5&(=PnZmPFyjHfDP}msjGbsKvC81Mw`$NaLpm8+sg$o;AR$*8I&dqX3{_juPbj
zvjJ1UQNp`MbJ7k&U>L;#1D7;|A&WHVPLnhPV}?5g4gk^l(Ht5$y&J+2MRRDNqYLH_
o_{Z^isfeY*OKzKbpYTOjPesly26-1q>i_@%07*qoM6N<$f=ZBF<^TWy

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_04.png b/data/icons/status/channel/tuner_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..6392026d6f9711c2d682e7528989a47a3c6f845a
GIT binary patch
literal 216
zcmV;}04M*6P)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst0001=Nkl<ZcwW7e
zu?@m76hxm<EZHk~j|`9nKu9zZ10XsY55oY61_`>98Gt<)fsf<@Op#Q8enjA1@!gzG
z_idXvPdn>Tk;K+!b3OYDIs&Dbct4<L!GvLaWmwbDW;Lt;p6719HcW8<IA*#82UJ<$
z$Lvt>k@lwvRhKf_J>2@8i_UOD01%G44%@7EU3&iU_>u&)1d<fCF82ez=<)&Cu_a<E
SuOdzW0000<MNUMnLSTYRj#AhF

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_05.png b/data/icons/status/channel/tuner_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf921380db32ec3aaef7c6ac09000ff29e73c6ab
GIT binary patch
literal 229
zcmV<B02=>^P)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst00022Nkl<ZcwViO
z%?ZLV7>1up3&{%IqXTpSMetG_K)iYBFd0C+2=?YN1GtAH_z3~@5*i>1Um?#e@c!`f
zk!swAb7N5vq#3Hy>tUbhXz8RHKUehZSh0-dhMJipYYgya!U3K{pEnTYVA$vyOic3F
zEICnnw8wMjpf}{3YW~vCEw<1d-WWUp5|bmy?}jM~g&T?V&Kevp-%#!jdP9&FEiFOn
fX6P;pzUcl7O_V54`~CaV00000NkvXXu0mjfu~=S7

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_06.png b/data/icons/status/channel/tuner_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a502878ca395f37109d24b5561c168704770252
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sU@B+jv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;H{E=@SOVQ!+mKwi3s`v*mV-E8)3
zd~6B~lm2nou_ZVbG+g58bJ#P#QTX8UdGZ^WTjqCMY4{+#QA(z9LSy4(ueu+MM<y8j
z?`!RMJ<Qg@G9jkFwO>^(jY*N2In0jfg7U|||MZSJ=uAlZ@po>k>7^1&&PWp}hHgPa
VcFP0T(}3<}@O1TaS?83{1OW9GPwoH!

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_07.png b/data/icons/status/channel/tuner_07.png
new file mode 100644
index 0000000000000000000000000000000000000000..840f32dd01eac8f1fd77f5671343b91351672cc8
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sZE|Pjv*CsODEfM9Wsz`h+oq9
zjZ1Q`Gyeo`jVABHlA_|5iB=X}-3j><m@C@*<PM4$X+$Wp*8f<fpMB5UNhnnRP@H%N
zM_hPTwXL{#iiFqtSGNT%z15aX)JqAxVW7-j6(w~*aO3+hiDk~`Vzw=n*$}ZnVpade
zrSlTGN{SNM4@Bu4sS|1WtI_d$y%WEM%!A{9&pZ8|^TP7zzwNX0G9;4gtG)koACz7q
j(R98fR8DB$i&uOuRhnJ?z0pQM*E4v!`njxgN@xNA58GC@

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_08.png b/data/icons/status/channel/tuner_08.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d76ddc506b230c6c4edb3160e3c2d4974727646
GIT binary patch
literal 242
zcmV<O01f|%P)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst0002FNkl<ZcwW7e
z!3n}J7=^!-7TOiMMGqaI3n+q@;sD~!ONVg)@gnH0#|$7kh9eju&>AQx{8adh;P(#6
zBY8Z2NKCWv`y@k!cS&uwk4tt(M^5QX(;v~ZBw`vr1va$Upq91t<AE6|04a0n#{(%)
z1wkggZifDCIzGgF<wk)8I<C3~6Ev)muA#tC0hU79ATP=N6R<(xq#qBQhXWiZ>Bnc-
s1%dFAe>^_#a<t@l7bkUjnD9kcFV}!HKW-VI5&!@I07*qoM6N<$g0iMvvj6}9

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_09.png b/data/icons/status/channel/tuner_09.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ee9cd1c0af198530479d82a61a791161b36fc42
GIT binary patch
literal 227
zcmV<90382`P)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst00020Nkl<ZcwS>H
z4g9^7m6L%e@cTP!BxAw1)11#3hyzj#rr#M$|F2;n9)vJ3F^~o*(vZoponb!^Zf8hG
z=VRC4$H2h=0vrtf=zQ!NK+=vt$iTpf&ZpQ9*uf7529O_!*RX-%I|C+QVZaGy0wD<O
zrz{>=kloAyHSIf^$=}iZfad1!4C@)-0E5qh;bu5+q#!L(q~Z5>DF$MJ6vOZDEUb~H
d%Sp(h(Ez-cE>=K6@k#&y002ovPDHLkV1j6HUGD$@

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_1.png b/data/icons/status/channel/tuner_1.png
deleted file mode 100644
index cb753a6c4277714886bbf3aa7aa11e3440dfab60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 724
zcmV;_0xSKAP)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%=J^K~z{r&6i7P
z6G0e&a|wiy5Dk&ENt!gtCUkKdO`{<-LLfm1Ar!O+L2ap4Ee4Fw)Q|_eo-7KAZLKKc
zMLg?4z1PP@5bqv6dGacVI_@m^@67sVJI4)tm&`XaAOG%UUGz5`4qM%B_p7F9#7PVW
zgKzzQe+?qr?e?!mqe05$vZJWi>!j6c{m~mWmtOt7R;!UxspLp1l?v(gdOuur#KmIK
z(a=UCv`{EG8VJqj^CQt#Wb$%N5@zYB^4}S~W%CSro^^dEAT*cDjpR``L%uwp6z0-N
z8TQT|oF*5J%jEOZB&^f(*z-kzP(@KjGCZ3lFK(rQ4_hfN?A0A}jj}K&8~d!@KWM1+
zj-7x|S(b&lxgv2FS7xVB@BIUFiYyOT)2MF;gl4l@VYKsU?&8D64C>8QGi3gVWbpB^
z8NJm>p}rjuDoK(s>N)<A9y*XlJr;JlG!%2}fY4+zDa>%$jHHxiaF6BPrs;29n?xNu
zAT*Ik2s1d7;6jW0agW6siaB;bXe<^Jrhhulg%+l9kA)50xSBv6J0LU?i3rnMn&3ib
zlql-4yxlOL!upjs>evCH;c!@(?qZY+-6xNs9t#_K|MCRt*a4xTP)L{?3lT0<$?ieD
z*8I5PQa(K~Lto#H!~e&sW9VKh5E={yg;_l{&V}yHgivpLoqv}x?zN-nUMmn92n2+=
zej?0WHkI0qdLp5BFGkS4Rv^^x_d6O0^?JRI#t79vMSjxpdORLS;`8~4{(<+~rGI@s
zYc`w4h}~|t<EU1vL~nfKQdQMMW9ek+h@D2K)7e&4b=O};lALr@il^%U0000<MNUMn
GLSTXe0!Wbn

diff --git a/data/icons/status/channel/tuner_10.png b/data/icons/status/channel/tuner_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..56a628f58b9f2fb833861f3399ddb76e3d5b720d
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sfnI0jv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;H{u5FO#YHU!PoM_EFfmh{n=jMa`
zjm?Z44NL6vc>5eUm}Ls=)KAt)SW4A7JZ^1#Xk92}W>AyPz|{7h=e6X6hQ?M#W(y;S
z13n5e0{;L1=^b^@nUM73@7z|?OC^?^ktR|MkrP!EUv6<R0y>Vt)78&qol`;+05ncS
A#{d8T

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_11.png b/data/icons/status/channel/tuner_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9771b1c573f2a1e80fcf63946a5f4c2b76244c2
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sWeX)$B>G+WF6i=d#6mD+^F&4
zw{^Bk^1<zw=bV@5U=HG0c3;x_|N2A)xfTNh!wGC2*AFzEy37C6;?V=+fHx}cZ0<5O
zk8&lhI(YghHz-@pzgPF;Z){g%gu+pvLEPC(UKR;$$}nLNN)TrXyQ2IVXd{ECtDnm{
Hr-UW|)|xpd

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_12.png b/data/icons/status/channel/tuner_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..97db30ac2ab9e673090e247cdda9c4923990e49a
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3scugf$B>G+WF6i=d#6mD+^F&4
zw{^Bk^1<zw=bV@5U=HG0c3;x_|N2A)xfTNh!wGC2*AE<OVEX2q>8|pPzm1p2*mGlJ
z^FjITynQFO9msvU<P5)sqgt~(GdnX!jru7zm8Y*eH#agr<X`oR(S1+ARW|pOSta%X
w>mGhD*JMj-6gm9<z0R76%T9ZqSagx0`h|Sr9-;GpfX-s@boFyt=akR{0742%mjD0&

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_13.png b/data/icons/status/channel/tuner_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..91067ce711251d557e88cc273730687d3b57d551
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sVSZ=jv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;I4t{*tm!1T>I(_Q5oe;Y54vFFCd
z=7aLHd1t6uAIg2Ia+UvoK+XZ~Z_QKZtDa?ZV^dSgarih{v9nI$THD`(Yvq@6ew^DN
zx1YC9!{lUUXA$rI{oaNG+)E_t>eCZ@O=A6=#Cq8nwx}yLY_KxF0dyaOr>mdKI;Vst
E0P%oJNB{r;

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_14.png b/data/icons/status/channel/tuner_14.png
new file mode 100644
index 0000000000000000000000000000000000000000..60e22877a2c32aaf46a3bee9b6788ff31e2089a4
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sVq+y$B>G+WF6i=d#6mD+^F&4
zw{^Bk^1<zw=bV@5U=HG0c3;x_|N2A)xfTNh!wGB}*EYy=H8RXxwurZnr|-%)W^U%V
z4fB_oStM<4)f05zDKB&J=a+AX-@gyyIl`pbcK?24gtG7S$rD@`Gk)73V=3trPztn_
N!PC{xWt~$(698SFIqd)d

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_15.png b/data/icons/status/channel/tuner_15.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f0d975bfdc84719af97973e89e2409f96063c2a
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sV+|!$B>G+WF6i=d#6mD+^F&4
zw{^Bk^1<zw=bV@5U=HG0c3;x_|N2A)xfTNh!wGC2*AE<OVEX2q>8>HoCZoBXar?;?
z4X@_iJHKImqP4SCrdff(kHtS2)eBl~AM%W}dBE~pGU0)BrddsTME`v@_mEkiDij0_
u{{GWD>Yy_r>Brx>t)`bsEIA`hq!{iB$<4hVv858|Dh5wiKbLh*2~7ZHAxXdh

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_16.png b/data/icons/status/channel/tuner_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d591496f44943e3798e99eee7e4368b70edb3d2
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3so9<`jv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;I4t{*tm!1T@8vX6&{XC_Y_k4%A`
zpc%td;cW*6Pm1vw$nyr=z5Khez}nd=)2zVYhw%D?f*g_(7MV}l<pb;u3~JQ<4zsN|
z^q%K+;SuJjHRo8If|{plN!8U)Pf`%`F#PlH+##vVU2|G=q<9%-I4Par?K55hbS8tR
LtDnm{r-UW|5HU$0

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_17.png b/data/icons/status/channel/tuner_17.png
new file mode 100644
index 0000000000000000000000000000000000000000..12798b2f8d11f30b9e58b1f39ae428a4b78eaf64
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sXk8^$B>G+WF6i=d#6mD+^F&4
zw{^Bk^1<zw=bV@5U=HG0c3;x_|N2A)xfTNh!wGC2*AE<OVEX2q>CPg3s-3B8?voP_
zIue>6+6MhyaOA*&g8mBL;)5YZ7o`NADVqpn+Bq?A1Tpe~jE~QhlcX3WWCAmT9yb>8
u?%(fiD8Ri$qOLwYvDYNl&q=J8jp5aQdBq69uZ%#KF?hQAxvX<aXaWEV=|+qI

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_18.png b/data/icons/status/channel/tuner_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..f71a45a860d847e9473929c3a041d87e4855453b
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sSTbkjv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;H{u5FO#a#Wa{Xx+i9a=CN!!T!c(
zMvjIh_IbR04jjxf1$OF%W`Ei@|1(rz;AZwK=sP$e(LUm5<fEJf7AKCgE^~O>czP1#
z-=rI;Tw~jz^vL8-!!d5=!{v`mavHS$oZBF`UjBihp)iLbgRRj0_wR#vjxcGq-M=3h
hq3k<-@&wn#j9==t#Uc-Wxd3!KgQu&X%Q~loCIC;RRR{n8

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_19.png b/data/icons/status/channel/tuner_19.png
new file mode 100644
index 0000000000000000000000000000000000000000..d496e44f69d86ac6ac97a774c474a6f3ffc3cda8
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sTrOwjv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;H{u5FO#a#Wa{Xx+i9a=CN!!T!c(
zMivW+KZV%^EKU*+8a`WUerERj!2C%4k!eoCk8=&25fTMWGaWdXetY(?KgxBO@n^1y
z^giP?$Mc(&n~t%3@u=Cq-`h}tdx=C{eR^WANvxlfST7sHp?=jTlagA!fo^2*boFyt
I=akR{0BN{OkN^Mx

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_2.png b/data/icons/status/channel/tuner_2.png
deleted file mode 100644
index 11748b36d6deef4099d9e7b43d86ce71b63b2525..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0*gsRK~z{r&6m%M
z5@8s}y$B+TWt!!WTy=CEcGk^x8QcsE-Ghh~Ep*t-u-$6G1#@ZL6@M_ZhuDRdg@U5G
zMRn*>9V+P9A?Oe2)Ui{iu0d39^A7mB&&)gSdmQ1zz`WnD&&T)m@>=j`Fc>sCoz8bz
zmXVq0_xnG3z1}X7Y&M&J%H=Z3<#MK?R4SoHqw!C1lr4(&&tkENve~RD$>;N^+wK0c
z;4KzK(bQl^RWy^ym>MFQPNxl#S9$bymt&@WNl<(E`EYYmefRC<1mXQ2ht_LTx;f(@
zqN!BMkSCou7<3r7tGwF#{3uFYAM!%tbhC^gqJkh8GPsdIZ+2n?t-!l`qcu$J0<ZRl
zxsUr%wBL%W&x1Y8@?ugqj|LItd7hc=Rd|&7`6M;>;0}k%=O)3s^(s7_oiz@u8$m=9
zi3Bt9tr!?~R*X|~G{iI%-D}3EIW0t#<2YudoA3zF%*CiV8jB0?N7l}>b%|&s5@BYr
zG8%-*&eC%<o^FkLU!P5&X`Y_bLPW#iFf;w-Fc1|_({ox{OR%?gnVzFTM1#Q~GrjAl
zz`)EjJ$I0miy_d#-$Bb6K}7w2KQrAr96BomsJS5<RhY+pT5cRf)aUat)43J^gJ<{?
z)LbawL-$)FN&KIzSNzoMVGvP|$HUB4%@0I{gjbh|guLkWUAU899*5DZ?U0W7nd7>?
z79#3)yP4U%dJ+gs#XY*rg6IXAap0`BuZ4)ZTrOrduK2*9Wb~*mQ<ysjGULEmZC?u!
zbvm7<hKSnjc2lE@Dp!%;czbO&n<;TP97ws~{k15!&*zm&Mcrbn)oMBlg#uC>KUgG5
ovSC@gvv`ZmM!VhqBuUbd|Dt%Tt+2lVxc~qF07*qoM6N<$f?>jIX#fBK

diff --git a/data/icons/status/channel/tuner_20.png b/data/icons/status/channel/tuner_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..d16627f723003ba8d8f970093ec96a8add49d2d6
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3simGSjv*Cs$vV7$_D-2Pxl!Z8
zZ|iK8<b&HU&p9vA!5qZ1?7pP;|MiIqaxDf1h7;H{E^UzK+HSn0`R7cY+k!PUW(5X6
znl0;iWD4w<HW(aeRKBC;x59~y&7Ea_ihaVZ37q9e${*SE2JD;1AuW)1j7#G?vyz^G
z;<x5T=2QRu=I}~O>`VT|X)Gs@peB&SP^Gf({{5vA9jrk-`}c3&;5JK7U9sDZnc?jR
Wt>@w!Q*Hwt%;4$j=d#Wzp$P!W&rZPr

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_21.png b/data/icons/status/channel/tuner_21.png
new file mode 100644
index 0000000000000000000000000000000000000000..8820a34beab7dfe33de348c9b61c60e7d80820d5
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3scugf$B>G+WF6i=d#6mD+^F&4
zw{^Bk^1<zw=bV@5U=HG0c3;x_|N2A)xfTNh!wGC2*AE<GVE?`F3x69gkMYGLG9Paq
zIQYPS4sTz<Y>U7n--6Hb&*Z7&k>OGJFn33QlSVvHO5thWmTvYh1<Tj*viOv$++^c2
u{qs-nsDsXgq#u9hwwhilvE+<2kz)8bLq0LZ-6a9&ECx?kKbLh*2~7Z|W=OOE

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_22.png b/data/icons/status/channel/tuner_22.png
new file mode 100644
index 0000000000000000000000000000000000000000..c23253a819e57b03bdeca2f95a7040aa5e49e434
GIT binary patch
literal 203
zcmV;+05t!JP)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst0001zNkl<ZcwS>H
z4g9^7m6L%e@cTP!BxAw1)11#3hyzj#rr#M$|F2;n9)vJ3F^~pG*T90{?1$1n7&b7>
zMCaqPfrG&xosZoHN4QO#SoxIuA(O$6fr9}AzN7Q8+klW>kIu(#0|&z0SooCs0X;4p
z(fO3yfbL#&KJhkCuHpB0DF$MJ6vOZDEUb~H%Sp(h(E#*5CcM_dgL41?002ovPDHLk
FV1gsZR;vI2

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_23.png b/data/icons/status/channel/tuner_23.png
new file mode 100644
index 0000000000000000000000000000000000000000..453cf021b094e74b506971c32fb36856cfe24a47
GIT binary patch
literal 223
zcmV<503iQ~P)<h;3K|Lk000e1NJLTq000;O000yS1ONa4J-jst0001{Nkl<ZcwS>H
z4g9^7m6L%e@cTP!BxAw1)11#3hyzj#rr#M$|F2;n9)vJ3F^~pG*T90{?1$1n7&b7>
zMCaqPfrG&xosZoHN4QO#=zLQB@DIBUnGAjm9AM6O6o36=IE&o|g!1($7BDg}VYh(;
z;SUsl?Po9~(GS>dK)4xUG7Nkt$p(a<u*U;dK9M$1NyG2&QVhfbDTd$QSy&@Ymy?i1
ZqX8_8DcdO)Sd{<(002ovPDHLkV1fe@RjdF2

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_24.png b/data/icons/status/channel/tuner_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..538cefc99c1117d2c3869d3573e3da34490afde6
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1%!2%?0_n2}3sUA-k$B>G+WF6i=d#6mD+^F&4
zw{^Bk^1<zw=bV@5U=HG0c3;x_|N2A)xfTNh!wGB}mo~_AZ8u(W_=kbieqI@#e-$|i
zjs~(1%?c;IVSki!BIQH!g9L`g_Z;;PH#07*u`M(!IPj<Op}N)&#=~d(uJEebEK9oK
x)_>&t@7*HI8y&hHelHih=5hI{O3K9y21_+%lNF6tYk}@!@O1TaS?83{1OQ1ZOs@a{

literal 0
HcmV?d00001

diff --git a/data/icons/status/channel/tuner_3.png b/data/icons/status/channel/tuner_3.png
deleted file mode 100644
index 40ae4e766b89fa4e55b6be7cb82e5ce8bd669b15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 834
zcmV-I1HJr-P)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0@q1IK~z{r&6iDR
z(_k3Kdl{6n(OEj%WnDj$beY}k+ES`3R6D_0>-;!P=cHSw!^-ACH%r@)RwmmVcu~Y5
zjKL655qFrocv27)4<5XE^yJB_AnIe^NZ;;F-nd+Z6n?bi{XhBtc+yKu=p%|^p;#<_
zsaC6CBr284*K)bMge7NZXMbig85kTKG!(<b!%!#`e%BqVrn>dFp`js2Boc-sl}bUW
zRQhg0D~`wGh6XvxqS0v7&|uMlfdNgb(*kTRvAW5f4nZ;zhWT7CJiEoghlhUn{K$)W
zd*3hLGad_5`)FX%{{DVVR*M`_v>R8)1UP%VmwL97rwc5^BJ@rrSTqz0X(CSX@M1B5
zK^xgwxV6$eLyV6IFq#qYIl8ty!^2vcg^z1KVs`RO54BSX78L|RH??V&C`%paQDriR
zf>6nG5DSxMr;Y@PS#+<R=UQM<p67K_y%ZqIl5vijqcM^u|3;(7SZYoQ7G+shH_}D&
z(I1QjsJRB?Cj#=!%8Vc0uQul%*L>7G4J_*O`E(=Zn`MYZgq~|~?;4p$EMM_LkfY~m
zU{R09qnpa4hbWDQ>A40pQN()L3tWIcqXdh(TrS;|C)`9~w2z)s;`h2Bf3lmHUA*k3
zW|d%3hGBG5%8_M}P!~0)#pYu3iEOWUs2L?#)ZuXGrg))?5Zy00Rhe9tfn=mpb)EG(
z;oXC#=!V#>%Fw`~cDr3SH^v!4G{kqPGEZuMxBl|B8^j4lo<ZMl?vnp+bX_@11B=>h
zHr>ph?<C6haduUvA^I;~-Eo6+FFB_L7PVTfy19PNK@|4*_oy;sM?2v8f{VyC__XeU
zn^T?O?^e%gfkoTe+Ws4TTss_&+GNmgT4pz}sKsJ2G_q*@RpbX+ui0!iB(1HjP=CSu
zWvah@Ze+7rdBrU)EruhVPD9;s+ayVn8Ofr}q7@sBxw*O5k|eeN0SlC`{3j=@hX4Qo
M07*qoM6N<$f^AQO`v3p{

diff --git a/data/icons/status/channel/tuner_4.png b/data/icons/status/channel/tuner_4.png
deleted file mode 100644
index 9963c46d54e99df1cfaafa6b0794192e84ff7457..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0+C5XK~z{r&6hoB
z6JZ#~vjjp&h=xdPn)dQ}?a?zfiG<ihA_+(cA<(6R+ES~wctb=q8uG!NRxscqDuoV;
zA}%_pAZ`vS4lcSlIXXGH3ZlN=d%-vNG|$y{yuuHfd;b6D{pHPc4*J*c_my_L{Z-R6
zVkdgN-nVYIJ7AK{X7g9ARwIQ%!B$kORiY@$AKg)N=+@sWl?ut{^R}c^Dv?g7^TR=}
zIG4-W8tQ0>X0usa!$i~Rv?bbxM4k^4+^jCj=$`c@8RRZ3&!IUCCYnm6EZJ@+$(P3w
zZqA>O#&%SW$mG-gD9Bw`X2x<>Fi}~SE$N>T$+H`A#`~=pIPm4o(TuX(kU&2(FB=(i
zhq8H21i9T{qLL(Wb9EyD4lEs>MRWhSeQ}uo{1A%LJy;%tiHf4gjkXSNr<hBkIf}A0
z`cmfqDRd9k!C<0^M1mXjEd1#g4#m;j(R`fU;#MnWJTv#`o}C>lm}oQ_<)(jnbQmR{
z8PCilqvZ9i;rzuQVtl60%{{tjXU_^IDhL8My)^+Gn42HZJm?N*AMe4rxkvYyJG;R|
z!{IPD-BZ)x!0Z7yKejN%W*@dA<mslsF!$cw9nKcZQ=pH*L_?tvH=Wgy2qhy=f_bet
z3FiM}tq}%&3?>>32DxdkK#_yeelRa)CdiX((<tWN+dG2stWgSqJ_ZvF1OnV#Sq^~%
zWpN*x!!Y;g9xQ{wME!n0H<wRNfCJ}}0W^nU?$JG127`(Ed_Hb29S?#7XJdQO9EQ0^
z_h1<eChGNiZ4DE3yWO_N5Y=Bre$wl8xm>oy<M9yv1@E^*fBSq?uh)$$b~>H5qg*Z%
u-SL$}RaF<2r8i5j*lx61tv9Nw?)eLbd#=ASbY0Z|0000<MNUMnLSTXv16=U{

diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 585970d05..178da8a9f 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -193,7 +193,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;
@@ -678,22 +678,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 83e8a2c64..5b7ebae66 100644
--- a/src/gui/widget/icons.h
+++ b/src/gui/widget/icons.h
@@ -273,10 +273,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"