--- a/mobile/android/app/src/main/res/layout/find_in_page_content.xml
+++ b/mobile/android/app/src/main/res/layout/find_in_page_content.xml
@@ -1,53 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:parentTag="LinearLayout"
+       tools:layout_width="match_parent"
+       tools:layout_height="wrap_content">
 
     <view class="org.mozilla.gecko.CustomEditText"
-              android:id="@+id/find_text"
-              android:layout_width="0dip"
-              android:layout_height="wrap_content"
-              android:layout_weight="1.0"
-              android:layout_marginLeft="@dimen/find_in_page_text_margin_start"
-              android:layout_marginStart="@dimen/find_in_page_text_margin_start"
-              android:layout_marginRight="@dimen/find_in_page_text_margin_end"
-              android:layout_marginEnd="@dimen/find_in_page_text_margin_end"
-              android:contentDescription="@string/find_text"
-              android:background="@drawable/url_bar_entry"
-              android:singleLine="true"
-              android:textColor="#000000"
-              android:textCursorDrawable="@null"
-              android:inputType="text"
-              android:paddingLeft="@dimen/find_in_page_text_padding_start"
-              android:paddingStart="@dimen/find_in_page_text_padding_start"
-              android:paddingRight="@dimen/find_in_page_text_padding_end"
-              android:paddingEnd="@dimen/find_in_page_text_padding_end"
-              android:textColorHighlight="@color/fennec_ui_accent"
-              android:imeOptions="actionSearch"
-              android:selectAllOnFocus="true"
-              android:gravity="center_vertical|left|start"/>
+          android:id="@+id/find_text"
+          android:layout_width="0dip"
+          android:layout_height="wrap_content"
+          android:layout_weight="1.0"
+          android:layout_marginLeft="@dimen/find_in_page_text_margin_start"
+          android:layout_marginStart="@dimen/find_in_page_text_margin_start"
+          android:layout_marginRight="@dimen/find_in_page_text_margin_end"
+          android:layout_marginEnd="@dimen/find_in_page_text_margin_end"
+          android:layout_gravity="center_vertical"
+          android:contentDescription="@string/find_text"
+          android:background="@drawable/url_bar_entry"
+          android:singleLine="true"
+          android:textColor="@color/photon_text_main"
+          android:textCursorDrawable="@null"
+          android:inputType="text"
+          android:paddingLeft="@dimen/find_in_page_text_padding_start"
+          android:paddingStart="@dimen/find_in_page_text_padding_start"
+          android:paddingRight="@dimen/find_in_page_text_padding_end"
+          android:paddingEnd="@dimen/find_in_page_text_padding_end"
+          android:textColorHighlight="@color/fennec_ui_accent"
+          android:imeOptions="actionSearch"
+          android:selectAllOnFocus="true"
+          android:gravity="center_vertical|left|start"
+          tools:text="Find in page"/>
 
     <TextView android:id="@+id/find_status"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginRight="@dimen/find_in_page_status_margin_end"
               android:layout_marginEnd="@dimen/find_in_page_status_margin_end"
               android:textColor="@color/tabs_tray_icon_grey"
               android:visibility="gone"/>
 
     <ImageButton android:id="@+id/find_prev"
                  style="@style/FindBar.ImageButton"
+                 android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:contentDescription="@string/find_prev"
-                 android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:src="@drawable/find_prev"/>
 
     <ImageButton android:id="@+id/find_next"
                  style="@style/FindBar.ImageButton"
+                 android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:contentDescription="@string/find_next"
-                 android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:src="@drawable/find_next"/>
 
     <ImageButton android:id="@+id/find_close"
                  style="@style/FindBar.ImageButton"
                  android:contentDescription="@string/find_close"
                  android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:src="@drawable/find_close"/>
 

