From f936277a4d71bde3634f9aec2dfb204ec42944be Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@inframonde.eu>
Date: Mon, 20 Dec 2010 21:34:25 +0100
Subject: [PATCH] make CPTokenField's token pixel perfect

---
 .../Themes/Aristo/Resources/token-center.png  | Bin 151 -> 915 bytes
 .../Resources/token-highlighted-center.png    | Bin 151 -> 914 bytes
 .../Resources/token-highlighted-left.png      | Bin 532 -> 1310 bytes
 .../Resources/token-highlighted-right.png     | Bin 524 -> 1329 bytes
 AppKit/Themes/Aristo/Resources/token-left.png | Bin 522 -> 1298 bytes
 .../Themes/Aristo/Resources/token-right.png   | Bin 520 -> 1331 bytes
 AppKit/Themes/Aristo/ThemeDescriptors.j       |  20 +++++++++---------
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AppKit/Themes/Aristo/Resources/token-center.png b/AppKit/Themes/Aristo/Resources/token-center.png
index 9ec12f972f996aea15d5f80b1fbf3bad5d81b9a2..b2249fc568d1081a28cdb539fdb04732f3ebda74 100644
GIT binary patch
delta 906
zcmV;519kkD0h0%i7k?871^@s6Q441o0008+X+uL$Nkc;*P;zf(X>4Tx0C)j~RL^S@
zK@|QrZmG~B2wH0nvUrdpNm;9CMbtL^5n^i$+aI<?kYqDS)^0ZI?k2URh~(nYD&9ry
zp$Gqf9(wR(FG_`4MJV2@C}N=(E%D86Otz)!z|Ma2-Z$@kZ+~{*01a}|H1&W4<PFDC
zq7i9qd_rpchyaeF2|+X^Rom=NBnCl)bNPGc*m@6vTUNt+`**T;t(wxdng@jaK;TE3
z*($K_7jX(%5(0=k-=QhTbO_($*z)X;IZk<a!L<)7J;Yfed_XlV&VNm~Q_UsQK!Zp)
zl=X2^KAhK!lz-P92Wf6*#>f!8Pmrd&%<ijVp`1?k4v@W_^nOmW-af)1!V4L#KSsEX
zp7o5?KjLBGq~^qiJscP{^!Q*Ew;HMVHNq5M5KSkdRB_oZ4e^++{Z{fyf^d*H%4A`H
zb6QAG*Gz8sx`zdQCf5_M;&)b2;dze}XWrD^??u`IuYWKO9Sj-_nhi)$5Jd!Gn6OYl
zhCCWEG_rC(BdZ1*lY26CBx<{KVnne)dp6uXw^5|sJpL#mag;-~2$K9k{wlA@Pvv>}
z%UrP7R`-;xo0_`v;5)_TnYkJs*VD-3b4^}+mDF~VS4Wntd3wB>>>5ApSC=v7f;ErC
zbFlmIEq`B?%$F&Q6vg9J^Xf~4by_hu-=A!MJ3Znq&n~srbFGPsH&&aMXZ>nO`|hf|
zljc?VPhR!${AbO?W8x_>CU%PFA&Hm8F7cAsOREdwU~R_;ot1_u(ruCYB-LPGn!NQd
zT|ZlRy+(fw^-+`=%+gee_kY4FWHg<*4sZI8+keOW7v%Sf=btD7FKpn*nYwLLaqkeJ
zWu<O&t^yao(S7i?Zfm1{IQ#@yJgXM1QZ=6-ya60`hk739DVWoimd!a*hb*6yy6MVd
zQp`}>LsC-LCD&z37PFaEV(E6+nbRF^9HBWv_r#}4Ws~}^@e#27uu}Q?tWw#2P8!yM
zmw)<iz`XrMz<7&^00009a7bBm000XU000XU0RWnu7ytkOOG!jQR0thoSg`xte})^c
zzW-<X_WcI~)1QBT8JPb6XJBCZ_YX+?1u~ibfw+GmVnFU+ARi(Im4I=<+J64}&A@c<
g#QDz*Kp+4Be=08dyO+Rb00000NkvXXt^-0~g1oh~`2YX_

delta 136
zcmbQtKAmxbc)bt@8v_Hwtne*+fRtp3YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d
z;mK4Rpdw387srr_TS-xskDk>Z+bv)BKmFIIx7N&;_y7Oz$ih732lw-Ttlf+=1H@M8
oOkpVEpSS-U1CtU1BO62OL+#k_2hT_V4Po$f^>bP0l)%^o04B>a*8l(j

diff --git a/AppKit/Themes/Aristo/Resources/token-highlighted-center.png b/AppKit/Themes/Aristo/Resources/token-highlighted-center.png
index 2f2ab1c7e0b6a9431418ff8d682e82e06e70a786..a6c0668ebf14f9902c19536b107b3eea82780098 100644
GIT binary patch
delta 905
zcmV;419tqE0g?xh7k?871^@s6Q441o0008+X+uL$Nkc;*P;zf(X>4Tx0C)j~RL^S@
zK@|QrZmG~B2wH0nvUrdpNm;9CMbtL^5n^i$+aI<?kYqDS)^0ZI?k2URh~(nYD&9ry
zp$Gqf9(wR(FG_`4MJV2@C}N=(E%D86Otz)!z|Ma2-Z$@kZ+~{*01a}|H1&W4<PFDC
zq7i9qd_rpchyaeF2|+X^Rom=NBnCl)bNPGc*m@6vTUNt+`**T;t(wxdng@jaK;TE3
z*($K_7jX(%5(0=k-=QhTbO_($*z)X;IZk<a!L<)7J;Yfed_XlV&VNm~Q_UsQK!Zp)
zl=X2^KAhK!lz-P92Wf6*#>f!8Pmrd&%<ijVp`1?k4v@W_^nOmW-af)1!V4L#KSsEX
zp7o5?KjLBGq~^qiJscP{^!Q*Ew;HMVHNq5M5KSkdRB_oZ4e^++{Z{fyf^d*H%4A`H
zb6QAG*Gz8sx`zdQCf5_M;&)b2;dze}XWrD^??u`IuYWKO9Sj-_nhi)$5Jd!Gn6OYl
zhCCWEG_rC(BdZ1*lY26CBx<{KVnne)dp6uXw^5|sJpL#mag;-~2$K9k{wlA@Pvv>}
z%UrP7R`-;xo0_`v;5)_TnYkJs*VD-3b4^}+mDF~VS4Wntd3wB>>>5ApSC=v7f;ErC
zbFlmIEq`B?%$F&Q6vg9J^Xf~4by_hu-=A!MJ3Znq&n~srbFGPsH&&aMXZ>nO`|hf|
zljc?VPhR!${AbO?W8x_>CU%PFA&Hm8F7cAsOREdwU~R_;ot1_u(ruCYB-LPGn!NQd
zT|ZlRy+(fw^-+`=%+gee_kY4FWHg<*4sZI8+keOW7v%Sf=btD7FKpn*nYwLLaqkeJ
zWu<O&t^yao(S7i?Zfm1{IQ#@yJgXM1QZ=6-ya60`hk739DVWoimd!a*hb*6yy6MVd
zQp`}>LsC-LCD&z37PFaEV(E6+nbRF^9HBWv_r#}4Ws~}^@e#27uu}Q?tWw#2P8!yM
zmw)<iz`XrMz<7&^00009a7bBm000XU000XU0RWnu7ytkON=ZaPR0thoNbOwwpJDEa
zm;afrKKsGI^yAkb2ByFN{sD<Ue}TkbRN@av79{cKFO2o~FHrG6kh*^$Z47^YGB9zy
fIr*6Z2m}CCjWg<@TeV~W0000<MNUMnLIPld?WD46

delta 136
zcmbQlKAmxbc)bt@8v_Hwtne*+fRtp3YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d
z;mK4Rpdw387srr_TS+HoZ~kh3_>lJef5x))zj_;AzTaQ(@JN5ckI&!rjkuluI3_oW
o{&&5$?87%6W{wU9772#LTEiIg>ccOAhA?=#`njxgN?>dP0Ces&#{d8T

diff --git a/AppKit/Themes/Aristo/Resources/token-highlighted-left.png b/AppKit/Themes/Aristo/Resources/token-highlighted-left.png
index 60bc6b4b28492248865539189755e0a5bd9f533d..f53519633b22f2dad0001b2051e1c7f00ce9d3e9 100644
GIT binary patch
delta 1304
zcmV+z1?T#d1fB|z7k?871^@s6Mk)8u0008+X+uL$Nkc;*P;zf(X>4Tx0C)j~RL^S@
zK@|QrZmG~B2wH0nvUrdpNm;9CMbtL^5n^i$+aI<?kYqDS)^0ZI?k2URh~(nYD&9ry
zp$Gqf9(wR(FG_`4MJV2@C}N=(E%D86Otz)!z|Ma2-Z$@kZ+~{*01a}|H1&W4<PFDC
zq7i9qd_rpchyaeF2|+X^Rom=NBnCl)bNPGc*m@6vTUNt+`**T;t(wxdng@jaK;TE3
z*($K_7jX(%5(0=k-=QhTbO_($*z)X;IZk<a!L<)7J;Yfed_XlV&VNm~Q_UsQK!Zp)
zl=X2^KAhK!lz-P92Wf6*#>f!8Pmrd&%<ijVp`1?k4v@W_^nOmW-af)1!V4L#KSsEX
zp7o5?KjLBGq~^qiJscP{^!Q*Ew;HMVHNq5M5KSkdRB_oZ4e^++{Z{fyf^d*H%4A`H
zb6QAG*Gz8sx`zdQCf5_M;&)b2;dze}XWrD^??u`IuYWKO9Sj-_nhi)$5Jd!Gn6OYl
zhCCWEG_rC(BdZ1*lY26CBx<{KVnne)dp6uXw^5|sJpL#mag;-~2$K9k{wlA@Pvv>}
z%UrP7R`-;xo0_`v;5)_TnYkJs*VD-3b4^}+mDF~VS4Wntd3wB>>>5ApSC=v7f;ErC
zbFlmIEq`B?%$F&Q6vg9J^Xf~4by_hu-=A!MJ3Znq&n~srbFGPsH&&aMXZ>nO`|hf|
zljc?VPhR!${AbO?W8x_>CU%PFA&Hm8F7cAsOREdwU~R_;ot1_u(ruCYB-LPGn!NQd
zT|ZlRy+(fw^-+`=%+gee_kY4FWHg<*4sZI8+keOW7v%Sf=btD7FKpn*nYwLLaqkeJ
zWu<O&t^yao(S7i?Zfm1{IQ#@yJgXM1QZ=6-ya60`hk739DVWoimd!a*hb*6yy6MVd
zQp`}>LsC-LCD&z37PFaEV(E6+nbRF^9HBWv_r#}4Ws~}^@e#27uu}Q?tWw#2P8!yM
zmw)<iz`XrMz<7&^00009a7bBm000XU000XU0RWnu7ytkP)=5M`R45f~lD|tMQ4q)H
z?OU_iXf)YFz4(JPM$>5FVR3N9afn6iM8V>kv$e1gYy?640XAZJf54%&SZizJwKigN
zoM;F+B}S9%z8^QUy5X5P<jcOD_nB|rynh|0wT9MU7?@+9rWcaqU#5TXj#z=&Ja4}P
zT4<ma*Y;<-Qr<ykC_9+$?X%s^Zi|`DXc&Uu*AJF6+1yrNW;mr>k5wB0zEIGFU;o;g
zU)`C><|cl97#{P=bsGZBKq(FQ1M?Vk&Uk0i+jLR`-d)uKUrK1Ugu5a9>dNO=wtovr
z@8jgXaKTpssM?Ikneuil(KRO=k2eBBq{)SA6Xx9FQ#Bn2Ekzqhi3qlEZE4U0LUS~2
zcQs*JTM8jk*g9oeB61GXQivPnKaBuSv|ul<CanB=^@7(PMx^WDZu=O}St%5$@~?Od
z)uK{C10;SiDdZbPFxkk{!=GoWa)0|9YGv$Eps>J@3DbSmZ~t8F>dH-t`H$Fa5H=h&
z9>O?Gp)<n4`N`4Q)8ETI_HbQd&n2y;4;sIwQnGE3@RA{pvOgE*3jNvqhHx{3K`iBH
zp0Jx!hXBxs;)4q4I%25qZwpI{iJtUV-r<bCfpL=xXilOcDkRZ6`w#l4*Ae5T;)Ck|
O0000<MNUMnLSTZV<A2Kl

delta 520
zcmV+j0{8u%3X}wp7k?561^@s6jddh-0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzwn;=mRCwBA{Qv(y10y3NL*AUN3@|V$#hVdGF?nWG^2_TOC$O-x
zdNMLGYp}po05yRXrur}eDdyDvWx*WWyc5MGrN#IKg%~(ExqlhpivRup$1o+$52TPK
zZPJQLaVfb5VR0#jAFR9#Pk;Pl`1bxE10&2CKma0G61(O{ODn0*=aEogc=VN#;rGA)
zaLW<S0J_mCC|;0*o3HIZk0`^f5C0g@0ZcK-RAx0(yI3A!3CYJl*?`=?conm-u(A8T
zW8`7@`xnzxWPior5CFPe>&t&OhW~&6;#CX|*Z=?j3H<&KWD-ye*6{D|-w*$O{}lbl
z#7a={|KGoU++g_mMf49FA6CUoFomFa`S$6<cGhoi8UFnFixtBZgS`Lu+|KnY**`yj
z&HUpd!yjOXpkri{|J=WL^8LH#j~Y3@zF=VZ{R8OFzketgIl7sFm>r0D0t%bUnZ#9!
zK68kI(*`^Q(9;GGa{w{7dumCru#{ZWXHE&BZ>;<bznD1@ilgc$Gc0S&WrAt|*}y5K
zq9tPF9vH>RE8xh&%BBWa99cIJY}N9nd`4J|LN&5L*-QWd1^`O$yA(G5ZF2ws002ov
KPDHLkU;%<368P%?

diff --git a/AppKit/Themes/Aristo/Resources/token-highlighted-right.png b/AppKit/Themes/Aristo/Resources/token-highlighted-right.png
index 2aabf627c627d0cf5fa1f735829554f9a0b07087..6cd745a5dbacb58c4a29e7910397027ec01f00a9 100644
GIT binary patch
delta 1323
zcmV+`1=RYC1hEQ`7k?871^@s6Mk)8u0008+X+uL$Nkc;*P;zf(X>4Tx0C)j~RL^S@
zK@|QrZmG~B2wH0nvUrdpNm;9CMbtL^5n^i$+aI<?kYqDS)^0ZI?k2URh~(nYD&9ry
zp$Gqf9(wR(FG_`4MJV2@C}N=(E%D86Otz)!z|Ma2-Z$@kZ+~{*01a}|H1&W4<PFDC
zq7i9qd_rpchyaeF2|+X^Rom=NBnCl)bNPGc*m@6vTUNt+`**T;t(wxdng@jaK;TE3
z*($K_7jX(%5(0=k-=QhTbO_($*z)X;IZk<a!L<)7J;Yfed_XlV&VNm~Q_UsQK!Zp)
zl=X2^KAhK!lz-P92Wf6*#>f!8Pmrd&%<ijVp`1?k4v@W_^nOmW-af)1!V4L#KSsEX
zp7o5?KjLBGq~^qiJscP{^!Q*Ew;HMVHNq5M5KSkdRB_oZ4e^++{Z{fyf^d*H%4A`H
zb6QAG*Gz8sx`zdQCf5_M;&)b2;dze}XWrD^??u`IuYWKO9Sj-_nhi)$5Jd!Gn6OYl
zhCCWEG_rC(BdZ1*lY26CBx<{KVnne)dp6uXw^5|sJpL#mag;-~2$K9k{wlA@Pvv>}
z%UrP7R`-;xo0_`v;5)_TnYkJs*VD-3b4^}+mDF~VS4Wntd3wB>>>5ApSC=v7f;ErC
zbFlmIEq`B?%$F&Q6vg9J^Xf~4by_hu-=A!MJ3Znq&n~srbFGPsH&&aMXZ>nO`|hf|
zljc?VPhR!${AbO?W8x_>CU%PFA&Hm8F7cAsOREdwU~R_;ot1_u(ruCYB-LPGn!NQd
zT|ZlRy+(fw^-+`=%+gee_kY4FWHg<*4sZI8+keOW7v%Sf=btD7FKpn*nYwLLaqkeJ
zWu<O&t^yao(S7i?Zfm1{IQ#@yJgXM1QZ=6-ya60`hk739DVWoimd!a*hb*6yy6MVd
zQp`}>LsC-LCD&z37PFaEV(E6+nbRF^9HBWv_r#}4Ws~}^@e#27uu}Q?tWw#2P8!yM
zmw)<iz`XrMz<7&^00009a7bBm000XU000XU0RWnu7ytkP=}AOER45gNlCf(PK@`T{
z>`vloavX*f8W2H|t84=P6PBWtt+h&OL69KE&PJ>hQfMHcg>qFA6ofQhWpikg93Fcy
zCVQ@Tx3|0VX8hiAdtP9{2amTq`}@9m^M7X5owfD0Gu+}VZG8Q_^{TnG`G<&{1nP-U
z&p)*}9z-@g{Aq$8`<;I8`2NPzl@CfO54@eGy}i(Rp{?opr7M;C)#XbUF4xy@KX`Um
zKoLyCx}Pw4DN{63G^46&@nZd~Blqyu%99qrZ3tA+lE=)HWlTw8XaHdlDVnXFTYs3V
z)>Z*mkg9O^*f5De(%^XjQIF@Sx_Ey1=DpSH0DW;6LGE0@QY~_n5t&m9{_L6g8(=gt
zhqVA@5xWZco_`JB{Qtt_eAu}qfHDzD)@%%FNnpgjwQ@0&@c}MxgE%H<((bg4HeBYc
z$d7xJj)q?VPj0cqS&?#v{C;4gqkrzZF`Nr9jfrr)qa&Rhk&U{|?bk1Muqb`zKb4lb
z{tFyRdW|}VLHqk-tdEe==NPsuBf_gCFA1HB4}J|gt+n0vZ^RYXLtOkD+9iEQJTx<D
zFVS((IoNMK+HJgT0FwR$&RtPSpFVExah7}={tiFxY`)yUT7;CX6QnI%@g$tzc@0(6
h;v@$s@&t%=`U}mG8tlGZ05t#r002ovPDHLkV1h08hk*b9

delta 511
zcmV<b0RaB73XBAh7k?561^@s6jddh-0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzu1Q2eRCwBSk~>QSK@^40u1n%05k(>f6cs^Gu(Yx8AK2Ikf{2Zs
zh(AEVLPQV?K@d`C<pYs4iloxQ#v+I);uG;1HIFrf%_f<h8Gk1_#_^GX)66~hn>+Vj
zZ6vUD&lx>)2-&$k2`}#~PA35{Ar9qm&Y=auQJ%3aB+Ud~B9E^bD>WJz>)#Y{Dw7Ik
z{n%u9bShx@8qw0$QCrv0v^qS$HZJ0Zkgn2on^44Uf@?F2i?kaae=}<R4dX*IOMN0<
zBBT|}lrnrNBYzUlO$z4mq1013)73jzt<rUeQvB9KPP|Z4=Wp%o9#H8&$f^>W2Zqbt
zBWwRK8+p=y$Koz{HLYEe^QEw&W^hfki&aUZBs>3`bw<D_eN($pl<dk`AS8RKPO>Pu
zA{|3IX>O^b7i9Lw=q4$+Q<3O?D7dbU-Jrk9C=s=mS$NM#MD8YUjt)$5<rK)2eUnQC
z(VK~azFf_1FHCKStE?n{nnAK~Q5)qX39tQ}h(Fy;gaWhqt+R!Qx_L%@{4nN_+=ZQb
z+uaKVSDvm;W77D83faRNnN4MVj`At4?(@3<0|4Xa{y`-A;g$dZ002ovPDHLkV1kD1
B=Bxk!

diff --git a/AppKit/Themes/Aristo/Resources/token-left.png b/AppKit/Themes/Aristo/Resources/token-left.png
index 00cf12196e80fe9133d34a8a5378f162058f2a89..2293aa0e7b7c2ddbe6d5ab11accc531a04546333 100644
GIT binary patch
delta 1292
zcmV+n1@rof1d<An7k?871^@s6Mk)8u0008+X+uL$Nkc;*P;zf(X>4Tx0C)j~RL^S@
zK@|QrZmG~B2wH0nvUrdpNm;9CMbtL^5n^i$+aI<?kYqDS)^0ZI?k2URh~(nYD&9ry
zp$Gqf9(wR(FG_`4MJV2@C}N=(E%D86Otz)!z|Ma2-Z$@kZ+~{*01a}|H1&W4<PFDC
zq7i9qd_rpchyaeF2|+X^Rom=NBnCl)bNPGc*m@6vTUNt+`**T;t(wxdng@jaK;TE3
z*($K_7jX(%5(0=k-=QhTbO_($*z)X;IZk<a!L<)7J;Yfed_XlV&VNm~Q_UsQK!Zp)
zl=X2^KAhK!lz-P92Wf6*#>f!8Pmrd&%<ijVp`1?k4v@W_^nOmW-af)1!V4L#KSsEX
zp7o5?KjLBGq~^qiJscP{^!Q*Ew;HMVHNq5M5KSkdRB_oZ4e^++{Z{fyf^d*H%4A`H
zb6QAG*Gz8sx`zdQCf5_M;&)b2;dze}XWrD^??u`IuYWKO9Sj-_nhi)$5Jd!Gn6OYl
zhCCWEG_rC(BdZ1*lY26CBx<{KVnne)dp6uXw^5|sJpL#mag;-~2$K9k{wlA@Pvv>}
z%UrP7R`-;xo0_`v;5)_TnYkJs*VD-3b4^}+mDF~VS4Wntd3wB>>>5ApSC=v7f;ErC
zbFlmIEq`B?%$F&Q6vg9J^Xf~4by_hu-=A!MJ3Znq&n~srbFGPsH&&aMXZ>nO`|hf|
zljc?VPhR!${AbO?W8x_>CU%PFA&Hm8F7cAsOREdwU~R_;ot1_u(ruCYB-LPGn!NQd
zT|ZlRy+(fw^-+`=%+gee_kY4FWHg<*4sZI8+keOW7v%Sf=btD7FKpn*nYwLLaqkeJ
zWu<O&t^yao(S7i?Zfm1{IQ#@yJgXM1QZ=6-ya60`hk739DVWoimd!a*hb*6yy6MVd
zQp`}>LsC-LCD&z37PFaEV(E6+nbRF^9HBWv_r#}4Ws~}^@e#27uu}Q?tWw#2P8!yM
zmw)<iz`XrMz<7&^00009a7bBm000XU000XU0RWnu7ytkP%1J~)R45f~k~>QSK@i9H
z_BP2SXC8OCoR3pf1Q8Jn!NSf$6k;QapmrkI*lA%WiYTZccA}Mqf{;cV8zG-SvGD^a
z_*O(nqS4%KoH^WZiCLI??EL=!o!MQfSbr>%$|1pkIcZ>gHas#lIjscLq%6}8Rt2PB
zz_*UhhGV+1W0?s{kA|5VRH)>2216IzK0cpoX>MArHS}1dCM0o(6Al%W;J>Bm+J0)V
zy|e4EwXs&m0<j)p=q&^16*XSJV#H%QI$=8k#4cR;&sAR9OC?Q1>+v%mah&qTQGY0$
z(Upb5+Gr%K%HT;VSV)({GG(mS@AE-3ZtmYhI8(?_PH2P7SXEb43K+ksV{_uTw$-iC
zu{3_{pZl+T!4;sWGQ2R)WwRF_xld?Ma_h!Lydhu?_WbSc=Je_1oqreXGDrvnj72&J
z>+|V{=a<X3j|{On)DN5M4KHkiAb)>*eYJl7`1G2|<%tb<0uMttySo8LT7*+{04|*D
zE~kUh*amQmb!NhdYf*_(N+_In<wcS~pg^#pnZ;yVci)m#Z(6z*4X7c7m0$n}UQu|V
zAOPWqh>R_4PH3jpF9$;HWiTXBfcHd*P>6y5(l3Gy)vub#yNv(<002ovP6b4+LSTZr
CC~b5A

delta 509
zcmV<Z0RsM#3W@}f7k?561^@s6jddh-0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUztVu*cRCwBA{Qv(y10y3N!^#sk8DJpXLY)yvF%`B><kz>fO<-eV
z_he#X(qMrp_y^Pk0+E&)OhAfx*7oDUJbe5UC4>dV1bDa@IDgsM7!Zp8{bz`_)&wbJ
znX~J3rL?4YgP0&c12+d7!=JzZ7=Hix!@vl01`vP<mdP6rMJp>R&X*MvWcd5<AH#pB
zjUWIw8RW*W%o0H^KEXCYK5m9zfBrI{1DIlvsmvB`zOmxM{E{rp%s@Xd;8o1R!olUs
z!OqU`_dgbuNPmjKA@HAxS&Nm01*@s(CNly3Bf!YS1T-1DVkRUu<L|$JKm7Xr7aWY(
zFtXzRKYskU@%hIuu*ujkOfksfe;?ky+5YC^XRw>GVVL57K>T<2(itlszk2uj{g-dx
z5JAVtCjYs7Xy^Oq_ir~od-I;*$FDy)O$I3jMcL2UC3bPEZ{EDocjxI#hWDSpp(w^k
z8$iqf#N4s1vx6m-G@7KvgoT9oco?`i*%69MmLFm0iL_yYYG4OqPDKL?5r>$ZC|)5^
zM;0~?HMruUWrxA;>5H;ugvBUSBMX$x1Q1{VoAlRz?vABp00000NkvXXu0mjfLB;aO

diff --git a/AppKit/Themes/Aristo/Resources/token-right.png b/AppKit/Themes/Aristo/Resources/token-right.png
index da85823331c5d28c886e1ffc9ce89f0ada9e2cea..a213fe09d2995be1185af7b5aaa2c2ecc8db1034 100644
GIT binary patch
delta 1325
zcmV+|1=9M61hWc|7k?871^@s6Mk)8u0008+X+uL$Nkc;*P;zf(X>4Tx0C)j~RL^S@
zK@|QrZmG~B2wH0nvUrdpNm;9CMbtL^5n^i$+aI<?kYqDS)^0ZI?k2URh~(nYD&9ry
zp$Gqf9(wR(FG_`4MJV2@C}N=(E%D86Otz)!z|Ma2-Z$@kZ+~{*01a}|H1&W4<PFDC
zq7i9qd_rpchyaeF2|+X^Rom=NBnCl)bNPGc*m@6vTUNt+`**T;t(wxdng@jaK;TE3
z*($K_7jX(%5(0=k-=QhTbO_($*z)X;IZk<a!L<)7J;Yfed_XlV&VNm~Q_UsQK!Zp)
zl=X2^KAhK!lz-P92Wf6*#>f!8Pmrd&%<ijVp`1?k4v@W_^nOmW-af)1!V4L#KSsEX
zp7o5?KjLBGq~^qiJscP{^!Q*Ew;HMVHNq5M5KSkdRB_oZ4e^++{Z{fyf^d*H%4A`H
zb6QAG*Gz8sx`zdQCf5_M;&)b2;dze}XWrD^??u`IuYWKO9Sj-_nhi)$5Jd!Gn6OYl
zhCCWEG_rC(BdZ1*lY26CBx<{KVnne)dp6uXw^5|sJpL#mag;-~2$K9k{wlA@Pvv>}
z%UrP7R`-;xo0_`v;5)_TnYkJs*VD-3b4^}+mDF~VS4Wntd3wB>>>5ApSC=v7f;ErC
zbFlmIEq`B?%$F&Q6vg9J^Xf~4by_hu-=A!MJ3Znq&n~srbFGPsH&&aMXZ>nO`|hf|
zljc?VPhR!${AbO?W8x_>CU%PFA&Hm8F7cAsOREdwU~R_;ot1_u(ruCYB-LPGn!NQd
zT|ZlRy+(fw^-+`=%+gee_kY4FWHg<*4sZI8+keOW7v%Sf=btD7FKpn*nYwLLaqkeJ
zWu<O&t^yao(S7i?Zfm1{IQ#@yJgXM1QZ=6-ya60`hk739DVWoimd!a*hb*6yy6MVd
zQp`}>LsC-LCD&z37PFaEV(E6+nbRF^9HBWv_r#}4Ws~}^@e#27uu}Q?tWw#2P8!yM
zmw)<iz`XrMz<7&^00009a7bBm000XU000XU0RWnu7ytkP>q$gGR45f~lHW@dQ546|
zy>oYsVv`L`s)zoEpnstUAA1V=Cql4Cl@P&)UV4dy@FA$cA|FB!N_r6=(uCCq6++#b
zcAed3cO7ST#+`eo@0rzgjXCh;4(EK%kAHj5i23F9vesrNjQpj=x9{e^EX;XCl(6Bv
zWTN!j(|$WNZp({pr)D?Z`jhd;qo0Kk61?fB#gB3`kwTEPBpsgw$x+>H9vqgZ#vVO*
z@qdEST9Zb)(1Hf?IdS*SNKqS_oSyrz1NT=Xi1U%8!D!kf6oW80S;NJ_8-<};(|>@k
za2+T$X)qOEg~ed36UygvbaSY9Z{pR$C@71oGc7e&?h|+7XSiOtW?d~5AL3I%DXdT|
z)AG3-Nu};1X!T%p%`{6XG9+&!D9@x7&zWU>Y0dL>;S^Eq%(8aaq0`Q3wLg|QGhe>t
z2h{dY)&cjnm<h*mOclp9m0$ax&VS%EL3PKvXvY6fz3I`PBWL5y%-9Mdyx?@!US)nr
zjSU6ui0n$WcDTJc16K&e7cd&|A`HO4jaE{1YW3Z%&Dq75Q(UzJp?Uf$q`bgS{2+|o
zMk}%_j{UQ=_H6m}>=GcJli}WTsnzeL104l>4affW@%hvD2p&V+I)c!&TP79X>COjn
jayD1u%be>H2tWM;Dbpl?Us#Gn00000NkvXXu0mjfq$Q6R

delta 507
zcmV<X0R;ZD3Wx-d7k?561^@s6jddh-0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzs!2paRCwBSk~>QSK@i91HY<uEY65D&Phc<T7YJCS)k-TBtZeK=
zLA0?^5DURZ@PQ(Ng&<<#3m>JABGI50qNlke=jC;|$L_j^dw*o3W?-(^`^}%3|BSMA
z8GEIa#%<d=xV<`GU6>d%0D$sjAO&L#l$d5R)3V_!Uxbgep3G;Bv60@MUH+elqB4A^
z<`_Z<Z~#G}WJ6Ln;7$FU8H#kxa>n%wJQxv5!Es&i)B{L?j@BTA+uJ4=_fGpc6X2=%
z>WK2r{3QHiJAVX%jSbMy6rAfD9dGfNe_=l{#?TgO3U^1M1F||IyqEv7uC^9%U44`@
z*oQH#FsK|gT%Dmnr%?7<p_o*G748t9y;*=lxr(&o5^xCllHI7PoadffmX(k<S+!@)
z$bp{H_T|-MZ}Q)fEtv3{%xFg&%iHqW|0vsz3-2i%)O44`^!?ePE>_O|zy?1iHLb%_
z;$ePed~k<9Swi^-E;$YqO$##FJiH~-8TC0nwKg&AU7hKfB3~Z9xQVA+yY!gLXvZh(
xOPen@*C_#3sDkh?B&vz%&y|K^@;!eGFaQE-{%ZVJQw{(C002ovPDHLkV1gUD?CJmj

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 02d5f629e..d4706ae26 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -921,21 +921,21 @@ var themedButtonValues = nil,
 
 + (_CPTokenFieldToken)themedTokenFieldToken
 {
-    var token = [[_CPTokenFieldToken alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 18.0)],
+    var token = [[_CPTokenFieldToken alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 19.0)],
 
         bezelColor = PatternColor(
             [
-                ["token-left.png", 11.0, 18.0],
-                ["token-center.png", 1.0, 18.0],
-                ["token-right.png", 11.0, 18.0]
+                ["token-left.png", 11.0, 19.0],
+                ["token-center.png", 1.0, 19.0],
+                ["token-right.png", 11.0, 19.0]
             ],
             PatternIsHorizontal),
 
         bezelHighlightedColor = PatternColor(
             [
-                ["token-highlighted-left.png", 11.0, 18.0],
-                ["token-highlighted-center.png", 1.0, 18.0],
-                ["token-highlighted-right.png", 11.0, 18.0]
+                ["token-highlighted-left.png", 11.0, 19.0],
+                ["token-highlighted-center.png", 1.0, 19.0],
+                ["token-highlighted-right.png", 11.0, 19.0]
             ],
             PatternIsHorizontal),
 
@@ -951,11 +951,11 @@ var themedButtonValues = nil,
             [@"text-color",     textHighlightedColor,               CPThemeStateHighlighted],
 
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBezeled],
-            [@"content-inset",  CGInsetMake(2.0, 24.0, 2.0, 16.0),  CPThemeStateBezeled],
+            [@"content-inset",  CGInsetMake(1.0, 24.0, 2.0, 16.0),  CPThemeStateBezeled],
 
             // Minimum height == maximum height since tokens are fixed height.
-            [@"min-size",       CGSizeMake(0.0, 18.0)],
-            [@"max-size",       CGSizeMake(-1.0, 18.0)],
+            [@"min-size",       CGSizeMake(0.0, 19.0)],
+            [@"max-size",       CGSizeMake(-1.0, 19.0)],
 
             [@"vertical-alignment", CPCenterTextAlignment],
         ];