From 75cdc1eee2a2ee36bede4bc64ff02865252a499a Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Tue, 9 Jun 2020 21:21:30 -0400
Subject: [PATCH] Remove duplicate search icons

---
 resources/icons/emoji-categories/search.png    | Bin 573 -> 0 bytes
 resources/icons/emoji-categories/search@2x.png | Bin 1172 -> 0 bytes
 resources/qml/TimelineRow.qml                  |   2 +-
 resources/qml/emoji/EmojiPicker.qml            |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 resources/icons/emoji-categories/search.png
 delete mode 100644 resources/icons/emoji-categories/search@2x.png

diff --git a/resources/icons/emoji-categories/search.png b/resources/icons/emoji-categories/search.png
deleted file mode 100644
index f101ba9c19b1e0ced98f2fd53ceb9929065643e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x0rE*iK~z|Uz1J~oR6!I4;4izx#t6n%w9`nEPOY>M(cZtXC{ZFR79#$R
zgjD(;>_k@$2$pGLKm%f-h=nMDAY_Z(Sj=06-FdTb-fnW>Hp85I&bu>nXWo?2n8OWR
z$4Q(j#=qe^+IWub3c0dy0dKHhG2Y|SB!s82hF*qvKYCa#a@4{Jtk)18jJKH06`wAM
z<BIp=9ggG}SW6_^#C^=;Xb}r|fDZ}YN>%ZT;%mN#J7^@h4J@M*;rDR9ih)?^_i&}^
z7vO4%iS{Vsxd>?=w==~1xLcCzY>M<aLfDipdl{P8isXA#Mra5fZV=Ce^~*&UPb1?o
zjepoS?0CM0cpnRqe4kQ;-3Vc33<Jj^`F6`DH;M_9#8l4Y27W}wPmf_B#{HQx@HH}?
z+%zK)<9<#Vh&75^!jZ~Fv)~S5Jw=)mZyw7v4BRWpwK$3xdw6t&_F5I!)NI9s*H7#+
z>Im&MwH!_1ri_Vqak=UjtVR;_V+#+3QqB~ySd7J5Z}xS}<R2vc*g>nRiP-}((Zf<s
zC05jXly(d5*d_=snb#TOZT~mi&ZJDh8R0&Eg^$9;@&{k=5>E`D^Oo`o)-q8CH-#lB
zGf}6}Wn)RY5|vNKL7Dh<7zR=%UL2MIhWEsV@GE$zXyLbTdXB?i>{(rqpfWmV00000
LNkvXXu0mjfqC^Jl

diff --git a/resources/icons/emoji-categories/search@2x.png b/resources/icons/emoji-categories/search@2x.png
deleted file mode 100644
index 2604db4596677a88bbf2ecc3f73caea53df70740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1172
zcmV;F1Z(?=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x1W8FmK~#90?VHbQRaX$lKkuSx;;StRx-p<_Ntz;PM4KomC|wzXx^i#o
zuda&0t^Ni63ivNrY<HI8(jN<Bloo$%^tDnADR$A;5bHA<49~^fEAg2;XU>m%U(_!Q
zgqQQ?J2UUxIdjgLTOusFfUUq<pc7aHECD`F|NjJd1dIX|;1+Nx{d?YG9dHu(3#d8D
z7;qd3+`K>u*a3{-?(|$T4D_cQO^F`hSHe49FV}z#Ir*eQ8*mz!Ccg8TOanteYYzT3
zL>F+I{2Z^B8%R<u1RH^W-(p}M@(9=*+1EGF2R!vOJfu{C?NL3RflVo4(N5RPQ*xLI
zUBGz3jy972fR0$sx8axYCV(@*Uf^qB8L%*wW$9=8fFIJat~@u0v^t!2H0UlcfCNyB
zw)8s{N6sN<FXuoH_I17r3<3*0cozbPfk`9x3t+tm?`tSwukb3s>QDv%y}(1G4Oa<N
zHt#SJ|Asu%p|JwEX|$y;1hHjfQz4G?8QQVUge$&;>kMR*<g;yEkF5w><3o1BKs4w>
zWW*7JUB`Tgw1*jY@yqsBl+iy5qpl=hDhX=99#;|%95mSHR2^ywCa@Jbp-=`MD{b6w
zRi2<vXulu{FmF_W^UAU2<eVUnfCd+>$^+tpa-7zeS4e=*lw)sMl?Q~DTkFd!B*0?j
z*!x!H0ioso#6|gYbP1-#MR_26)WEKp^319@31?$dz`Q9+fd7?aou*eHe5xE*wJJ`K
zHCBVqt;z#J%RO#YoS;uIMc&(KxgS^+C+Kfxw^@}3#5c-uf4C?=fG)#61{S#xc%qEt
zDUFTax)4}4Lj&%9IAgEDzOP(K#*_pV<Nz}-v;g;%w*BcskktV{DaUsL-@6bw;t=qK
za_rAOMBV78SzbqCn~=&*Yge}~;jn@1cVM|MVFR=Se;e!>4nf*)Agm!*Q|%#$>(Gwu
z{w%iihafH?Z7CMwhe-cGC~U;`%h!<O{9ye=8<6WJivg3!>22AAw+tM`_RQCiYrNon
zL_<a+X3mC#*ovhx@E!JFJ(E+;UN%50@_f4(R70w^vq**6izLgIRF<co9RPkrU*XLr
zw~5$1)rs`vxEhzIOd+`|c-KfT(%M?IgO)(-3LS*)G-sdCT=E>)89E5Pz&}mkT%j|e
z1HZ)RE7qQ+C^MlISt6}<f{#oiOI@qOccTOW<la6;mw3I5@OqIm<)9;45K2f}%9X%Q
z*O<Fq-dd(d4?>1DNOQudqk%Q#Fyj=Bx7l0JU*f2P5c;Kr4&;@YZse$KC9o8EWhT3W
z7)MTT?;*eHRp5?N|4!ua#^si33fK*tbNFskp%43}DU&EmWD)of1U>`-keuL?7;}FC
zBL;keFj9cMQQ#Vci6V@R1(zUPEX2}?ums@=^XN@g3pA@km11wZqoYv}-g)OU%oc?A
m#`z4Jf$PZgewkVB4_^Y@gIIr;mWy`)0000<MNUMnLSTXii5^=3

diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index cbec6d94..bfe422f8 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -84,7 +84,7 @@ MouseArea {
 			width: 16
 		}
 		EmojiButton {
-			visible: timelineSettings.buttons
+			visible: settings.buttonsInTimeline
 			Layout.alignment: Qt.AlignRight | Qt.AlignTop
 			Layout.preferredHeight: 16
 			width: 16
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml
index 9c63aa79..b76596d3 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -276,7 +276,7 @@ Popup {
                     sourceSize.height: 32
                     fillMode: Image.Pad
                     smooth: true
-                    source: "image://colorimage/:/icons/icons/emoji-categories/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText)
+                    source: "image://colorimage/:/icons/icons/ui/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText)
                 }
 
                 MouseArea