index ff4edaa5f092d800475dc0934eebce95d7daf570..a035d4b032fe95c7c7ab2da6531f19d34254db36
GIT binary patch
literal 207
zc%17D@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpG*1`D5D(tB2Nk)R0~n4!tQX)B
zn|(Ipo5;Mw#T@sN4;Sa$T~m5B!=&TnCu#0x!*5?~*_#jkwmbQG&-}$n2d_D)3aiEV
z7(MLip6tVsx$&ydsh%0qW_d?$xt%&OZ(_*r6EklbO+L-Xs;#Eo`X(?b=oGK%{3}K7
zhj+WV3lu!P+Ujsz;Ns^i!Y?g^*yPxRYTJAI`h4bn_kZ_~YhRe+Imcx{7czLd`njxg
HN@xNALfKO(

rename from mobile/android/app/src/main/res/drawable-hdpi/find_prev.png
rename to mobile/android/app/src/photon/res/drawable-hdpi/find_prev.png
index 4c40a1e8ab2d634a33715fcb192a7ee1b08b5e12..7c5b34cf191845d15d48269b9905604fa887361e
GIT binary patch
literal 215
zc%17D@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpJWm(L5Rc<;uPE|02Z*=?25^Y5
zbsl*X$@aQo?gnn2+YXBZmuNIKg)KU<HtUi}?FV@k-&uc*|D7t7IsHpr<;xe9aAQGX
z2H}fSeH@N^yBC-}zW8C?LF>tdD}RPOe&wusf66VN#w8b0jLZzTOq`h(6!vY+61AB#
zW-1$h3{*=waHO|D|MBIdRY#{gi%LzE*|plKTjrExr9_^}_WK!;`@ge@96JzG?!MwS
P(4`EXu6{1-oD!M<J}g#a

rename from mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_default.9.png
rename to mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_default.9.png
index 1d8cc905590af62d40c64037549aa9b44e297410..2248013e6deb67302c86ac5e338b3fbdd5c7be01
GIT binary patch
literal 298
zc%17D@N?(olHy`uVBq!ia0vp^CLqkg0wnVbFDC%0kDe}$Ar*{oZ`gYs2@q-hn2?xl
zyr4RuK(}w|I)~{C=guxry;Z9q#;nxkt0N*4*wWLY`Dnh(PK#d$rkt#exbuFA$M@Cu
zb*(ZN{B4#fJkXMUrCQ#m;E>#D5&PeN6MagTN9DhYU+p&4D{#|K@mmYmnw0b>9kV*N
zVnf8zx~cBLg$IM0`rbXg+Iz$6!qu2K+s<U3P5sNJhHtfqcUUv$<ocaE&hW5`1UN7v
z5mUZrW){wUyz$NdKl17sx~ClvCtZK*ve|K>!s2cF`~BWaEpjuS`e<8q$);Y5ltbLF
q_WCcIv+2I=;?#&=6EBO^GQN5_HS6fv2r;1N89ZJ6T-G@yGywpdmV*2M

rename from mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_default_pb.9.png
index 0bd6115fcf9b8d930d4e083d0e4cf93e32cc13ee..2c0e4e37baef54614c7817d0bc24b217e611504b
GIT binary patch
literal 408
zc%17D@N?(olHy`uVBq!ia0vp^CLqkg1|*MGNWW%aV2t;4aSW-r_4byn_u&AEqaPn#
zxaxZ0{elbUljfEb7IZ#%<bGl8YK0d{T@Tc*K8o<xRI(6pnRR4))>8du4$j{0BTqiY
zl<a6}C_TOQ`GNYAQ|{Nyzr!)v=V;<-?Q0^p9DKiYsW8_rvRkFZ{nY)a$i(uPbsoz<
zD;-W$h>Q?%eN?&cMxXZYc6Y8H9bEep#RBhaiaq%&>ua0S&x|nTj=q_02k-uEp0O!w
z?Ye;L8A`k%TJz_1X5PMaFL1?AlYrIN<t5m&Vq&x|%;TFRf5Ba%?O5Y2|MOfWOPjB>
zduHdx`owI%9sIxES-_D+&;<|S)_m-jXOM5>n|%-ak9h{XT$1!?^S^aWqL&?v9~V_D
zTs$ox$J%Y~u`{av$&*&F{;kmDxM$4R@i@ZfzWDLIQ=8vEUTUWG=jomtVbhD!lXyfH
mGFrK>)|mf$z3^hMH{2RhyKb4SRk;ETaRyIUKbLh*2~7a7ezS!D

rename from mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_pressed.9.png
index 91be77476cccb7bfc8e36eb2dd638d672413a9b4..e90b70cbd84012bf8a1e0f3a889402c4fd8e5468
GIT binary patch
literal 403
zc%17D@N?(olHy`uVBq!ia0vp^CLqkg1|*MGNWW%aV2tu~aSW+oe0yu7ms6n3@sHll
z&feV<-UnRRoZ|hBW$P7V6;TiU00G{$rq_csgPd=ua;{z~#4>e@#v~@k_v_``JDO!S
ze4O*+?}OcQ-WuO|`ERj3&%C9s!mm9xnu={UYi9o%**tfHs@b_k50#E5x9xq}b)b~{
zMa`k^ufhv{GKyp!I5m;cZo|#M1v=j6<~{gZmfT#GetEydZ|TQ}MPARlE_i0!X|~YB
zWW9j8#VrrE6(j@{>jivW*ZW{wyx{^{=@$8b_1E1Cw9R>5Tw?pkIQgY6%g$Gu8Siqa
zOmJZ0#7zWTSWy4hdy?^j+rRyO*!SiJ)NO8gFwNFvK@azow7cC_O*hX?{r%yPo9?D1
z0o<=l(vDS1B`<vT_VLo|`V|`;nYQe5*vPg<PWsH_6OUC_i=5s#W3NHQg$C1`n$dE#
jabk6O0__W=ZkbPudi4EF+NsCDz-I7t^>bP0l+XkKoO7`i

rename from mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_pressed_pb.9.png
index 6b076e75eaf883c29ee0f5ae97b2b742537605a1..ff63d31854cabc3432813faf0b62c5e0630a2b7a
GIT binary patch
literal 395
zc%17D@N?(olHy`uVBq!ia0vp^CLqkg1|*MGNWW%aU<~qfaSW+oe0yuZms6t5v5(Hq
ztGfff2VB^i5ggkX=Q1JpE!)KhsXLY^Y)vUp@R^<EIYnUUfqx1z=Pw`jKGMA>;qmY8
z=Z)`+ww*6n_I>)F#EvyCtJO6&NqOIFQEW0YOVSNXoUIe7%UPqd`TA_-gh@>Eg<Uq<
zFyC`Ouz|Hii|@yYZ`T_6BL3BMzPN5*zQTOl=kAaH4eM?seZDAqW=(kc3hQlxOmpwa
z9lkS5wOy;#;cuk;vu_s)7PRpn;?J0<n~<j;%l_(@LY>3IMGTW?f0J2}E~PTTfr%3z
z@&A|Sq~Zk!a}vH^wD_|ozImtVX}%D?#%(uiYIu!z+jGmu{aE2VjX!#sUvioAazneU
z`}T3aW+`<&^?s1d!*knV`6~ne?EdL{y56)b%{e9D=xvsk8x~t1m$u)aqj_c6H(tNz
Wuji(CK062uWCl-HKbLh*2~7ZOVXCnJ

rename from mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_default.9.png
rename to mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_default.9.png
index a2e973ea0c007f8f9cf81be030ca34554c1c408c..8c337456398a73769865a1e55f18ebc3d89db0e0
GIT binary patch
literal 289
zc%17D@N?(olHy`uVBq!ia0vp^HXzKw0wgDV75oXLUU<4VhD02Gd()chkb?xvgF6lZ
z2am6G3B0g6WAW5`*$yIa9xXn>xky6T(O|-#v}A)tFH_9LjEfukTi5>ExaNIF+rQL+
z<08^K1b9m~9+J4Kw2j-J`)3^gU;nZWiA~eHTNWuVoRhlzg~Z%9@=J4=!#k9BJ=VD8
zuH7#FYO7jNz!#hLT#p2nZ=yNRKgbG6HY&5;pSNKFQ)Ji5759B-7$hEQ;S^T$L1H|d
z|L~Gu7uUUMr7pT}bMBZ_Xz*XCJIHB!$(Fam^|FK4_nscb=0`u%r=77^*L@<G?Gx~O
f^<Hlt)6>i~pBI)n?O$FC^fQB}tDnm{r-UW|ZS8rD

rename from mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png
index 0e91b33abc716c653b4c42e053ffb9b05f8973f6..db5fb96bc2e1fb0fb5c4d62012647300cb0adc2a
GIT binary patch
literal 404
zc%17D@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$>^XV2t*3aSW+oe0zJp*Wmz}qaXJ*
zE@1s{GgX6Ym&J~ff`aR=>boO_g4cE{{Ltfy&3d)}n)nK*m%JQ`7am9Isi@A-<NN+i
z<_F)+UyXg=!)F&4EV5iKD`WQRO;72~j)N23-b|dkAvJ8a?*GKwNy%)-r8m#j`XD#k
zXv-n9xVZZUhHUG4_KWU)E-~FP<zn!*%vzaG^^ZfR8Qi&Rf8guIgp0!4;@I+xST6F`
zMBaE8@x@irB29wF{^4mmHfQd>(+4!2r=@;K&72kW!C#K2PRG!sukYba9SJ6Goec+w
zCH|W=vc~OL-Y#}0e#`NtzHJ7t4or`Yz5nlLO~u*E?2p=V&ot>)?XO_^z&BZ?AoZBa
zi=(w$n#zuHItcE4dvW6NysH!2*Pc5UIlb1p<xi6Tn<;BU=70PVZaSkmUi3S6jOg1A
U(b|~@fuYUd>FVdQ&MBb@01qOung9R*

rename from mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png
index a55ad0b9c3d92c8690cea01d0b6d530c17ce434f..5705c2e646c312032370f684ccea915bec8ae566
GIT binary patch
literal 387
zc%17D@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$>^XVD$2IaSW+oe0$s0i#br_=*N}0
zEW9qUQ#CpzO1bkKq>m~coVy}Zcgsb$Ko4<iSH-(30)Hd|C(8JjO181<x1QZ?$^P$b
z$WPIi_s%Yp5%Qd!RqVcEBlERnOJ}90Z~ESDWStgzno0ipjTwp`kF618&fmm&_?TwF
zSDq*G9%+Bp?x<jqQg55LA@uOH|Ihyfq`&9c{oJG0MB>*}-Sz{rZPz64<m}FVQO0p6
zeTVFUvw3W6@7fRC=ZW86u=&yP1M^c2>=WiKtm8>HHeeC^5wE`C028+kk%Y}@e}3LS
z2HE}I);!U%J8t?t`T1eeW%ft;IZK($N><k}75ruD;ZoV0$QWbCc=iORgXrFOFHS6$
zwEVOo>&=9(H#8KVOt`zbcAJFd<HAUpGY3Pb{$<ojyi=U~PNEPPxD1}IelF{r5}E+?
CQlTmU

