From dcd83f243b685420b835d504f76ece2d3c747969 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Thu, 10 Jun 2010 03:37:23 +0000
Subject: [PATCH] For post-2.8 - start at replacing text buttons with image
 buttons. better images are desperately needed.

---
 res/drawable/ic_button_close_clear_cancel.png | Bin 0 -> 4650 bytes
 res/drawable/ic_button_delete.png             | Bin 0 -> 1366 bytes
 res/drawable/ic_button_flag.png               | Bin 0 -> 1476 bytes
 res/drawable/ic_button_mark_read.png          | Bin 0 -> 1471 bytes
 res/drawable/ic_button_mark_unread.png        | Bin 0 -> 1485 bytes
 res/drawable/ic_button_unflag.png             | Bin 0 -> 1440 bytes
 res/layout/message_list.xml                   |  16 ++++----
 res/layout/message_view.xml                   |  13 ++++---
 src/com/fsck/k9/activity/MessageList.java     |  36 +++++++++---------
 9 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 res/drawable/ic_button_close_clear_cancel.png
 create mode 100644 res/drawable/ic_button_delete.png
 create mode 100644 res/drawable/ic_button_flag.png
 create mode 100644 res/drawable/ic_button_mark_read.png
 create mode 100644 res/drawable/ic_button_mark_unread.png
 create mode 100644 res/drawable/ic_button_unflag.png

diff --git a/res/drawable/ic_button_close_clear_cancel.png b/res/drawable/ic_button_close_clear_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3f658c555d556597eabbd6f93d9a90844bbabe8
GIT binary patch
literal 4650
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

literal 0
HcmV?d00001

