From 0d2a7135a0e21ff753f74127cb9398c198b84c63 Mon Sep 17 00:00:00 2001
From: Alex Forcier <alex.forcier@automattic.com>
Date: Thu, 23 Apr 2015 15:36:30 -0400
Subject: [PATCH] Shrank HTML button and tightened its margins

- Renamed and kept the previous margin dimens, to be used for the tablet version
- Some style cleanup
---
 .../drawable-hdpi/format_bar_button_html.png  | Bin 2257 -> 837 bytes
 .../format_bar_button_html_highlighted.png    | Bin 2127 -> 788 bytes
 .../drawable-xhdpi/format_bar_button_html.png | Bin 1105 -> 870 bytes
 .../format_bar_button_html_highlighted.png    | Bin 1023 -> 824 bytes
 .../format_bar_button_html.png                | Bin 1600 -> 1395 bytes
 .../format_bar_button_html_highlighted.png    | Bin 1482 -> 1341 bytes
 .../src/main/res/layout/fragment_editor.xml   |  18 +++++++++---------
 .../src/main/res/values/dimens.xml            |   9 +++++++--
 .../src/main/res/values/styles.xml            |   5 ++++-
 9 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html.png
index 055aea973210116fc4a37f9a27409e6d9cf46f2d..4d7e90d5b8c8b958d56ca378e8e6a55308f037ed 100644
GIT binary patch
delta 798
zcmV+(1L6G95yb|OG=B+jNLh0L01m<c01m<d6(~x80000ObVXQnQ*UN;cVTj60B~Vx
zZgehgWpp4kE-)@NWrZ?j0008RNkl<ZXhZFmO=uJ`6vx-L+FG<NsQ7^*y@=ifu?NqJ
z3WDfGZ{nr5S_*;(4+FN7q_tHSywne>-AU3NzlxN#n`Al`rGI!>K|DyUA3Z4O!IKDj
z8()T*T9u*{whr=s@Yv0Nl1%>ZWipdP5ClOG1VIo4K@bE%5ClOGBtx)5xS2_Hnn=AZ
zkz$~I4C0UzhIKuK2OEhrXDByhp>T%6hJGHdh5wzD>vrbrW;>7X`?ap8j>7n}l!tqx
zC|YK9$|rVFp?^E_g;JAkFBznucf*2S_Hea7kzxoB3QU>{`BJIAdw8;yi1JlP%v~zg
z81>Xg;^|pes8Orga0V-lE+5}cJT>dWwH`j+X6Nbi!wp2JM}(VikceI<ifZEdg+Ad5
zUFj8SlWi{<3>F54-@pP6BvK4iO0bdOQob}(pM$E{N`E_HRObq_9?U*;xgK_gh8nD9
z!;U#8)ecC;dzY){#4De&W0(x~P+_J(`$V|zpEEoXoP;@^{WHVNGY9Q<O9QI$!|*)F
zO}&PACIkaF>~>A$nA9*NPeR;rub0+QInmBU;DY`-ONQUUR=j1mTpF%dez91?P*Dnf
z#uztkgnz4RRO-Vp=QPWTVOSI_Qa^>~Sfv4mJ}lm_?jllk!*hED`szNfyc6y*otX+l
zb>Bi&j$HP`RcTNW_=`3yO{YB!q2CPk^u_bHgRPk|{KrFU9)D}tp6=Fkznt7+O<BX4
z+0xZ8oJcXL;s3hAi4?P-VWD5K5p$dgvu`foHGeixoLU(VtOiSI_}48Bhuc>o%om8y
zX~2Ce-NkZiJg^%0epG8e?*<1e%M&TaxnF4<C>DRqw0%cAaHv85#zdL}uGQoVPntUN
zrJs`II8IIP=;PI0^D5`~{tD(-nw@)L3w)Ng#J>=>Uz!vIK@bE%5ClOG1VIo4K@cS4
c<QH<^0VL4Lj(hj-qyPW_07*qoM6N<$f_`;vG5`Po

literal 2257
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

diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_highlighted.png
index c0828ece1b03db30062c19a6bdd5f49196dfb68a..508f9f312cabeba27f07f2477cab676dedb50345 100755
GIT binary patch
delta 749
zcmV<J0uuet5R?XxBnkm@Qb$4nuFf3kks%X*32;bRa{vGi!vFvd!vV){sAK>D02p*d
zSaefwW^{L9a%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0)<ILK~!i%?Up@g6hRcnpGh=P
zG!azPphz0gPLNz-t*9V~Hrk1eT?_%i!eYU@o!QfidSDY36a~c-#Ul8T+u6NSi54e+
zh=s)XRVZj-C4zS6f9F23MuHN#xXAwpkKKLyX6F6p&CIS4LI@#*5JCtcgb+dqAtXt7
z;TrMG5mCkUbx#cy?1OKYIAMom?yko3QPF{#(VVbLa^Z5^55f+KSM0I<6bkL)n!RX$
zOmw(as?~YcuY=8^&4A>eblc}SLlygf#SLCcCfHv0)KKP%c)=;j-|3Wexep1S$K>2X
z(xXW96W+grklWT5nNwLLZn!~|4?iq(FJ=2V5w3#oA>zNIZC0FWoAs;U0LHCIcC6Pv
z&l#Sd!oY7tg*)n=8rr`KA!j5%*(rjmM3r``9pXM-iR4RYb6K2=UDg*_#PQO9Moh*B
zOvH0c<YC*!Gh0y2ari!CjNFu9a}a$z`*(u9(oVbF8m5Do;25g749SM5<|Vsa<1_>-
za}5=|Dei+6wdHMGTwf<hu>T$j+^|coVXk>GYr)#rh#3{HoWk`2#O{VopudC&R#B4X
zsbtJp(_H`K>;;=4?AtV|d=9aHMeO5ExSvQ)g_U_Ly0k~mhKrk~P2n#pJSeKvkGM%x
z_OzTd>yjn-w})1YKNTFE?$H+@S6(aGN4-{XVwQ9(1jmU){r44)GoxVh3S;a?4%?;-
zpRwWbg*K)o%%$MzOIn+6@PCDUX`05*Ncw)CjcEymYCHB@w~SQg*F7~@qCcnM>%Y!)
z^o@3KsEy$LbgB>&{VEP%|Hg5gHtgdiG8C(vQ&=Egr3Za2{mG)Z#-tEJ2qA<JLI@#*
f5JCt^HX=U&PJaMqQ7VNL00000NkvXXu0mjfm6u~Z

literal 2127
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

diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html.png
index ce40ac2d053755a931d081ae27c90469fc9c353e..73f29b97d78f0ad49372b005fe83245b04d8a084 100644
GIT binary patch
delta 835
zcmV-J1HAmv2<8TmFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pF
z7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyI*GWV{RCr$P*w1UzU>FDR
zPMywQh&WFwcoB8r#ha)n!IOfgfq%gi!GpJfkc-Kix)zm9Fn>&#xV~@JFemg-UGipe
z{(?dAG(<&22Z|u5I1rV&`aE4)vblqUGF$zA;9=y+`y>6*v`bR}000000000000000
z0000000000jb&gUYO_>u*>-g(a{j)!T_cn}BUCtX(G8FCu~RCw(s+}5e^Ry=Y^tn7
zYg;NT(A;9$9e+E*y(%FeY!)iGZMmUuDJ>kQ)Eb{kney%)Tj_w#U(4nnuZ`P{qvz)6
zdLjKgmeiju861e)H57tPA(qqm@FXAei?ig|IotJzt0km<BxLZD{=Tx@U?h1ief{A^
zo@cuHFpZg}J!VX)Z#a%q3rWcEGzIj7_L-$IqgRT>HGlD`)P*6vpF;mg^TzpF<96d%
zYJkj$qE&`Bxw={u$O#JX8@<qeqfl6vJQq)?1xRZ>rLk{~!QyuA^Sg@Qebj$V`+xZ_
z0$j+-1;;o*zRft?xIIte9XLX_^K-hLySXpiXs4O;--w|wOXuG=b%17W^q^ssS0sxr
zJYCNKZGSiH7p_(m%01qjZh4+NWy|PLlLr`lr@CdU@M^Lw=|8D+fPJ)XXC*Y(-%IOD
z;f9xb^17qh1DvIxKGDT~m{&6RTHgSJzRI2|ct-1Y)4X?7$7%iDO&*{>Z7aVsJ?!sF
z7X4e{)H}e+u?o+}pSv$J?)Z*>Ai(AM5~&8rdw<cKDXKgNh5(lsAcw@Cf!Vy?#>WV7
zi2*Kz01;q=2dMN5TaBHya{5%V=qaen9Mm20@a5Mm0rE90T2jy0L%J&-{uh+XE&Pi~
zMn>()UqPxkU^9PzYw|@c#Lv8$LaDvao7@n$e#2|?9)=e!I>z(7mDb3_7TYWFuQx4o
z-8{MH?q2HiH7r)V??4o_#lryr000000000000000000000GeMa^$QV10p4)!*XRHM
N002ovPDHLkV1lG;hkgJ6

literal 1105
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)jKx9jP7LeL$-HD>VBz+3aSW+o
zd^^K8Lo{6E`1zUUYNdjrw_3$wHR>K5+EsY5Y~j8c5?i`%oiHwZx=2G$XJg>}X-?dF
zlRDyG9Mg*`6jsj)+cwo{(((>h#kz$F*|VB7GIoE^Ui56Q`S+@K-O7^-os6zketh`<
zQ1$nD{nh8@%74#p<6vcRU?2zGvt+WFB)C=P?Vo!;G*4S?PxjrUyvE-<+uhW#-tUN3
zZ2Zp4?=N4vb<@G;@!wq&x9D!Wwf&mvdg=RnkN=aH9qNC*`frZ)$KTVgp0u~Uxq9}k
z^L~$G{ulY{>HEvv+@tmL!ermQ$1Sam*Khv1EO+wX;^e<gx0n4@J1Xa?zVs{qvHq?1
zR6{i!HtlfJynA9z>_<tKfQ|p!OneOu7m4`pa{t545E~u-;`x^QujikCIe*FDsp{3H
z&o|B9vWU$;?C&?tOn#;rkKgF5Wt*p&zS?i&aqbJ!XJ%iUrsi&3Yq7&VI_h<)+wn8u
zonMX~EL+49m>*#Nz<=GBzn_l3d)F)d?Cj}EyG5I$=A0ARym9uskJAOu9{6wF^X1m6
z+=CLIJ|w@pU$f)fi>Hb8H#cs3wR^$&3r6Lh>tC_k_KSC)Uq3H?b8*$aGhg~$%~mft
zb@_N?bRk>6w%O!7>5jFp|5&DUYn~9B{P_Cun|gr_CBf7Fs?N;S=1Vt{mvETrbL`rZ
zu<m`~o3F~Mo7BIV#1c`#u=e(o2`hJepa1XB3GsiSSA$O4oz_oJKdAj}e@69!pyJtc
z)`f?2{(q6e{Qrpl@w?kj@6?^YG|kfYy2rY*ApPmZN)IO#b(<L~F<x;oT@vCeA+u3*
zYtG8plGQ7>KHj5qGj+Frn%$|dJGGyF*}Ktp>w~Dxmrb`vG<UKDuzl^<nRs1qecFbi
z|Fd<Mzr2#fd*{i-?rn>={L;DqTu!KPPRzCMBF6hqigGGMU+a8ZI`!oS$5Vf^x9dDU
zW)K~-Ym?FMAD{odv77mKt6F={`W3(DpN!nH_mE2U?bPD8e|G!S96K_#{F3&|kf-ta
z*2fDzDxE#>u&K8#Htp{AHCLABe13ZIMEoa)%cUnjGoAb6wsguDAvw{c#w83A3__tg
zKUHPEHa7p8wutkYoaB|?PrE!t`~Sq({@M0jZo%q1lk?`wpM3q+{k)vMNbbWe{81ZQ
znq8Dm71c`ZllifB`JIZhlGVq3)h7SkAonc$#Mbo5-13I|<E$3jpHW}&`H^3Zk?nl1
zjnZ4#Q_t65p7b)ZvQ_%i+d#c9H6O0rPhD0&WBtz$THg#0{%}5-XxR3tRgRpT#l;fG
Zuxp}*vcCO_bYL05;OXk;vd$@?2>=dj38Mf2

diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_highlighted.png
index e1212018b96bd610ac2f88b1d2054063d1dfd5a9..1dc4d75f24631fe31323bcac1ffc8272269a0bf6 100755
GIT binary patch
delta 789
zcmey*zJqOoK|KRYx}&cn1H;CC?mvmF3=9mM1s;*b3=DjSL74G){)!Z!phSslL`iUd
zT1k0gQ7S`0VrE{6US4X6f{C7io@r{UQ7Qui(@IYl$B>G+w>QpvizLdheOUi@)25CS
zexfCvK_4#Zt_r@ea>3*a@d<(@FVtA7GoQ`P4firBsDBwSy=e)LP0otX=X(A!C3f-&
zsS2u!I0gg?h)%P8|GMY&8tE+?o~*Nx|6z3QHxOF)KYnB7<bnlUNm$qV`smf^N4dAG
z__%JzRv*^%fZ(D)`K`ZOFGb0`zp<@eGe4<YcKIT`!sft`z)c4QZ%+%T=ik<Ksr;gO
zU(h!hPW3zOTYVSQd;F5i?}(Q6$XmnPy}P}&Ud-G|VEZ)9w~8H=C)?ED?&CGEP>-vq
z-Wc+M<M>~vy-xQ%R_XsP*ev_prTyZ6(TC?dAIDF3S|~H=((*ui!}Ix9W_&rn<(RFK
zxZ3yRGwx@sGq2w&$l|?lq9t3!cyE2)#yKBY`hNCVuJcMONnWKtk!3|w`i*^4eF~T7
znwL-A`8(u;lw)nA)Pns?%xj*s9nWddlG*eyEO;NY`-a*^!@b*LTXz?_?>o4Szj#mn
zJBGOr7Nk52UwZ25&0TCS9_oc2^ez1BQRIL7(Z<a`itSr+joDY!Crm6aPz(=x`bvGr
zih3)y73@d5cZoZ7TNRv>{_%6tlRthrv#lI#4t!P5u@AXo9urc_yyf|q`N{9%daB#~
zUp$_4wR*O#Lvi8VNxk2eoVwb&i#_A}*UB@!&+|S6eVV*G%%S1`OJ^0%3v;|*M)vGX
zWlnA|WxEldBbvX*`PU!WviXeHBob8FPB2K@IM_DVzn_r)@$biwRWke8uS&}A<(Z}G
zu(|D(X?sHTqs7w?*L2q=PvXBFobM>4mhk*v+3ySgr9a!}@4KSce0lbxX-m)Cc_uS+
z!!N_bhgTn+drK|u<et5mkr^zXxg{NTM>=mcdTyFOr2`X$aZR+J(f*;nLY+@&4lsE$
Nc)I$ztaD0e0sxp^cIyBD

delta 989
zcmdnN_Md%%K|S+MPZ!6K3dXlLd~<jbCD=dwx4yegrmLlygFWa7qd0qf=I%u@0!=@5
zSaK99WZV?u>~!88B>!*``;oQ0wu(vzL!_L7;uSw$3{z5>Q}e~e+IoF@+OFjE@@VVK
zWm`|yPr6$>zkFWhy_xsVSzB8(h;s!rFo`T+VAXJ71T*WA*f^L6>eUx;-CDe)^3K`K
z9|hbWm4D8g{ALB~mmr6m9#`h@JW)COSID2|i>Q!9#_@$evdzDqS^V+E|GlU0>$F*~
z=->bKamnJ1#bQ&o>d7vW2`^OmcesD<v6ts8H>`P^7k{RHN6)TT{*7N1n<5-{ZnJy%
zO!M)SnrG}SalFyj9bZm)!orv<BXUPFuh$@d*OKT<wg;xHYq<9O&sp74&s)}iE$#+f
zi#u7o&me!JcfPkWhsA_h+Lr2fS{Q%Nt8wFb(Pz?R?!4V8xoAU^(G!KT9kpEgPd{fC
z>~&FHd2f#0a%V-=uk~h&mS*#p=}Ubm-eNYvWIN9~{g1zub41G6`byY^wE3P-$#|)C
zbo)Npy!~P3PcIedsHdOcD~&(*BC6(nw5sOzKU<ddX=VBgC(cx@T6$kT@o>k6vXZ5u
zxAr{BicSz<)i=8!^`hTEBgo-v+_IO(g^~T*&n&JVH%Tt?yrJ`V?}d%^>p0FbE$tS*
zVBKQIxcWf&-ebJ;HFk0rtlNC-!A(hvb0?Z6TzA+j(EI)WJ+G8^(~dQrG5A!rW)E*z
z{p3G0a;9#)#aLZnrJeq(?^dTEU%=_LTo3jXiLWjGz39!#_-}%}&yr_u%D$N6cd+3e
z!_s>T7XA{QWhL%rS(5g)py2@fO^fgK&#taqam8k4kg;*M`@OQf{v4ggrFy3#gr7|R
zUh*V4jaPs#K=S&<fXOFTJ#6*d9Jwqw_FidV>9nKk9!@U}+qc8_oxrM`koEQFW-KmS
z+i~QB!&Pz1&+-)&uULgn-*+`SXW)8xZsTDQsm-BW?yQ9y|FqWFiTw`v)6n@Nxv@Ad
zc~iZ}cM&<^O%E2Z@Km+*b=7mV+dWys%i~k@UU~B_=0w+{=MMzW@0rTt^HTa#LC%k-
z>G8cP75l$M&YW{7QX%p1A-R|H-|LlgpZ`C{$tLfq?2$^TPg%RZ3l!gfbHB29llA4&
z<zZ1b7X2%gV|e*z@6^9VuZ_OcyRQ}1`!Z$c;isod<-+#Fz0f>+Z?59w8q+qPXI$v{
h14o{KXCS2y?AI^f3Gn-)|BwL)JYD@<);T3K0RW~u%~SvY

diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png
index 4572062f4b5e82bcaef94203ef309476a003622e..4ae28495c8eb3622e3ac435a0e76607c097fac68 100644
GIT binary patch
literal 1395
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^b#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7i
zo@r{UQ7X`!C!Q{jAr*0NZ#ibjlu8_X*m7%?Nb=e!!>+F@6uv$1WwEUg;(xUALbti&
zk=g9}>k`V#ulZ&d2Qs%hT$+26$E>S;LQ0y^)gw2umMr?JrPZXccZJ8ntn2Uhzf;+~
zdHvRHr;pYC7L%Lw=h^I&YVl^fGmS1~ZEcb0ImGPtka6*chQNvg8a4?cat2)d60Ph5
zCY-$gYWlQqq0K3mxF=Pf_wSqfOzit2%XFof$|bhxS!bs@|4g2|dHL~GbunlA;(Jfk
zlvMwlHBWwT%J#Q&w=IjUHrs1nZ<Br{?ey%;&t9D5f6rE|9H(4oS6!d~<Ky9sw19*+
z+p{Lzi~qWKeXix&EaiWzp6T~5wp=c>#DDv9AKeb^pUF>m_P^V*Z=URasiUk>(RZxm
zVn6ul*k`l5eKtP#+VRthvw!xON^d`9?9DIwT*ms_wP!KPRYGTZxO)CxThDsEZ~fh%
zkCVgSL>=#bW9^)!uU~e~Hu~e@mydj+lfQ2JW14Fg{o(z))T8~&mtFp{>`%{M>9r<{
zIIZu;+E>d*6)cPA-WF|bwR1zk<B2=J&hCCwYm@%`&$DxzQ>)`7?sh$UV-@?|Z}xey
zKWp#03D?Kha1_Ril)VW_e>eG@x30zI^{nxIcMtR3w0z5Y`?pmL*WuWVbtj%}X01<t
ze)aC_IAgmTrk8#AZhWm@^Xp_~^_$wY#_L(r+tLm?ereHt5+40z<{zJ>J3lqW{-0C|
zw4*3Jj{6+X>88B}U+t=YE}i>7edk2G4VJ<xr?2T(9bC!2H9=v2Li7>K?`0D6Zns{U
z_0ssJdin+KdADxdc*(l){=V&IkHYU3R_l~|m-`<``mW;7&Bn$3@2K62)M}+Kj7i1m
zoBYo$5Px&;Tx|MT+rZ7P*Y6(6{ixrTxWk#7ZPz~6|LnInKIn9-YTx^BvhFkX^@6r(
z{k!kqy#4&{>$jD<JHo#w7o>Q5+}T?qdi$5tjXu`x(G&LMUN5kJKhNadx4O7lk+-f}
zE@KrJm2ZBnKI!kfk9?Z>kCO|o?WwFby4vyoh0f2Qqy2r6`Tzf{VP(Gi{lWkDn_tAp
zuVwp~KKI_LvukbkS*~aOE_H}?dwpWU_OHRO3njLd<($htxVNqFU~sUswfAQ3<gYWA
z-u=0bmHF_F2lb0snWGBcpILC=Mm~(b{<&#yTGfTW6AwO>nb-YZ)3^LT->!II3Vi)b
zuEuo{_tvyeBD=0_ZQ6K$%Y%C3C)|2VU-EAKe*M_%_jP;rKU?4XyndZdQGMydXLHQ&
zdw*Xbxy0`C(Y)`k_w7G#z5BS`rg{5UJDsYlnQnc&cDBp$ZZ&bg{?zT~|DKngWw~j`
wKJ(c-h2E8w|GTy1dDL~T!I8yXv!Cc6dVRu1tA)u6SSB)fy85}Sb4q9e0Q~5fLI3~&

literal 1600
zcmchY`9Bj30LC}<BCmx?z2r(P!saM)jK~`Aw8<M9@^PPK?jc86hog|pUNo9xBxh@7
z(|FUn=2(PS#;CAS&ctGl*ZWWO!}ENfAD^F|C({{)0LduJ0001xql3N6E))KjwB)Xv
z2bd1*0vO|humd#os>}iazil|$+g?fl&X1x)R9sc0mP92N=CbO;^H0vcE~L<iVGzON
z{1<iiSDl*+XBhqGmOt3RE<MmnPkWGm_4hyFtaEVK-!|E{o;5q2LGUnzEDg;B`F^`)
zbj`<t%8>xv_=*`dvGw6RXCZ(OemK?op7W|*JT5d_5zK=XC7{x00TS{z0DCn6z+V_8
zAZLf}L5=dPAK$Wa4ncmoJ>I|<%7o@V^v73NR+hWR87aNJ4qKi<Sk&iky?H|FIMg^3
zTb~0O)s$1a8s1|eM#@t5J06R-SdlgEZMolrLFfi*NwQHV5BLVB*0e25FCcJRUpO(P
zBDs64Th4c5)f80cXBjqCgEZ@5*Fmxt9iyW-bPeQN#}!WJP<+S0PM8pc9RuaGkKvl(
z$Ba&aR9+3T@+%l7+VPJU%tQ-TSfkyu;Sj4}(l)tqz1$fcHJS)5ddFlbl>!BASmF2d
zoAR;I-cqMgUM8QFMeX{nldUo0W%3Wwv=p|tRi~SKg)vaO@aY?DEYHQp;Q*SLrp{yE
zOgPIuW;`xv-3}(jTbiOH-Vp=`p+{IHdB(}^JY>U@sYx$U^}vRk1qsDX5mk>ALG@ll
zJ@qVRBaN3^kkm#`i#*^$&f+#9m;+o%T?J9<sv6{d@E>Lu64>tJ24l#dO0_aQ`kC1(
z^Pz(F>>U=Jl^s#voBI^@Xd-~1klAPME#`lvPe(-_fikQB`u$ZGHH-p+b!jxHc|0z(
znP6J=EFB9sW9zXqQq<n7OGi5T$d>z(-~um=I7#&hboHBLqK#kRvPX$aCB!^y4=xKp
zy!CIYRo<DhJ~t!pi(Q!M#wZ$*`y<Y+RI__xzE=iliMVk^qNArl^-QWqgp=%j{<k{2
z+tV11i_Z5<s(yx0x(RuyrZj&zhzrrYP7N#rqe!%cG3Gk>2OL{>O*2hxtc*4S*9%MV
zpDF<nC`DaCM^6r6=A!pcdTC`Zjtwd?KiU{>7zm%Q>=zq(Q*tB!sVeTCo2;1#8Pd9#
z>~_Rca<L8!EbQ3SF!7hf##^61wdkKuZKIXAm6PzJ$@)b+7Cf}=@XsF5w&N)##J-v|
zgip%R<{dZo)wUM&wXC`7Rb{l7T5&sD4YufF&gaXq0~Mi<pDFm{Mye#1Ph!Uds^<N)
zEvUu^h5Q&M!R`DKt}n^sG^RX}yFOKHm_o5!wdm#4+$9vKClR3Vwo#K7!~OU&s!LoX
z!%=s=n1nt>ztf>8^qBF_M28*pIR-8pQD=IELQ>xN|3&z!A5RyWd{pk_9X&tOJ!d&g
z>cPcSz)Y)9u%oTmq-Hi|UhJC*IWF2fXSqEMTYI(mQun!4{B8s3rottQTKXb|{>Vo8
zN(5N|W!6d>wS$qd@+Sm1r@*q;V~$Avohj`10g+o8d1GwovTzO4o+3paua%1&2{uIN
z9H#E^SQBw<r7O9AG}&M8s>@5>n{a#YK)AAW6Okj+g}CAFpuwaxe>KAp;`_ZLY2Cub
zmt4__z6dXew16xxw7Xb6l~=a`aOc6rwwpF_mH8*^Au)coDe_yrt7hU*yf!a)z_<Yq
zfKGl|S4wh4#!jj}sBqtYV$(3;Gia~3^EzRgdpIjKi9E}uF$C`}jMTO(@(zTh&e~}a
zcR+Hu8Jz3}b9I^0Nx_?tpWdyH4e`s`DH-VSHaMgj*E>sx)ekZ^gMr?SZ?C<4)fK;(
sL=bm120cpMfUEw(0n`B8Bp58I^Y_IJJ7fgA?_L7H5stENu=7d(4_K4YzW@LL

diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png
index 6770c73a2337c3973eafa5212ff3ce18758b3fa0..db0c60415725d34db23480d668be7f7a41dab2c9 100755
GIT binary patch
literal 1341
zcmd5+{WIGK9R8}NEQUMv)={eGj(JHCMHf3m1XaoEEoIV{dZ}q%NDx9zuDWhT-PX`Z
zS~qSTRly>W)Jql_R<BpL4wZ-r!ikr94|!Saujt+La?kU_^V8=(KYWb}HwAwN1^~b`
zG6E5!cghKk&*=4Xn%|_}3`jBIApm>aepMe%X9h<H13<@P6LktmpFbf+B$5EYOngFv
zAwpA{zO*HWT_?v9GROrfx#<8gB@0i6;M2($d?8+tOX=l4>G~aZBqBJDa%25{&_nxp
zd!wxaM59H8_qPbs!I<FA2p5`lLaI|jnQuPr;j{8e_oq@u9<(mI!NBR+K$*3*Q>|na
zPErgA5x%^Ji^e}8!%iVNs$PF8%pWded7s;t5c&qbmumWCqhlKf`33v?5@LX5s+Xn1
z$B4U3I}c@Uq@Q9^9a?)7$|e=N)R{<>+jFVoyE_^#SAg#7c192HwY-HFhU4n9w7*BG
zyUW`NLaL_dvcLT}-*+v6v)uZ4vy79a4N>jPB^RF_y9)kvHp6_-aDToe^FhLH7h9MM
ztuslU2#OtL+?#7@%|lDmXWMGlFt=ZQ1?S1%73I%eDIRyAGxlIP8<k3LrmD5>5>~f$
zn9Pda7QbVag8!fVCrPBCe}mJ+&&sH#SsOT+4RZE*POs9H6;(rMTj#hPwoztAs`!oC
z<@XgNSj|M$zHlGr=SqnLH41KtY3q!o<tpi-8GCNB`cQ#m2FdfA(b%GGzkp0Ams?T;
zI(Ah09A>FKoz*eZIZ!Lo%<97A%DLn_E%TN98+|g~=U|lDV2UC8ad|Kvq>wR#d!8Sa
z>@k$rsAqJk9L4BbW1&^g;Kt$;OJ#kh{8-E`O<=ArL6bx_xG%YT803x{rBeE4)inUy
zCxZw(ZmWlesqJ-d&`(Vu*rEuKA(uu~%}}UXWkS<ty{989(x!NE#IE(vgGZU!+N5OY
zm9Dd1LR<8995L3T(<9(m3PDdNZiZL)23ng}Fo>cL`2t6w1^Vy)<6PIkJ*YsX@^rIp
zvQpo?ixhFRDEAMTZViWi#BbHznVKkH8|VS!n`~I+7X2Ku%ID?H`_ZoazqSjM0b+&J
z{OYs<!{)TNT#pr*a%p1f)`i)#vd!v^<zA!O#6ZTd&VgS17Ns_u2~n$G(aMrUIyq;>
z$E36XwGBlI&JQ)ayezbmc;P@pfyF7+Y4x*54NOOT^Kv{<9A|Am2l--%*DdPjC9!GD
z7aj8>*F@ie@#80l^Mb~N{d`Ky!%l&IyH`Kc`-|bD0|80{U*Y}Hj+@F8VVvQcM^Wg;
z60Ex|FB+s{W<mLKg7L4fMK08ZrPmX5`9dl7zF;0FG#tBt-`e9Hj-e$Rqh{TimAaOY
z<bz#ljvbYOSd%XVX<N_Nmpq}tj4%Z?Fw8~!E-9h2EgKa2uffNH6mN1Z5KfX+XB^Y@
PuMPkr!%zrz$SvA`t0Z9X

literal 1482
zcmchXi$4<x0LRBC<*X(5na8mvue79nJR3{pQEQhWpCM_xl1?}_e9Vm55vQ0(US-Xs
z$Fj852#a~t-N>cUGO8Ip#tIweSspw0N8Eirzwh_^AN;Nc1)x9%<^})&0E9l_7ra^W
zzvyq>v`3V?WHUO+!6+X9PYn4A0O;kQ{k*Yc9hEHb5+nrDH8&>1FjQ7Qe=nvymPjI+
zOw;Qa=GJw2P;9=_Co6Kpt-O5_Y!KG36dMFK&dJAb0h#cFwBASz=U83#6^XBrBly(b
z({}L^TV(&3cv`%<>1o~@#I+fpHbUmi@~@*AnMf@u!U(Uw`*(ou|D%#*oj1}oHq(jk
z9BLUs4&AZ6ng_RkvV-;3jz@L+;-=xz4QV^~51W^{q~;6YgC;KNmR~x<pfbK$_*i*k
znDVX+*lsX!X<Fz5i;VYXGkqt64D#-s&cH7jRu}yB99ZUJ(@IFcT*8OHT*38ZkJBx@
zaNPciSJotiSwu;ScU#Dv>4X9Gcf^HHseP5hD9sseV_8T2uqi`=d&lAD*(AobOeM{4
zgEL*zZfk1Et`N<8o{%%stJkb9G(y6lv1d?!WKHZ66UQA$A)(E^4&ql_CE<=`{!p(r
zoREr|ZDJ+xXVMc*Sts80Q7H@|@`clcV|)#$^0T=`%K^9CLN^M7+tDY4;x=F{`we4e
zd(H$Z<cSo8MO#mCZnt0Qk0$h-=IbS8=Mgn}qqLs>*5Zn6yUsljFDbgcEBCok`x3R{
z(C*qEb4NnZM_^<hGn1I`dZ4a|e1J4q_1w#Pya``(t>0}q>#b05i%ZzgLr$69|FY-Q
zYOQ5M#Kli5T#UTp=+m>Xj*h-kXmQ>;>9CgFRhR->pn`Mg924g&SA@#)g}t3)1!f*>
z)T$_mpk{yteB06SXUw@jNq)df*04^Q+<a;|GV}o|-PR@y2uAQAYzm{f0nH8=H9>PM
zrNGGVN3Jf66SH)Cj72wMyg*?y!r0*m4AV2jBPlg3FT-jZY0dcHp+G)eeOs=Rrc!`7
zNcUf$`f@&-4L|9laN@Lz<~{<Qzh-bxUZ&VA-eQ$5$2`OF3o1~JQhX(B=#liL^J}$x
zDJBcI+R=CLNF?dty^By|s=on2m_*$*n4M65*~Rxg>4}Q=^i*2;WNL9v+5Gzna5c6{
zGFiN6R5zW{rmhoGD1}f_lTv+0voiaeWZ;kpMhtdaQmy$uOne|uk4ntM7JtAK-VL!T
z%C;))S(q%$oDr-lYw!pgQCWj~B)*#j3dof58sipM?_XbYb#b8H>o3hy)Z5>TdweZC
zEomiql81qGG8v5{KlBctt48;qUvHR<pLx;L!1ink9OuZCmFWz50{o_pK*m*4M_k%A
z24TlL$K2T@tdhDky0(`{shS)M{V5sU{7~ymJ(20$;BibDP4lclk0cYxjuGzuFX5)0
z^FAV$gL6Z?)kyWSyIw*XXh`!-FMb`FTvXo&^Xw7zM#h2>KoR88WnHBJ5$<288(n+j
za|*Gnf@DhN7DWF&6{Q(u7r9@ELU(VY#YJz|3ur4yK+TOQ1e(?t*&AOK7c-^PuT=C8
zV0n?mKwR79ARw#!+of<=@8_{^&0!mAoU!f56Ds~VT`P;(NssZD-DYZQ!3$?w1Op4S
z+-z}q_d;O3Vy#p=kF#r%d${tJ3X`cxi}^IpK0FDzVO5)0!x}xTT%RiLRt;8KsAA^=
sM%${Q?WgQbb++t03ixmJfd-p3)X%peLM*RVZ=N#%eJsF_=W{OmA2v9oUH||9

diff --git a/WordPressEditor/src/main/res/layout/fragment_editor.xml b/WordPressEditor/src/main/res/layout/fragment_editor.xml
index 698057d3dd36..b4350caabf95 100755
--- a/WordPressEditor/src/main/res/layout/fragment_editor.xml
+++ b/WordPressEditor/src/main/res/layout/fragment_editor.xml
@@ -28,8 +28,8 @@
             android:layout_width="fill_parent"
             android:layout_height="@dimen/format_bar_height"
             android:layout_gravity="bottom"
-            android:layout_marginLeft="@dimen/format_bar_side_margin"
-            android:layout_marginRight="@dimen/format_bar_side_margin"
+            android:layout_marginLeft="@dimen/format_bar_left_margin"
+            android:layout_marginRight="@dimen/format_bar_right_margin"
             android:orientation="horizontal">
 
             <HorizontalScrollView
@@ -44,49 +44,49 @@
 
                     <ToggleButton
                         android:id="@+id/format_bar_button_media"
-                        style="@style/FormatBarButton"
+                        style="@style/FormatBarScrollViewButton"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:background="@drawable/format_bar_button_media_selector"/>
 
                     <ToggleButton
                         android:id="@+id/format_bar_button_bold"
-                        style="@style/FormatBarButton"
+                        style="@style/FormatBarScrollViewButton"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:background="@drawable/format_bar_button_bold_selector"/>
 
                     <ToggleButton
                         android:id="@+id/format_bar_button_italic"
-                        style="@style/FormatBarButton"
+                        style="@style/FormatBarScrollViewButton"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:background="@drawable/format_bar_button_italic_selector"/>
 
                     <ToggleButton
                         android:id="@+id/format_bar_button_quote"
-                        style="@style/FormatBarButton"
+                        style="@style/FormatBarScrollViewButton"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:background="@drawable/format_bar_button_quote_selector"/>
 
                     <ToggleButton
                         android:id="@+id/format_bar_button_ul"
-                        style="@style/FormatBarButton"
+                        style="@style/FormatBarScrollViewButton"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:background="@drawable/format_bar_button_ul_selector"/>
 
                     <ToggleButton
                         android:id="@+id/format_bar_button_ol"
-                        style="@style/FormatBarButton"
+                        style="@style/FormatBarScrollViewButton"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:background="@drawable/format_bar_button_ol_selector"/>
 
                     <ToggleButton
                         android:id="@+id/format_bar_button_link"
-                        style="@style/FormatBarButton"
+                        style="@style/FormatBarScrollViewButton"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:background="@drawable/format_bar_button_link_selector"/>
diff --git a/WordPressEditor/src/main/res/values/dimens.xml b/WordPressEditor/src/main/res/values/dimens.xml
index 3653981a463f..a8fe04bb50d0 100644
--- a/WordPressEditor/src/main/res/values/dimens.xml
+++ b/WordPressEditor/src/main/res/values/dimens.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="format_bar_height">40dp</dimen>
-    <dimen name="format_bar_side_margin">5dp</dimen>
+    <dimen name="format_bar_left_margin">5dp</dimen>
+    <dimen name="format_bar_right_margin">2dp</dimen>
     <dimen name="format_bar_button_right_margin">4dp</dimen>
-    <dimen name="format_bar_html_button_left_margin">9dp</dimen>
+    <dimen name="format_bar_html_button_left_margin">3dp</dimen>
+
+    <dimen name="format_bar_left_margin_tablet">5dp</dimen>
+    <dimen name="format_bar_right_margin_tablet">9dp</dimen>
+    <dimen name="format_bar_html_button_left_margin_tablet">9dp</dimen>
 
     <dimen name="format_bar_horizontal_divider_height">1dp</dimen>
     <dimen name="format_bar_vertical_divider_width">0.6dp</dimen>
diff --git a/WordPressEditor/src/main/res/values/styles.xml b/WordPressEditor/src/main/res/values/styles.xml
index 8ac61de5e2ea..038fb3c50cc5 100755
--- a/WordPressEditor/src/main/res/values/styles.xml
+++ b/WordPressEditor/src/main/res/values/styles.xml
@@ -10,11 +10,14 @@
     <style name="FormatBarButton">
         <item name="android:minWidth">@dimen/format_bar_height</item>
         <item name="android:minHeight">@dimen/format_bar_height</item>
-        <item name="android:layout_marginRight">@dimen/format_bar_button_right_margin</item>
         <item name="android:textOn">""</item>
         <item name="android:textOff">""</item>
     </style>
 
+    <style name="FormatBarScrollViewButton" parent="FormatBarButton">
+        <item name="android:layout_marginRight">@dimen/format_bar_button_right_margin</item>
+    </style>
+
     <style name="FormatBarHtmlButton" parent="FormatBarButton">
         <item name="android:layout_marginLeft">@dimen/format_bar_html_button_left_margin</item>
     </style>