rename from mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png
index ac6476de7067c51056291b5c476d7a1e40bc51bf..231d4f691f6543f5f345605c4468b0e54b47317c
GIT binary patch
literal 388
zc%17D@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$>^XVD$EMaSW+oe0zJZo=c#}(T~4b
zRD2#iUN}R-nA87(Y{rTgq4$!{<em@_QMug9K11M9pNoLF;<V7WbA0?PdLO-s)cz@6
zuC?E3yZ=Osl)y(@4m0s?JI%Hx>BN$**bTX6$Gc88@n`qi8l}kbX8dQpmvEowxbK5s
zEGynmJo{sN(iP@i+HK2NeGj+&fBq-2aj(Ib?Gt`y7<>_q?rP+hsM6gLdDHAm9gj`Q
z4(s;Wcjrk~NHEtM)a*Tc)-Ikmraj?9^0bE;Z0FJvICM4~VB#i{_<x&4tm2j*KW~j`
z=<%gxc6<2DwXOHh=hwHg6{t@;t!Uwr-{#Md=hwL1a8qO~<6@x~>(p!*IWFkB_uE)$
zu8)$C%IW95;p}$8aCeGzj@?(u{_Bqt_}0z3!7pX>>K`}9(F?%PW$<+Mb6Mw<&;$Sl
CUYy(j

rename from mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_default.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_default.9.png
index 2c8c0d80f8cc15e929fc8bd1549a256fa290f747..53fdb8e8fe38193a943bb5e4dc59bedafb0b9569
GIT binary patch
literal 437
zc%17D@N?(olHy`uVBq!ia0vp^V9db+By&~01sE6@Ydl>XLn;{G-nP#Y4P<cpSgD}2
z?!YAuv2A9WO^ni|jG8e`z21e4jM~xD7xWfzaHu)<Jd<D4dBdesaBj!UC$dw`3rv3;
z$XoYe?)sUx|L*vDCoPL_Lw&!X_zsf`X%^naRrPY`3)x>394OT(oc{Upgw1>0jx4v6
z&hgoHc<X*e@gHs3?<~ts9IGqvebRB;_F|e)_|LxRYnQfp9G77|*&%voTL@?ITw~Ts
z?)lNt`YvKzMS}Muqu;yAi9PYoS-aMG;@YM=$Isoe63gWNw7_kNlHUY2%cTm<JVqyo
zC7#tg)*V@FRlnkQ%!JiHj^4_0jT3!hTa%spw#!E2gk{XP8?&T#YZWba|JQYVN2YIX
zmyY2tS<A!fG3%e0`QH(+e8A=F_^&7OTft4)+l(ud`R|sxrp&LLB^UWfsei*H+lQZC
zrn9DAk4$M^-~7<8;&5%ASfFFrzE6p*uYWTZ$hu|sYHs!dMhAnZtDnm{r-UW|%+0xT

rename from mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png
index 670104ed3671c4f6d2c0113db1cbf4f2a21cc80b..6b191c904a6922d491f1718fef5d633d40161e29
GIT binary patch
literal 641
zc%17D@N?(olHy`uVBq!ia0vp^V9db=B#-Mf&t_m?^6+$V45?szdv|a4<UonGk76!I
z_8+*&#kWpRwyUZ87kf!Taly+=juXV1zH+;+*`nd$?G?1f>St#tcaSVgXNZfsy+Bss
z3Qnc1w^V9PIs3nVa**<~3Ej2#I`4H6qbKh7Ccj<s*gj1&^KtnPkND-cmX$48qqjA(
z^vJK<-O(ZQtJY<m3X1X-4cUL|*ZK)}v*Ko6uP-^!$1CR_y>`X?tMk4(eOncpdRTe-
znh#0mUVYuQwDi{-v+tj##>(t{Gh_eNg=xlTqs||?`)c~8J5Q!;+&X(t)!v_l?>QZR
z@t?|0t=!wV_28Uc4`;l;x=i4SV`}=jSO@J*pARqYyD8mtMr(GRMRQ0>fBJl@Cu;?s
zM5lIl$4}^56QO1K<ha0-Nt=px_JpK(PO?Z*W!brAP0&iI?sJN3B`-Cw2ze+-PH<r2
zRAC0P8bRE~6cBd;5@7_D01|8<v6BrjE<|sN6+2uNSiwrhoeL-2pYk^*(ou6$*49@Y
z_D&P>r<|>ia?mo0<$XEfz0(BcQ+fCHb%&&Um$xZ8k*#<_F12~)<Y_9Mt;eN$+j!?%
zy`J#<_T689Ty9pF<v-l`v2%~ISV+3{3B9keH>YmojQ*OhwmE8TTJp^~%6h9~-@a2U
zKa=-0^rpkJmb*L6bFE@zO-uU=H%45VX^}j0;pM&^OTMw`m+&X#g>OEU;d}ndxfk&~
zEVq_#deyA8TwvWou@FC54(X!`nn5f<#!>FNznPz&`gb7UVYn?YX)$=Z`njxgN@xNA
DZC4(2

rename from mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png
index 26dc0221b55c08b09631ef9a7cd9a5ab783ca72c..cc6a77f3a9f7c060776b128fc8e850ba5c8f9ef0
GIT binary patch
literal 600
zc%17D@N?(olHy`uVBq!ia0vp^V9db=B#-Mf&t_m?lJ|6R45?szd)GEwBvGREA#aCA
zU1O?JM8?7et}P2Pl36x-D@J5I7yrksEqKK#$0;FDK*aUKYJ)H>4NgYEEdrZ2DI_I6
zUiX^KT<vCx?K~&>6CWN)tKPlC{w`}5_q>@!TK^5FF4-FYzw+zO-n`(GQYEirRj=Qd
z%PUa7GbOr6E7Lpg*4)Cs|G6xm*jfC|e9*O}bWM$Dfc?(9t6ODCKl`!gdzRnxx;xKn
zcb@+)b7k3GvNK}KZ?w)_{%ChWdvuA_KabXp!NS_-YAqNg<)>WtQ&*oNclqV<#>nE=
zK@-^Le2WWD%XyNP(6>xswcqq*QzWIUB`1^zPk28ki#PSyt9a&3^O|xjx7KMGUwg^+
zB!+9#+bi?J>&|opI&gU?G_p)$<W!m9U<70dd4LHvAeV^~iC~6GC^V*k#du&`sNQKs
za8(cm_ii~c-7LvEr)g}qTcBgJ<_UAZ^>*6EVc9HCe7HVsx_mSJR8Q;-o)glVClZ&x
zeH^r0d)mBd^<KNzu|4_6l#*aqYV|EZ$M!bMqb;wCJx@4(Kl}1T?aSYb>iTtcyxrwl
zl5Xb~PGw0+;M=M1cl+4V;`2+RlmooWk9}QMQW$hAlK058+mE$8PcS`esD9+4UG>l`
zz20y_#{AX0zOM^*+A;6<i*-9Ew)pc+GJ2|Ldr?d4jkwYNP%Zsa|8#&UhQZU-&t;uc
GLK6T%wD;`*