diff --git a/res/drawable/ic_button_delete.png b/res/drawable/ic_button_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca7f03ac378f0c9abf9f55a5921f407956b7714
GIT binary patch
literal 1366
zcmV-c1*!UpP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV+
z0}3zRK}1Oa00h=aL_t(Y$BkCaYgAVh|DAj9dv89>%w#lUuuY7yB#OpBcips9x)Hl+
zSCx`3MgM~qx+=IS-L#lR-4ujEp&)f36uRj~SEXr-ACwRyp^7mvW|GXC_wL6zUA#$5
zG!oxi-H&sA=XZYhoO=nc_&S{qDwRrn{g>;9A3b_>NRd+8*F}VfhKC-W{qXEU*3E3W
zQr^`My$V1?%=CBD@8A04*3Y$at)gO8?3Kcb9ZNfHch0<X=A)^LQ#Xmo?dHdb$ZmiF
zAeo(;y>x2)RQ>qm@%egRJ&h$6Xdp*UZq1cu@6V3TEX;f}g{k*M#Jyl&002O{-Hz(@
zI`zhzsi*^}SNbaU$jFfk6DKF`0`Qx5ckkRiw(xM_M!j0^1JKy!oB{ZDyDjy4-I0hW
z0FCqK&;P`p-xd;4P+(yxm&*Mk<0JaXe@|A{*4Nkv-;2s1L_r-re6*RSX;@xaer7wC
zhzKG=DpG%5`Toi$09Hvv^wl4(elT-q=GTG!1Bjvs3JM$;CN}7+_91Y<#`*>v91IMY
z7!gM>eFkM+Mknha<N-P5NF>3^`U+0Gb>hsq&(8g303b<{sL|KJ;DJF95gZ&M6#)VW
z2^16>%?7CV1ArrkNFs<9)N~E5>d*{LWI98sQbJNo%%%o1d2;gJ^4c=`2l^LFrP7=d
zMFC-lT%@P~>`iEBZ0+fdSy-&IN7pyj4^AALxCcPUJ5So^#J26g^7?Yk2Fo{pzj?wN
zFEL^W1Ox(ucRkLkcP6^rrPJ@8z7t2WQi<9a+&{P&LdXdKLI|XaI!dN5Pk%f&Klfuf
zDZ|2I6GTDn3Xmg5f&@NzjEszYdg0=QYXEX)hSpk)h=7QsS6nb9qnq_6s@1A!tqA})
zuw;_K7(+3|==v@qL}Iid0Pw*}7BcE@^lJb+{3)Urin*5wiin0shcAzfk6nTR)k-xQ
zePi_6#N@>1jdH_LL^L)w_Vw`S@V79aebGLMmYr>as3^1@ErJD>Eu3}GqW|{f*V0ak
zJkBvx9=cH~mmaLPS5q-kS4RC6(y-5VEPU*-P4jIUz1W<H3KjwA+ODMQDQ8&*9W-p$
z^0W3c+wQc993l5PuWqbzYEvKpPTbxA-uo>UCKwSBh!v!qqHDVV17Zca<Pa8UuOUw0
z*dgL*ZvcTnf<Rc%r7nmG78b;Wh$4Ui8!RXghzS7!mMkR5>oFh@tXPN>m|)<@fdd1s
zNCAP0AbMR`AdtKmOOU+*zyO6JYA?QsR0tWe=O-)>GM~Y*gRpF|_Tpc@4_?xM3k_Hp
z5RgEG!H8T0&mI;Q3@%b85dwuG0Lh?4y#|BcwZnm-v{G7WO@WY8j@ZPiL?z{e7a;)~
zRxx6oBS#!!F!A0DNDBHDSHXk(4-PVMspC7S`5GQSe!M@+vhG@U%~X>r=I7=Im!2+_
zlvT*%ywGY70M0@tMhrv?X6I(VNINOF23r6FGcz+^u5?!X;RA=OPC4BE=k`}m+fQle
z%^^UFmh!w8><%EUMr$#+V2v@V)ojICmLZBFPlnKHwJKSbK_c;qN^q!ksFb-3k&1jA
z$6V>JEN;J#UwTzAGc7GG_09e}dtAr5vRT>N9|lB)xE2=M*LBe8==kWpX0y4jl-e@*
YAG&L`&~R^T6aWAK07*qoM6N<$g1xnB!vFvP

literal 0
HcmV?d00001

diff --git a/res/drawable/ic_button_flag.png b/res/drawable/ic_button_flag.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f31cfb575a0e6af7c05c4c3d3a1d1ca25197c3b
GIT binary patch
literal 1476
zcmV;#1v~nQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV+
z0~-`Pla74=00l%zL_t(Y$CZ^!Y+Y9shQD>*_jT^Qv17-@b`rZzOjFUMh7?3fXnBc1
z5kjgE!X!)>K*UQ3As7Iipp1aR00tG$PUryfk`My5QfL!OK~>s3z;P1CvE$f@?fW|S
zp6A{S?j^C+I+P`Cowc>kUjM)MTL0Rxh5hKn@TU0}jxm0Gn(5DelB1uSW_;t?FTU5e
zRTwPZfPM3L-l<lTgM$8wR;gqP<6EC+`H3IW`d@pu1c+}e-1e&#Ju%eJqlKK_ZwR#7
zd}w*qya?F~083X^|9^lle*cbN%&Wr#RrU6Xof)137cLtQw>xqUcmd#RKiK*N=G~4r
z{Xyg-k5Jt`EMMxc=)=2)G{qd$n^FuT+LJr=-=^M7{q!s7tzsC{N45rd`j6;hseH8L
zvA^F}<Xp6Aq5I2<a-OM5Id}ZKzeH`d|Ja8?dcN!)p-{?E@(cJP<jY0e2lmL$-NWuz
z4@}1QPmC(JRO&JfJIL(3@bZj3f8|>8^}nChm+CEIpxp>))Y~+#E)W1(p8PV-{0bB8
zh`n*bsAV#SFyt55H9W|@_m5M#Zwv<e&>{#LFwpCD<osngGehm_60@}?a{^0g#%0@L
z-gEf(jw+Yr#Bn}l3ZM2|4pn@jZ9e8UA7h)3St()p1#lerZ}4t>P#PVl&<tR`LAur;
zTWg@!yI(8la3;<8y*2gL!w0<NpA){<a{8(`jsva@o(+!GWs3&gyJ_JLh-ZQ8Bjr5y
zjy~)tfjEJB9cpcFvX)IYtlg83UU!1@MuC};ihC2o?p1^WGK382m57#J&NOJP5dlQN
zG0~3QLr)PupQobstTpZTESOI|_1w*ytDS*%5RFESg_5ljF%^jFvF`dJ3fVN*pfwr=
zl7UVj=^(4?CTrP)LF#|txrsw3eqxEp#YF3$FP|;OoyFX-wdNm&%3fRY9$JJqWLiTz
zMCu)zPT{>_Zs^Ew%VUrK6gX-1<b19)^4K$IAzlnW(TQIgvBD+8b<i6zw!(`OB-Hn$
zY5Cw%Zt%#Ta)a;sRnZ?jEh5SS5Rpu4ea5}-sG4uBSL2&=N8)5<#I-W%WkkPD{M$K+
zVuOxUS3>upXGiyb=4YPEKSU(Da^@L~Fp3DH2oX_F|M=TyYuU)}!bs01i4EE9JP4|L
z-y4SX3V|fHXf=X`xw)%<e&XZuqKHJbTi4k2md7zRQc9Lj8vlC!DYd+~sDf64WZeXE
zm!UIAV?`J=&F0E^d*9UCHuX2lbKN^#(_A;LI2*9tq-<)9PC*2XbQ!Cj77Xd>gKjmE
zDv0B}5w4UxZ5RNR{*ms#8`1Jv)9_Slz(e`221(F5gt&nOO=yKat++}nFo~Lo?f?ne
zQ5q+W@@BByX9d>;;Md>z=xg5tyM0Sc!MAg<YetI9fFv~}NDM-2dz2N&157V7+Oq{W
zx}GaoskoNHO*FYQcAYTpPjPL4kA34euLa0;>V_%!xd;bfwT3hc!^$2$6goSm&YR^u
zr^GI_v$YEcgX^dF*RP$d7Mk;tcfiZ=%9ae)+_65mP=DPQtu!))psiZ8=)`83+~|Rh
zyM5owcHh0vJKH8+RHey_;ud4OFz{Eyt-doY?|rufOAp+dJ5^}cZ`gL<pz)@$_nBIs
zM|vvV1W=iLe~Q*KNqzAZmGi6Su6Mjz9Dn55QvW@tfGZ-Bbd{@T_3*yg*4pw+a_hoF
zjjV70|3+FY4xFp*dAK1PT7YbpytaS`mF6&z8p2<ISLH4}Lu<WV!DDC!4B;i<q=+Q7
e<x5ls$N3LdN?7=g9`-2!0000<MNUMnLSTY#U)q}h

literal 0
HcmV?d00001

diff --git a/res/drawable/ic_button_mark_read.png b/res/drawable/ic_button_mark_read.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bc7f4e9320fa0b0f05f734342e0642af89fd7c4
GIT binary patch
literal 1471
zcmV;w1wi_VP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV+
z1PTysXn*kl00louL_t(o!|hgGXjE4a{^s0s_s?$Q#x1rXnk6<X#v)RbR4V$^Hz|3L
zN**jN)k@V;uz|Fdq7T}qBKA)-DpXo1mC}N3mHJR<p(GR$krFVK&{U#GHruSb+3ekW
zXQmI`n{J|^YW#WWfq?@vbLN|$Gc%;Bc$mlFA)o&N%n88JqetglKy;@?I5;?{=gyr&
zsZ;_H0RU2|6goOOuxQaDx~~BG`ucQWU;u?e;U-=>oyO9oOVQEMLH8WM$jFFZx^xMH
zgM;uqZ&tZPB7r4KmLQwWqPe;Gwt(3G61Z~Zie9*I0mH+?0075vW|j3k4+8@On3$M=
zi0I<Qi)l^~7#bSVzP>)(xN+l-iz|^xVD;+NXm4+)y8>|W;zjN6@5fv_<+5eVux{Nt
zx@`bw&Ybxvm&;{6&wKn{{dLE2CQ_-?h0e~-wX*`~>FHUJ&1P4M$N>N=X2>akJE`u_
zt9qRxfDg8A-TLlL0QT+McZ`VKWHR}zwYIgUSRWd?OXsHnQB{wKPK(I#ojZ4a4*+!X
z<jLQQ#p079^1$10sZ`o;nwy(5K@h-o-3JaJl}g3z=;){=A_PHjv9Yo7cq|qhw$@Gn
zm}<4P@J%nC89X9_wHDS|xUM_ZFM=RIwOWPedF**!HJ8ghSE*FCi-=1^6E>I2>GkW^
zDISkM<@^3NW6X!fn9oII;$AH))>@aDv#Qzy;CTQI%sdVNmYE?Us;Wjr+5x=9%+1D_
z1FHJhTtE;J8Dk!)R;wEUYzDA~h+-lFRTWi*6%i5<Ftai<scJ@5w+BJc2w<PJ_F7Hh
zP7K2sV}l@QQq@<8s0%<_ji<~^HOFB^1T`XNRuLfpjR3X-SWu}{dK||YzEvIM^Z6$L
zps}&>TD@^qjf%)pW6bLSUaFfp3LtbCA_5a$LJ%UNHG+t20`Rr(`^$XapORx{<n#G0
z0Db|`m(S<7g*@N)V~*o&a9#IX5!oUlp_3X$yPk}yLRG=cv(ZXbJpf?gu3fv3OeXgP
zL7)JR0%!ryLPUq!+uMIG6bidkb&)Y<6A?Yi%#|5$X?PFQYU;wFVG6<=G4mudf62^S
zy1TotA3l8e&C$`(7n!+I`-UdW>-qENSEtkImtEIgw`0eS7fPkla%TRf_6BNiQq9g3
zDC+I))ytPJBNB;dJRS%A`@ydQ*zGvZ7tv_6S}vF0QPthd91DWrmaTc-ym?^eKLPY6
z5{dUb&x<f~7l8c$n!-8|5ekAJ-_X$TvGINX2WBqM@cgWZY{+CXC#uzITd`O?#mwEl
z@5hOVW_C?u{@HCOCnv$oi<!B*SS+5ZR;z89Oy-1$Y+&ZIb&)`rdT0Im^{Wbn!U}6`
z%ouYGz(FF~qpCx>T<$eh-K(l=RW$)%stBh|990-&5Y7`-jj3v@sy;I|Hs%62O+-J|
znp;*xlFVF*Mx(#l$;rvGh{S^+=#NAqpBQ6K`@Ww7@IHV}B5JAoe$&RX<2X}bLgOM5
z%2*;=rK*pKNE?8Uj4=lR3^MZ$Ref4S9ILA1MD%I7T>fl)eEhfh^XIQ|UH4TY>b%81
zFfI2%5Ztm4&CqE9@P?|k_`cseHa7NMI-UL_5{YakqJp*7_BS*%9BXT9OXhO9t(8h;
zJ2PkMhs|B?12iK|osQ$IY-(ycv~c0VlOrP|Z@aF$oB-g+kt2^<Yxf#sHWE>ih$iQ-
zgv`2}sA^nQi$wHQG#cI8)zx*ws;a$u^=e{hXy_CX{p7l?sw&;56+oGph^Wxo+L}<+
Z^4})Zn_3jAq%Z&g002ovPDHLkV1i^HygvW{

literal 0
HcmV?d00001

diff --git a/res/drawable/ic_button_mark_unread.png b/res/drawable/ic_button_mark_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc1d9069e3e0a6ac067dfac9ede665ac454ea3c7
GIT binary patch
literal 1485
zcmV;;1v2`HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV+
z11c$^rp4X>00m7+L_t(o!|hjFh?P|o{?`8Yf6mOArsJ40HZ*8QriUaI@j)%|E$pE%
zx-mrIgBIySWM@b-NFPe6=x*R>U>A@sU`hxX6%$bs1chBt#<9knNtv0>Tsmjw{Qp{C
z5B_I39j1#Hn3pze*s#yP*0<KT*4p0@lEn0^B7iSs8UZMP;pqfG0C1S*^*;bNUEC*Y
z;x7Pd>yacbM~zn5AW2EiWdJ`;Ck1B#Z21cS5t)pdBt!%va;Z^6<b1c2l*Ha~02={(
z=4(H^Scm^&r{ef5fUf|&2jG*Dk&)OB4Gp2czaQt$okJ8wlUb-WQd<kPcOnAsJ-qh_
z!w^9b0081RM!8%@xm^A|ilS3PLqq5K`};FZO--%q)~)OH-QC^n>gtlyr%yvwAtD4I
z7ZY(11d|}D0Yp)RVzG!)sWg-1D)0S@OeV9atE=k;-`m?OCr+IBHICzKCX;DQoL?{q
zGlQ8SilV8qMelu6Hk)lCX%iC@eWg<AhGWN$E%jq#V`yz{Jro4N6^)IJH+t`LRUjs9
zTw>2lLe+$b95%Cq#bPlV$MFqbL=cAI)rCT#W6qp8OU&#E01IoJUT8)*1@KV-FNI<F
z^4QqewG9moTkGoTjyW>}$=jQon_oAxGtRlY0qn1|;N{o=eh`tnoO92p>K$Pi9t5xw
zfO?WNGa<QBRrip5**Vu?X5Wz93BX@qUDW=r(|f;NRp*f01>iO_%c^Pt0KBTg%t+Fi
z+4TT6tLin*xi?9kBKa(U+<yd7ecvY{+nsZV%jNPd0PY2_Ttw=UtQ$#qGZQm|s!~;j
z<UEoa;y9iOV6XT7K{MM#a&=8{%HMEqB67qzw=0h09+K-tq#Zz8r6W{TlEC3B?PF%5
zsx&hJFcZKA09TEVkG~KE!A=0DN!|sZX^K~^0_Han`GDjBGaGfzJpy2DLgQqHl7P<x
zs2nOFl0j54dJllMD2g5f@Vs-bAHe-2udT^|iO5d?_M6$;0A`BFYi71=DtfB?!Brj}
zRsFlYnB=1XuxZn#ZK|3#voFo;7c=WMvu-o{SXJ{;6zwCK0<g%;8dP<>#uh8*qz>S!
z(!mM^6^>N3q^j?z>biVBe|*P|9nEnZe?BrYvNDe26{>n`sZ_eYqoZTBs-{V<Rn^vf
zKEF>@SF7rQ#0C<ZlK7bfC7qp}?C$PHDwSe=ef{LK1)vYW)*uM>r_<?ju~>W@z=Hrv
z0FD6Y22cQS4S*#{U(W{c3xGYDOy=o{iHVe|wgY$yKud)RGm|)uhqBr1t3HaNk5qM~
znPrm42mp?V$mU!w_wC7(Cl{2<<sATS0x%=tvL#V83Lpefmuvu-3m`u_I=T$NmihDN
zztPjv^IbAiZmtwzh5BICs#Qyehldw>@9UBxdr?H5B-t}CFz^t`Z6t3ZnW=~hk|~n)
zBpXQ9k@U$OllwZ7Ig-l;2M0p{hehO5Gy8+&b!OJ6s^jT&`fFb*m5OFoAII_0R4TR0
zId?dUq9y>(0azm<bE`GozYL=4VdX_+DaqMp)&}4e=iG|`PN?cel1t1i@FWW&vaeVy
zzEvm`zMnB;#_})>9}tl>Q?$^38O2ib&0GKvlbjnxQRm>`;D@tj&H6c&O5G<S!`^#;
zG@H%tZEI_592gi_KR!ObK~?9~N~()dWi=XcO%Mc&TUuIPYi@3S_sp3yTf#70AONs?
z_wFmb_uHIvcZx`(h?Fit1N?(dWj)DJ5qUqIPH$^(Zy)g_eP3T+rl+Upkcf1JVOXu*
nFZ-VoRTU8#&gF6$lEps($y2XeG+7bp00000NkvXXu0mjfaFd=B

literal 0
HcmV?d00001

diff --git a/res/drawable/ic_button_unflag.png b/res/drawable/ic_button_unflag.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a55adf686b8f8200680bc74ed2043803ed66499
GIT binary patch
literal 1440
zcmV;R1z-A!P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV+
z0~;%f^`k%l00kgPL_t(Y$CXvxZxmG&Kj+T9b7yB}x7}`cOIf-uAEky!S~O)LYA_2=
z8Vd<eCW^iic`z|P_(b><c<|Magcp5leKMMwfTBecLBvF;rKR-4ZPV;@J6}69_xRB6
zW(ySYCX+eyanJ9Z^E>Bv0d`pD&!6A+eCpJx{ncvq?P|4pu3D|`@BDV*!iAmO0EcH-
zr%#{OZQDKy03Rkvf=VeiHa7Op#KgqLf9>57U}0gQZKu=e!AvGo6+(;v0EA)qMx)WV
z2LL|;0L;(N|9^mqiHWu?r95HV_OX0E4?+l7US57RilRF$fbsG19Rakbr8hD%g2ThZ
z*+QZ4fo<C-a=9Gnx(>eY+ffvG`F#H8fq?<%{{8#3lMhy@RCWZodGjXq^z@vQQjS=b
z1wshooRe+aU>L?r-QC^qPfkv%o%SC;ejISi#(X|+8HSOTQf3g*Gz>$QN~P!e`uaX9
z7K<<B^Lc5SCT($mD=RCou(0r;R;ztHGc)tI@B2*v@PZ&%4}zevy1MED0P(YD&+3lj
z3`S8j6vuIiF}4p8`whb=+qQk6tE;O!lgWUTl9W<NM4;<Bb#-;2=XoX9bwAm?d-t^G
zd9whpL_{-;u?L*<ztZXS-+1QCnRggt?+GDZF-<eHEK9R2i<zdWnWo7N!vM}XAR>0A
zPeha?2?Rj^uIt90=OwP|s;xT@!|+y;BwzDm$BrGT*Xx6fF+H75>zs4wyclCdL_oBi
zM??h9Iarp3Qc97@WJDatkR%B-8VyL2<asIOIv*Y$UR+#UTn>U@fQUc{(RN5gm?TLn
zasp^`Mnu%kh;vRt2tY)L;}~t*1}WuQZ*T8I?aGxaEA@K4;CWujahx;}VFy4P=#lp=
zyB&;D3Zf`N&-1`EO}AJqem^!g_9;iidqnib)YMdybN=q);$pw1X(*+nN6NnAA|eRG
z5aT$8LZJ{GIB;P6@ZrOs0l?MPB;Oet8u|(VKq>WBy<Q)PqKFA0=vka6NrF<!c-O97
zOMCb3{ia+lf7#vL{SzW8zC~C<M7JuHifS|(S=V)6Z#J6)nx?gyr?dXh$;lP~=(=9Z
zX0wx{qobb-A$~=~@WzcBz``(uFbn|^)#b~V|IjpTB8sBvR@ZdYoSwi7001OO0vj6}
z59j9QzCC&J<P;)?wOS2EM@P4d-Q3(9TUl9AaU82uDh0Z(KNAOW977NU+Q!C)s8lN2
zwQJYnc85tRw~3$c`voCH7b1dE3J{UDY*cDfb{J!Ti0!f|r65TXGYrEt5itOOLZPtv
zZ>M*q6jMqS7-JbkY)`B2`xu5{d%&8_CImr%aU5?B#AX1d=XtqCqk#Ybmo8m;{5<e|
z9~omADWxPLh@uFTQW(cE2q8k#G+oYl;y8}w`+iC(g_@?dxROB-^fJZ-0KmnI7as?R
zqKF}4Mk%GYqO>eamCNOzSS<e8)6;WZ2;r@+t{$DApC6f>oz1SVuj7_h8HQo>nWmWo
z0OyG(TDe>X0N}pw>#0-<_Uzf?7Yc>ndV70+$mMcV*=+WnVHnMHI(^MBjF)q{+-t7u
z4$sWYSoL~c^!4?z!NEa|h@ds3+W-z7IusMpUB_{LPo+}Xef##^K6vopWG<Jx4gmKN
zG1@A}bg5LDURztcTdUP7N~t4`<HWXY-x(SjTJKbVM<tj8z>7q50uf^X_znPWKTR@-
uC=UQ{5>WvWe*u82h!`y`EkS>OKl}?km9m&?K4MP*0000<MNUMnLSTYX&y=(P

literal 0
HcmV?d00001

diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index f91816f4a..083fc383a 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -15,34 +15,34 @@
         android:visibility="gone"
         android:background="#CCCCCC"
         >
-        <Button
+        <ImageButton
             android:id="@+id/batch_read_button"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="@string/message_list_mark_read_action"
+            android:src="@drawable/ic_button_mark_read"
         />
-        <Button
+        <ImageButton
             android:id="@+id/batch_delete_button"
             android:layout_width="0dip"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:text="@string/message_list_delete_action"
+            android:src="@drawable/ic_button_delete"
         />
-        <Button
+        <ImageButton
             android:id="@+id/batch_flag_button"
             android:layout_width="0dip"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:text="@string/message_list_flag_action"
+            android:src="@drawable/ic_button_flag"
         />
-        <Button
+        <ImageButton
             android:id="@+id/batch_done_button"
             android:layout_width="0dip"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:text="@string/done_action"
+            android:src="@drawable/ic_button_close_clear_cancel"
         />
     </LinearLayout>
     <ListView
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 13f18dfea..af863f95b 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -65,11 +65,11 @@
 		            android:layout_width="0dip"
 		            android:layout_weight="1" />
 		            
-		        <Button
+		        <ImageButton
 		            android:id="@+id/delete_scrolling"
-		            android:text="@string/delete_action"
-		            android:layout_height="wrap_content"
-		            android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_button_delete"
+                    android:layout_width="0dip"
 		            android:layout_weight="1" />
 		       <Button
 		            android:id="@+id/next_scrolling"
@@ -99,10 +99,11 @@
             android:layout_width="0dip"
             android:layout_weight="1" />
             
-        <Button
+        <ImageButton
             android:id="@+id/delete"
-            android:text="@string/delete_action"
             android:layout_height="wrap_content"
+            android:src="@drawable/ic_button_delete"
+            android:textSize="0dip"
             android:layout_width="0dip"
             android:layout_weight="1" />
        <Button
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 59dfaa39f..b3ba97dbc 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -118,10 +118,10 @@ public class MessageList
     private int mSelectedCount = 0;
 
     private View mBatchButtonArea;
-    private Button mBatchReadButton;
-    private Button mBatchDeleteButton;
-    private Button mBatchFlagButton;
-    private Button mBatchDoneButton;
+    private ImageButton mBatchReadButton;
+    private ImageButton mBatchDeleteButton;
+    private ImageButton mBatchFlagButton;
+    private ImageButton mBatchDoneButton;
 
     private FontSizes mFontSizes = K9.getFontSizes();
 
@@ -547,13 +547,13 @@ public class MessageList
 
 
         mBatchButtonArea = findViewById(R.id.batch_button_area);
-        mBatchReadButton = (Button) findViewById(R.id.batch_read_button);
+        mBatchReadButton = (ImageButton) findViewById(R.id.batch_read_button);
         mBatchReadButton.setOnClickListener(this);
-        mBatchDeleteButton = (Button) findViewById(R.id.batch_delete_button);
+        mBatchDeleteButton = (ImageButton) findViewById(R.id.batch_delete_button);
         mBatchDeleteButton.setOnClickListener(this);
-        mBatchFlagButton = (Button) findViewById(R.id.batch_flag_button);
+        mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button);
         mBatchFlagButton.setOnClickListener(this);
-        mBatchDoneButton = (Button) findViewById(R.id.batch_done_button);
+        mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button);
 
         mBatchDoneButton.setOnClickListener(this);
 
@@ -2553,13 +2553,13 @@ public class MessageList
             mSelectedCount = 0;
         }
 
-        int readButtonStringId;
-        int flagButtonStringId;
+        int readButtonIconId;
+        int flagButtonIconId;
 
         if (mSelectedCount==0)
         {
-            readButtonStringId = R.string.message_list_mark_read_action;
-            flagButtonStringId = R.string.message_list_flag_action;
+            readButtonIconId = R.drawable.ic_button_mark_read;
+            flagButtonIconId = R.drawable.ic_button_flag;
             hideBatchButtons();
         }
         else
@@ -2567,26 +2567,26 @@ public class MessageList
             boolean newReadState = computeBatchDirection(false);
             if (newReadState)
             {
-                readButtonStringId = R.string.message_list_mark_read_action;
+                readButtonIconId = R.drawable.ic_button_mark_read;
             }
             else
             {
-                readButtonStringId = R.string.message_list_mark_unread_action;
+                readButtonIconId = R.drawable.ic_button_mark_unread;
             }
             boolean newFlagState = computeBatchDirection(true);
             if (newFlagState)
             {
-                flagButtonStringId = R.string.message_list_flag_action;
+                flagButtonIconId = R.drawable.ic_button_flag;
             }
             else
             {
-                flagButtonStringId = R.string.message_list_unflag_action;
+                flagButtonIconId = R.drawable.ic_button_unflag;
             }
             showBatchButtons();
         }
 
-        mBatchReadButton.setText(readButtonStringId);
-        mBatchFlagButton.setText(flagButtonStringId);
+        mBatchReadButton.setImageResource(readButtonIconId);
+        mBatchFlagButton.setImageResource(flagButtonIconId);
     }
 
     class FooterViewHolder