rename from mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png
index 224738af610d9815626c527d551384114d27a5f2..6c407ff8e1c81e08bcc6648a50eb7c2e327419f3
GIT binary patch
literal 596
zc%17D@N?(olHy`uVBq!ia0vp^V9db=B#-Mf&t_m?lJ<0Q45?szd)Gc&Bv7LDBWFiP
zyn}amhk{v>u%ZT+&|ijV7wf=-$8McEc7sdIjBz7Jw}$2suSfG66uLJpFk9WJl%)PD
zB|PS4%A~IqTze-xTxagJtCG*=YKeVC`l*xul2>`m-v4^0+a15{yOXZo37fw3*X_f(
z@Ag!`3Y)8SYgP6x?!4doo%(iu_p9Hv(|Oj)(Dg#E+{-f-Pbj@!zN_3PD#xSQY3kht
z6YkyJc+};9&YhGGMe|O*Kg67O^ySCQsmGq3UuXUOBS*@Q1$zo+*(;mze2zI#^LX14
z1%HdPaw6Vu-c4+X?059D-ny<s_1mkchB>{C+va}S7LhdfD8o-Pww+I|oIfh0UB&px
zooCbQEq4UH&vz_j&{Sw-5%OSDnc%>5vH{2fa}^|kTuv1vf(I(m$TEo$BxVHTBI!Nh
z#fMN(HJh9BN%-=A;;P5Ob}@d8=J~Yr^77|iJx|{<{Ip`Lyt=Y7uyf<Jrwo?D%`)X#
zZzgulyD{N!%;dcH{1b##Pc-~Ik@;@PjS03Eq5`w?QY2E&md<&1ed(j!H{P$+^)8;w
zxbgM3T{=vX2FLHDFF&^8%bQ74wlilvJ-1`C!q#O=qJJ|znq>WElTiv!@$~8!TlA_P
zxe4!==qS75yPNg;YK1!oY75Noe4G);WF)JqV4JI;^;Ue-o6N(U!S9%XsfEGQ)z4*}
HQ$iB}M`H<W

rename from mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png
index 1099a2d807609e82837b7bf94d2ae0ce3620cb4d..f17d41656023b7c3c0afe94bec40999f9fd78921
GIT binary patch
literal 553
zc%17D@N?(olHy`uVBq!ia0vp^WgyJK0wlMuTR)3|f$@W<i(^Oy<J-F%vqTa_j($}1
z)W6NKud%iBM%1xGZr>!gZ2Bnsg>lQJW9%PTlU7E^ipDrj4(c$JJ|b|X^sbJYRh5h0
z<eM85{jAIXJvRxiIosc=dtO)Sh;C-HK<p)1+pB$bCv;!wzkRjy-ODbqkTcsa)clq@
zq5Ho2?v+dbH>7`!@Vm5qSAkTStNi1K-1${cod1{2{&d{_@7>#Vp@qv|oezk;a&eQ}
z$Bg4kZ_nM^6}_sSDa^LEgIziO#F6!@<I7X!erv2qPCr?9^zMaAhHLcLzpge;O>)hb
zJ$$VG!?ew*`Wu{e<q}K%mg>k`#IqgT8<m`Y;?pkUG>IGRrr#Fo)E6D|VX|Ja@qEh9
z*~ZIw-t0KG?)0a9#cmf{xppg_4t{>-^nrOl+f5@jBphsF<rdQ+o^jiPu*w^Yv~T$N
z3YKN0Y+C$z;q}Y>hwr_=_axsXd*$&t+qYI6^7%e}iSgaLG70@FmalzKcg}3>{yR?>
za|+JAzWZje1iP+HyJ21tpYo!4*Pf`<7XMl}`GqNO6#w0vqC?AGx!%1d%xjt}`Y~Yl
oq<2|c4;C(ZGxu-FCAp{idqh0Vxy|BM0FwZNr>mdKI;Vst09XtG$p8QV

rename from mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png
index 3aba71baea3c0bb9089d01ce9af62d1587120284..fdbf42b2b2fd6bda99110e197333f5593f16ad0c
GIT binary patch
literal 859
zc%17D@N?(olHy`uVBq!ia0vp^WgyJK3?#KGrz<lsFnR^}gt!8^@yQuO5xsu>rl_o{
zxvgvC=51TH?bv_t@V)yFzW?}f?fT7c-@YF`e)7@dCyyUL$;c^8NXaZJt-5^W+TDBi
z&tJS$Qc-i}?D@@Gx8J;Vd(o2RSFT=v`}W<>pFe;9{(bBAopl>F=NFehdi41J|Nnpf
z{=IPV^2d)KSFT=n{N$<IckZs=xVfOD0%-f&ckfa%a)F_@c-hKdzkXf4cAaN~O9YT_
zR}$nG%wX8C=kfR7FOK#)Gcov`zL(A-w)ujN-qWwT@BausSbE7S=Ml4{d*YOt`#xUe
zPnf*v;eCx;=Y8(#*YEy$q{qqe3S%EIewsX8978H@y}j)o?BpoYaxtBcgN?<}FtKk&
zv7bc1nVW$=x-0(IYy0hOV!Bp5KkV!FS$A)q*|a`1;FQBP`86wcEZM^2rnP>>npI_2
zQ#KjtZ)a~?y>|8abm=_;D=tny{cARZiv523eN!gN39rw8&%l&-_GZ1#4W5ML=$X0V
z4&BzL+oBq8Of-u7!@}{yI43&FHk`?J$=z>Nv)?j&SmM%kyuokwSEln`E5sG<EWP<o
zEWy=tE7zBdZQ>EZNo$#FXT4=NdwN6nz~Y;X3GRKpOwF@onZ8YlF+A|~^fu<-O>Y<t
z=4=W|IXOwydzwz<CW4GN_UXFn5$x>kpFVr3A77$;>GI7$_O?Uq8`=+rxs-|7UYjc0
zD9_z@VD8*K(F+S1mOC;3Pq=4!I5OnZ97l6QPKC<C%F<l7J)U>&-F+^X|H4U-!{n*9
z#hIDk4ip%(wp;GHx$|cMgIm;!h?uBz*3Og8rv*1f?*GdWeOx5TW}U-dV7xMTy85}S
Ib4q9e0Bz@+!T<mO

rename from mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png
index 779f2721f5446c210f21cfa760d3c1dc1dedd8c9..e15b097500df73c9fc9295b7d1a54baac0eb06c7
GIT binary patch
literal 875
zc%17D@N?(olHy`uVBq!ia0vp^WgyJK3?#KGrz<lsFnR^}gt!8^TrK~H9D+ETyX8Mm
z>wlq+{}SE*l_&mJnfPCQ(tnM~|Fx(5cbxyfaL51Ro&T%%{%=0`zvbZnj>G@EkN)pD
z`hV`Z|I07`UwP&K#vA{)-TJ@%_WwP1|L?o^fB*ge2Os=D`sn|$$N!H%{(t)E|Fh5j
zUwZNX^2`5MUjBdZ;s4{0|DSyP|MJWKPe1;D{`vpwum9hF|Nr^t|L?#5f#9cz?oFVx
zY)gXtf*F{YS@;FTBsFw&_4Ey`oSfZ#{1Ot=bLty<dM8hrxpdR!-Fx;OIePm1g^QPN
z-Mx4J!NW(7pT2ni@$2`WzyItw6{`=7p2?mrjv*QM-rjZ(W^xo^dBEzzdS-^QTS$*a
z7Z>ldImL%~mi_!6-p;y|Wxa8C=-uOcYrbxKb|Y8fXQx(2V9Uy!mvd(|Pts{&yOotw
zzc9{TBz?`riT%^coSoZZ_J^L|@@L16(x0F7raUpO+`U_=bA$Qk9OG5hZgo}_qFKc%
z6Fbb0Td6nv*cmYI$gVxtKOZh*+?c&k@%trSi%mIGZT|UWcq;Lkq(=Vi*xtHKhS_oV
z$!V?)>alAgn6rGhG2Xbatjl)6;S}pe=h`>256o}cJ@AsB&6MU_CQ)(WIM>f<xtV4R
zHd!gt8z!yTGhHWgQ_9Ins@~HGGXCCQlPH=U`0&D_s->=}m#Xewy;;WHb!hc{*Tloi
zw~N_ko}YTa|Lcm*h;=M^flu!i^qsEuH@P!Q@5k=X&v<@o9?kkU=b*tU_e+m^&vrjI
zH+|&(DJ^|x!XCx{oBfZ6q+SR$II}X??u?|a%(ErI7w-u3tQLIk{CDluZAvqvT}_X%
b>}NPKZJ$LW|KeO=JTrK@`njxgN@xNAaaGR`

rename from mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png
index e15f58ab260f22e86e06e932e48ddbb595e191c2..19111e578542372dbaa4f1d6c54b491434126431
GIT binary patch
literal 875
zc%17D@N?(olHy`uVBq!ia0vp^WgyJK3?#KGrz<lsFnR^}gt!8^QyBgaIRte!<Nv8l
z|EF{OpT+-wzSRHu(*GCA{a+~mf05GvHJ1MmX8%8w`~O(k|C4q9PuBlG-TePd+yAre
z|F6vae`E3gTg(36UHAX~=Kl}2{C~9b|D)aiAMg49WZ(a1hyOo2^8fkK|1VDde|h@<
z>kI$iT>Ss$(*IBQ|9^h;|MTPjUtj$H`SJg+&;Nga{r~6t|35$f|NZ?R2v{d2%>z2i
zwj{_en1P9zg<nuiQbR{qPv6kW$=Th<FCj5Kr@o=5ck+~(OE+!ay=UK%qo>bbxOnN-
z-Fx>RJbd){>5KOtzkdJu`_GP3vHHO1ne6G}7?N@C?QQp9CPxvL2dplvXJ#n7h4g52
zaq&KzQ+$YL+0Xys?W{{#)*E++-aWpz=Igd+H*zI@c4~D5wyex~Id@j`B%KzvTUj~v
z3*+oX($`#^*gvhz*|{xdf9Uxwe|GFB{rO36$`j+t-Mf`KH<*9UF<w>eR%cZqnpLba
zvBUhhm3qUEodNTX?Amkv^WieajoAwozhC0D*pxHX=ATc7rxKq@YUIz3?XAmXm>qYY
zoaWk~9=j%jIm>q&<Bbc;x@;F5PO)xuu6-l>!2G7&126g6OliJl5)~JYbN!r_n`y>i
zla(^PVbY2{({&;@rJS6k>OGAh<L~`7iK5wo4=*gLTI!m5sp{_4n`PWxhgRQrO+37O
zyO?d}`Kbr|zpm(vSjUnV`1Ec;-|1?9lRLBYe(e7IjOVxJ(X4-S4jP<tzx25GZ1;0>
z(?{-~($aS(>{0x`+5dP*>V;5)Gb@Ab&PeLYJX;cc@s2RhYQg8uf7f2!rZh9!)$|z4
aeug8{_E|LYFU|$VGlQqApUXO@geCyb`_OOz

index 6e2485edb919948f4fa4277bd918a0f4572ffae4..5f35a5c8270e90edb2c479c1302722629d3dd097
GIT binary patch
literal 254
zc$@+L00IArP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002RNkl<ZSPAXH
zAqoOP7>3~w7Rv^k$!fH367d=aui**y2%f+b*!KVygCHmf7Msapu<R=aK}4O|nK20e
z^GL=RW6T>2*br*NKrZZvv6Tx4VjSecgcuXKQ4*?@ALfLZ%NH#wnyP5YA8pn&v8JtN
z=yJr@k*=Df&lw+Q`U=B{D=t??3dfk5Z)(Ph!<28PipPvkW=esK1@A1#lm<CVUM<O$
z4juM9+tX26^f>WwqNnsIxNvu&&~Gqg#fqVfG3L+Q0G+B10aqyw;Q#;t07*qoM6N<$
Ef~VJJuK)l5

rename from mobile/android/app/src/main/res/drawable-xhdpi/find_prev.png
rename to mobile/android/app/src/photon/res/drawable-xhdpi/find_prev.png
index 9e3c8f2da284ee16e8e66da2ebc6c427c82d021d..be8e389b5d0604aaf0950b24bdef64ee241b0dd9
GIT binary patch
literal 260
zc$@(Q0sH=mP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002XNkl<ZSi|kj
zAr69I9ENcm!C)Z~jZ~-{fR6XTlW+n~zyUY_WRnIWiCG+pU~prP$;~<S`}jT#ZvWrg
zpVx7O5aQ2}($kavDxYuz;70O`e8|YdNVs%<%b90qwoB$cT3)qyOXb%zywk8=BEO>K
zlaiJFLC!b1Z9YRKv&rw6lm`<#(|pVo9amzLe87ONfnaXlr(=!|e@=eGfw>NBbn`A1
zCMsOLg91~9PJWM#z51ZHI_T90C#!>_`XHj_Vz`>f5kd$d-nau*?h+fVKMc_T0000<
KMNUMnLSTZ||8PA3

rename from mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_default.9.png
rename to mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_default.9.png
index e0cf4cf9090a4747ca072afaa6360ee475dda3a1..d8a9daf774baea9d69fddc0f8ad2db11dda12112
GIT binary patch
literal 369
zc%17D@N?(olHy`uVBq!ia0vp^E+EXo0wgC%MO!j3Fj{!JIEGX(zP-88i`h}6^&w-Y
ztHKk(Bc~1>^Afo4s~xx@u)32YNps)fey<G|^k(UXTnI}xk?z>-eu!gp$J=un_x_t~
z|MTm0osa4J^GAese>o9&w)*)jU9p11hdCD)ItZF4&OTP|F<Z}RW}8+>xxCbh_lD|c
z3{p@0v~UVPCAvAhwDpF9L&QRt<fC~CF6UwzN&=RN+~wFPrr@s;-Zih4fq!A=xhcyw
z3VfGSy7eL^a~8+PB!Om$BMNMW9gaLO=864ns6u^gs+#id{12yooAGU`m;(C?Kh0gD
zNwyAQ7h6A>yuW7n`6~OD!awX^F4!+HFAVjV?A>D2tF-5d_g+om%X5X|KG{Xd1TE^&
zzL6;Q{P~K!nYF)qvebQEY&@={cjlwF7@z8`@cB>tr@d6(d))&VlnkD(elF{r5}E)F
C#hJ4J

rename from mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_default_pb.9.png
index ca9e114b69e5b098e30fae53b5162d5c32afc4fe..c500c2da6dcca5f2b8f92c4e8b6c54ca45da429a
GIT binary patch
literal 545
zc%17D@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvRe4V0_`};uunK>+PNM+J_5eju$Sq
zT(iaA(T`8h&+DHAyJkvc(40RUfqE8#n@tz0e6qJV>H2eH{0)(9?=`01+?P{b{r1DU
zrTv~e-~6uK`?~VR^0FI?_uZd+Z~ij-9+Q$e_4D@qJE*s%Ytf2^B?nJ0=HAj`6);)z
za-ufZLL;H}Z=KU7J~tPTx4Nv~ro4NS*V3cg?3Y|z9--r9GjU2n#d5J{5~i=;A3yQ^
zc#8PRGj|rHY?@|KI%#{kk(Jp(4Q@99nJ){tCQZK{Uiix;xsX+Jftj!ehi65){~e>(
zvu}49r7~4I{aUdjNpJl+(I+8}B8R(E5>DvnN$rsmQHkXavi+baDZ{ygOJ#n2_yqGN
zfffZ8MGi*}CjoMq7A!2y{Bn1<uMW}5i&3aDSUba3>10%1l;Q5c3Bkf15+@HnoS5xk
zw#|vlD3|G_tI->I;nSxq<&?$zHQWTZ{@-$9Pk%~To#&c4#ewgFGdX+wwN51MJ)5U*
z<-W*z&-s}>H@4mVz_B#QGw5aet6%$^LabMAf3;3yt;VANR(xxF!UDQ~8nG1L)#wm<
vaaYmY$>pNdt2O1ZY^&Lu1jE1P?qhh$UM2nPTGw=7)H8Ux`njxgN@xNAmUP~L

rename from mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_pressed.9.png
index 8cbbff19024e62c3d3a015a06062374ca2b7a271..11ff445ce7a6dbde7c6db7a2e8480309774fa81e
GIT binary patch
literal 512
zc%17D@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvRe4U_9>W;uunK>+Ky|Z>K_;qlJoD
z0*4kVW^^iLWMpzJda>6f*m-Z$ilrVK9B-fIShTUFVD(aVjYaLgRR()(eIuQ+H11uF
z{5AR0d$$XZ_C7yQzN7q4L*9PrUxzPT$^5_PgAH3`Q)<M_g(tN)d5fj~)k!)1ZPQ%U
z$lim?LnC{({$mqLROjId&V2AkQX}-@m+JKl?%xkQ@sm9xmTf4}``@%?=Rt#AOn06<
zye(_bu(z;zQv&P5?!;$C7OX$&ep@mJrQJ1~pmMlGs`2KJZH_ayHrg0|4(2>mwwdk8
z0=^dh#I`;SCe!5!4n_AJ543YQr}H%4ioV&fhtoxYNwC9#MM<EMgG}ZTbp;vusF|k&
zikT}Np4{*|BPW^nnd8j2H|l9@DZPnl;*B?5PBoml>EI@@Yg)q_?VA10#}jHc%$v_Q
z(_HdcSfjQ4;yJdAwVceGUX<RHO<T?rZ@wp7-(h3ZviPNJF*eM>naqsSK3SBSYrM^w
zyOYOm?XgE|&i*rGsdmn3jom!Se;>!h#M3zkUKdNA;%;$Xkaa^{HKVVvPEF<xFlHG%
MUHx3vIVCg!04Yw-$^ZZW

rename from mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_pressed_pb.9.png
index f34244e4cbe90021eef886e94ec161ebc7bccf10..52001c53c9e597d124b62e914bf767135b66250f
GIT binary patch
literal 513
zc%17D@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvRe4U_9aJ;uunK>+PMr-cE@!M++6X
zgnXnHE6$RNl5*<!Hzgx$#s39smuY0I%;;FuqtGO^D0HFtq^1oE&Te30RgEz@DL&=(
zOC7r@Hj<9r-{&#kKbZc9CvX4j--j<;%>2K{SN_-yEAI_l&h6nz{W-0@2J>}qCpWat
zJpAC&tDLE&|Jj66%6WLiH#@wOTQU9O$JMnAHzf+}KJz}CQYzVV?Z1?roRLgFbE`_s
z?(NYD`3Dy0L^}R3I4H$)R3v8qnW>B`Hz-Pb%y?MDH!m{f)B>Fw4x4ydRctnw9BDW*
zOTm}N{&1MS&DNw-4NLYlePDEKduvybb#)J;CWngxlVFDfi;_Sixy&P~3NrO2o7tQX
ze|*9ic&jXFTB3%{VPkK1UXL?uo6Z*)^PktT%5@OSRhZ0U{rA9c?wI{=wjNxu>EV37
znf(%ePA-+L+0(n3A38E`y7O++?emX#&Pw0=BOIW=@bU9293L6xy_e?Lu-R<+J2uq=
zd=bqDms;lZe!XGemY{#6EOOG+*iWt<EVmODzqOmb@K$5NhY;Q0EQ|f-8~)6c2gWG_
NgQu&X%Q~loCIFzS(K`SD

index dfb8e5d4785dfa30a8b00234034b0ed69b1a659d..b6cc53ac18e3fde85593d949a5b2c05ecb60828d
GIT binary patch
literal 336
zc$@)H0k8gvP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0003ONkl<ZXa()T
zKaN3B7>D7XNE8|>6{VJ1EqV)>Q7d#Ri9&4!5(}^Z3(%;vv^p{pg-|GNBJWg_Ol1Bz
z?m71=zUPsQF~%5Uj4{T%C`KFz;lN1l=o3<3t~e0Vhg@+Yq?24RC8VibQD99dYYK8l
znH?eQDC;@YIOE%ynx03K2%jRFiidZ6dQ*H1@MR!BnBc=izK~^3TywJWhde9dSdo`s
zl-TmDEhYI!l_SqMQdJl<xZ>(cL*dZohKn0*g+&h+J%z`ZM~#&PGR%0yjEs^&js^c&
zkW+Ffvf(cqib@t0_WWi~MaiSig`ZrgD;>0mxEIk<dgySkqjWLkyP?v@gfA1l2D&U+
i(v>mB7-Nhv!F>XX5y(&bMDqIp0000<MNUMnLSTY(NQ|`r

new file mode 100644
index 0000000000000000000000000000000000000000..6e11aec12322c847c02eaef0ade97fcc8e486b7b
GIT binary patch
literal 353
zc$@)Y0iOPeP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0003fNkl<ZXx{DC
zp^8Fb5QbqzFj!0$!DiKL7Q0;$%-(@`1?LL%26l^0yIHeUSVT=0MGzG9-L$YQ?ymni
z|D0p^p1FZH48x>SA|fIpBF4xPuwzF+_7!q6O!+b;lYG#K??y@I4ESk~WKM@iI!Wa;
zxIPTJ(nunw%8}n3sm7gCV#{B)l;X_Ev*bTZ@^R&4nemKSEQgXb?>y^`w0%&3i@-Xk
zhpV1tPLrE+(2b^5PK`5RoT*vll-U#3p0e+p0xP0eQSh0QV?k64a=vmhOz>gi>3w5}
zFGC+WeSGRi&1rM@8g!=}C8y2>-!9a{=2SRf;Xox!PLT~(HWb~1##kD=2c1lVPVPZ#
z)1b9`P|Gx^6=tow%=s{wIo*_qh=_=Yh`gvz*ig`9vVX|p00000NkvXXu0mjfu0x=a

rename from mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_default.9.png
rename to mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_default.9.png
index e7b58136c759cdbc82fd90662e1c4fe51b5d9964..21b47a63f9fc4e75948e4d890e868880d7a2540b
GIT binary patch
literal 552
zc%17D@N?(olHy`uVBq!ia0vp^DIm<j0wiy}j=j&o!1&(N#WAFU@$DVM?BGBd)(`Cq
zcI&-!^V*tyysp2l@s;@nN7jjbe15+)cTMeE+Ppl#(QA_9L93F9RyQv^5saI3PkFli
zlmAmp7?=N^UVN@>($nMB`FplU35s2*=Y99kF>!Cd^$M}_i#uBRe>53JB&7f7`hFvd
z_a@5$23E7_j`NaV)!RLMe(2Xq-<gkY`c5cc@O6&q`p6_9cboDvw=J9hW!i6*ua?>P
zrRRq78vlPy3Cz44^9;TANiI2fZ2p91n{r9b*u^qi6e@V0@i{xTwS1lEeDBFa>%~vc
zD6E$)n$qrQabl@spUfv?{>cRsjwy)q&3vZV+N{#-BXj6ZgCPg6lOv0uivZb#rdkt+
zQisCT|12|G>;i6DJW=BJ{iD3j;>_Vxixc|IGFDGQ<$gU>ux;K`aKd?sO>ApYjO1e}
z*=C7U{r=@^4jW|6lS<(amA>RC`}*rE>BVlx72R%byT1B#;>Qlf-N!s`oa1S>c&eK5
zw)jBXN{2%|%++F_&+p+aJjHix!S^K_<b>}TmQ9Oo+R|35vf+c;o8;WDTSH#oIO_iA
zz#4}`499OA{q-t)<*mJ~yIa4SX}u2eINC7xx%utbq}9hS%=iIJ0Sun5elF{r5}E*e
C?Cs0|

rename from mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_default_pb.9.png
index b5b5a8d3281380959a70d7ca50dabf7972ccd25d..665bcd8c816639c575a934e586ef4f27db044f34
GIT binary patch
literal 783
zc%17D@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSV7lh%;uuoF`1bC3?~p{1_K%7y
zYIAR;cRan8`rrNZBA-(RFQ&IhrbdP7MO{_XSsbRgg=6|7rQgg#r97vu80I{m+uCLP
zy~;}b9XGo*&*H~(qipzV#4oMx{=Bd-bK$`wve|jh_2TT7SqB!s+3~Jp-G=E`e}CwC
zw=^$q`%>Ys>q)VJ-<5VJ9#)XumC09~F#B5R8}TLK;a}?tzHgmf^xCh!cjLU*d-c4^
zF5j+Zt<0-G@$;Par^G*tr+BRnS{c&vO50N?^5X2J+b>JMYm>ZLTkg9j{zmLKX?eRU
zt<&17nL1wiE4JV1Ejr1(QR3~cw;y;HC%=D^usD2ivRF#=^*HVnB^x=3Dy5$;Rngr>
ziH<tQGUvAF>gsyiO}uxlX^HjIMxGY-{CoSR*DStXmCRgppLr%1|FdrHN%<z$;ae1f
z<xaf+upmaydtac)RNWJ^*n@caAE`{NS!~g#>v5EM;)Z7~-=2xNFfg_tAr=7#4mg_d
zhZ(1wfCC<lXp)&p4FU=Xl+o~~Ut#Kp{z4h<r_o!Zwo2TVI}ueO;F`Ly{{QlD^~23G
zZ(1&_`E6yK?Wkru;opaZj0zWx`)u;|n-yy1PI%t+tN8Nw_@V&2m$|xbi?TN=h^5-t
zyxDE8u=LWZ3kRp&3(3!RJXXpot}^-7gT>nWzbq3=cE0|oNn*<8Z;M|ae6T_1UyM+e
z&fdf-@9vG0@9qlVR#|Z8YG<rgbj%O6*RLn4{9*jF>(-q+KKW_?!~cBkzQg`8(5f`r
z>f^P$#fy*KXkEAZ-QAMto4MTg&WOK@DxH7GJ;FKJ`lfDlY3tvnmaQ+@O6QmEFEM0a
zmp$>FciHZ31?P`B{E@vRyVkPo#?IUS9859~&A2STM&J8`82>^&U_xi`boFyt=akR{
E0JVfuU;qFB

rename from mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_pressed.9.png
index 7c2ac33cb5e1656ab0a277657ea722bb0c1430df..f37dee7dabb9ebd25bf4ae35a7ac8928a4f63d32
GIT binary patch
literal 748
zc%17D@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVA|~I;uuoF`1Y=C_T)gBwvP%g
z64)=gUT|GACClAfOz^kjAEq#Y*wPQIf=6AKc60G%**mD4HhV;0+{K}kbn)nR$J;5v
z*`1Yp_a2ma;mNO<`>BQRI_vkK{?q^4{oRXWmmP`Nf4k0i_nyDG$IGg3@3~WT?d4&^
z_v^kN)UJG$vF2Irmv<G(dl@9ZKC{d@Z}z@7Pvps*@UK^P?cKg);_bJ`zWFW-oMmpi
zJ8pufe<Jg}rIDEnHKwk5Ww6S0$@ioGw@XKG7cc($&TnP>4RzaA*;<Xg+AB_<F#n=^
zeSwdPgHn&+dYONRR;s@$H2J8(q*<-}*5T8`j}zHXseQ^-o>C)p#NOhG=9{;ZjJj%W
zU-Q3yP~^na4-b6eB;A*P7CiA(<U~xxhd-;0`qK8hC=_c>aH<ISv$$vRp(2(|Q<zq^
zv0vR~)Ti~8W630@zzF+A94@OJSvV9B$m1KMQv(AWF(J!wC?Ls@B<XRVsfB?Nj*jH|
z2{>py<kv1um6@6?=w`{fNkmR$n(OQb`{U+v^3SUcJ9hE1zu*ZUt|v(q26jt(7AFS_
zp7<$pf^of|+}?lda+L0y9a>S{yjFoR)yl@E#y?7<t7=aEtJ`i0m*ey}FHMO$`R=mo
z<B!X;j!OG9xM&;?uitg-op-+2)zl}_zorSgEv|eWBc<ZD^FiiUoz>#^mmIwxv{v!e
zg82HUvycAQimIQu-0_lz`kqP4uY9|c@^;(fs$Y3=D=TluWOd5BNq>@S_m_B`)%#4h
zea{^?$3ty<SKsq~-yZ(>fb84l-&a-cepqmRoukn0M{iSdx0f=P`!-vAP1Lz)FFB>5
Vpz^R|9xxR%c)I$ztaD0e0s!4>L6`sl

rename from mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png
index 5eb9cecb4191b33d7fbe4d81a37f017886b152d9..b986bdd0b77f2bfc7682326547b54fd9aaf56e17
GIT binary patch
literal 742
zc%17D@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSU|Q?x;uuoF`1bC8@2QD0Z6CKE
zD2u&gdZcJ-$E*JtIU0ZYyH+SH+PH9OOjlc5+ZN591z&g~Sp+9Kul+kI`RRiT4-4w<
z-M#R;;rz>o1z*0}TEvLoasKk;!`}y%$&m+-2uYWf8}(KS*B(E%S2=FmY~EiVdbU5P
z{q$<y4TtRN`FnT&<mGNYQ<W`Kc7NNmv+qQoOuFv%_rdSvONTq_lKGEa*7)hG|4!^l
z*%xO%&wM@a=+{BJ^`tiB-8TRI<9*q_MEx^s@9nl;x^KgC+g9CqQ|jsi4xTXoqWj-@
zrgwvjgmIkmpXRHd7uCLdx|3tc!?RzQBl-Hp{X0&b+};~7t=f_4SfPL7{(IeCr?!9X
zT`cR}c!z^u>+_;X(Q~^U)-89?dU)`=XyD1(YQe^kAcffv9dm<2ineC41o<{@In?au
z9a1zmjpdS0qef3#Aj_h;3QQ~l$jE^~5rIze<CbG!#G?^aG9`o2seu8G9`UJhD4hK;
zeeSXqPj2;cES|`;vW<P~suv7@uCLa9c<}o3MU#Gi(qW49Y>eUNpEpNr>YYm~Ii7fN
zJy~&`x8Ll37bqYMtnQ`gdpJaL@ynm}h<?4O_MG|GT;&O>`rb`Xg0^0=+jYXc*C6X&
z3X_VH<?hdmUw>Tl<@4MX3Hui2OD2|lj!w^<An|n7^0}MW)P*dumk!##mT}RsZ8e*J
zY+v-f+lF_N+s+49ZI_niZ@GWtkjJmQINSZX)1tn#A6d3%`9tL%(J1r%Pp3?OE2@%n
zYxm2&pUn1{vCC!LzW4f1+2x1xS{;R~-}HWymG-=oo3G%P!{Pl!Jn;LX%^zmyrvlS2
NgQu&X%Q~loCICciN38$=

index 88e11dc9846367d4f257feebb4256dfb59b9bae3..5be7c9be01715a451c2df446f94e6bc257abdfdf
GIT binary patch
literal 434
zc%17D@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z*y<&;uuoF`1YW^_TNB;;~&rW
z?mBYFNwYj<@9H;YH=lBzVBS&5@`+)|6yLOzDS>7i4JRHcnjT$JJ$uTJzkjTsSD*WN
z?fKV9XOMth;;h(ro^R*HE)(t3%scsXnr3TK`<yb7F7~3T0F7Nwu7qmzop|Z7Fyph2
z-uW$}eW^u}VKOBr7A~&1p|n-^=n)3?B_#(M9woIH2U#Y&d^9|0su^RvFw5Yua%gpm
z+ttKAxzJaJ%d<9m%wP2-GURK-Qmxfq&Ah8NEDXum;GR=$GKJ6Auj6IQvP(%l-bp)C
zd|qCB)F<&SLzDkj3Fp<NYilANv<m3!Xy}J=Y+Upw;`#b(p={fJcIQrQa^(BD)|oAo
z&&~3=`8mnZ$Qe)C=I=@jdYU**z3x$G<kZf}s+#4;_nbN^RJ-p|x@T%~@A@?>YjQr>
z&tAnW_2#qwZ<7#yp2Ab^%S}S%dy0=%hxe?G%P2fJn>%WieA~-{GlsHlscBFkc2(Q&
XEaQW%ty}*A<ATA{)z4*}Q$iB}LSV|g

new file mode 100644
index 0000000000000000000000000000000000000000..42b7ff3c44d2048a027966008d170ef52e29c808
GIT binary patch
literal 464
zc%17D@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z&PF0#WAGf*4yj0eoT%GZHZGH
z7P;hZxWwm`+q<?zEXF~9f%=UCh9t+_7rmWpH->s8X=o^vMI`3@@yyt!ptvVY?O1$4
zT6)^#_cyus#2Z^rKG^{S5l7X;Z9bh~ot=5+{?n=D`frx$?muHJZyW3v{LkupP1*UX
zs87>hewfR5I`hQ&qND!nPPExCIGI0d;q&W1ymg=aab8x>H={@*tFF~>vqUhbVf}2u
z%~Bg>?`?h9SZTvjx;LTM?(?h7VqSIg#QtAYl6U&Y^!(3tOYVQ{a}pjMDgS4<tgq%-
z_)H1@83A9X?sx9tHMF+-<ZY99T3Ge^Pgk}ZCJSB|)pthc>`pxy`cG-P%EL*n=FEPc
zr&f0V=}>X?d@g_HLyDo{Q-za%_DaszQ9JfVb?Sc8<CBjb=~%1s$z0;msR_Kdf3E&g
zu=4n-vwvjFca-^_yVqb`W3hQ^{PF3#djHhc+%lKH@XcyLuARa+D+M!ogD+MI8FmXE
zmO30hroZO3?*7wVy~QgWT)M4~$9H!)xw#;~lWy~)p4|WCZxpTu#uS66tDnm{r-UW|
DPH)ux

--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -557,17 +557,17 @@ public class BrowserApp extends GeckoApp
                     addTab();
                     return true;
 
                 case KeyEvent.KEYCODE_W:
                     Tabs.getInstance().closeTab(tab);
                     return true;
 
                 case KeyEvent.KEYCODE_F:
-                    mFindInPageBar.show();
+                    mFindInPageBar.show(mBrowserToolbar.isPrivateMode());
                 return true;
             }
         }
 
         return false;
     }
 
     private Runnable mCheckLongPress;
@@ -3954,17 +3954,17 @@ public class BrowserApp extends GeckoApp
         }
 
         if (itemId == R.id.char_encoding) {
             EventDispatcher.getInstance().dispatch("CharEncoding:Get", null);
             return true;
         }
 
         if (itemId == R.id.find_in_page) {
-            mFindInPageBar.show();
+            mFindInPageBar.show(mBrowserToolbar.isPrivateMode());
             return true;
         }
 
         if (itemId == R.id.desktop_mode) {
             Tab selectedTab = Tabs.getInstance().getSelectedTab();
             if (selectedTab == null)
                 return true;
             final GeckoBundle args = new GeckoBundle(2);

--- a/mobile/android/base/java/org/mozilla/gecko/FindInPageBar.java
+++ b/mobile/android/base/java/org/mozilla/gecko/FindInPageBar.java
@@ -3,17 +3,16 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.util.ActivityUtils;
 import org.mozilla.gecko.util.BundleEventListener;
 import org.mozilla.gecko.util.EventCallback;
 import org.mozilla.gecko.util.GeckoBundle;
-import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -60,27 +59,32 @@ public class FindInPageBar extends Linea
                 if (keyCode == KeyEvent.KEYCODE_BACK) {
                     hide();
                     return true;
                 }
                 return false;
             }
         });
 
+        final Tab tab = Tabs.getInstance().getSelectedTab();
+        final boolean isPrivate = (tab != null && tab.isPrivate());
+        mFindText.setPrivateMode(isPrivate);
+
         mStatusText = (TextView) content.findViewById(R.id.find_status);
 
         mInflated = true;
         EventDispatcher.getInstance().registerUiThreadListener(this,
             "FindInPage:MatchesCountResult");
     }
 
-    public void show() {
+    public void show(final boolean isPrivateMode) {
         if (!mInflated)
             inflateContent();
 
+        mFindText.setPrivateMode(isPrivateMode);
         setVisibility(VISIBLE);
         mFindText.requestFocus();
 
         // handleMessage() receives response message and determines initial state of softInput
 
         geckoApp.getAppEventDispatcher().dispatch("TextSelection:Get", null, new EventCallback() {
             @Override
             public void sendSuccess(final Object result) {