From 207e2a1e569a11764327a35b3843ebc19c029168 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Tue, 26 Feb 2013 20:29:33 +0100
Subject: [PATCH] Notification icon update

Android 2.2: use old icon
Android 2.3: new icon, (try to) follow icon guidelines for 2.3
Android 3.0+: new icon, follow guidelines for 3.0+

See http://developer.android.com/guide/practices/ui_guidelines/icon_design_status_bar.html
---
 images/drawable-src/ic_notify_new_mail.svg    |  69 ++++++++++++++
 .../ic_notify_new_mail__legacy.svg            |  84 ++++++++++++++++++
 res/drawable-hdpi-v11/ic_notify_new_mail.png  | Bin 0 -> 474 bytes
 res/drawable-hdpi-v9/ic_notify_new_mail.png   | Bin 0 -> 581 bytes
 ...ail_generic.png => ic_notify_new_mail.png} | Bin
 res/drawable-ldpi-v11/ic_notify_new_mail.png  | Bin 0 -> 335 bytes
 res/drawable-ldpi-v9/ic_notify_new_mail.png   | Bin 0 -> 305 bytes
 res/drawable-mdpi-v11/ic_notify_new_mail.png  | Bin 0 -> 354 bytes
 res/drawable-mdpi-v9/ic_notify_new_mail.png   | Bin 0 -> 358 bytes
 ...ail_generic.png => ic_notify_new_mail.png} | Bin
 res/drawable-xhdpi-v11/ic_notify_new_mail.png | Bin 0 -> 582 bytes
 res/drawable-xhdpi-v9/ic_notify_new_mail.png  | Bin 0 -> 619 bytes
 .../k9/controller/MessagingController.java    |   6 +-
 13 files changed, 156 insertions(+), 3 deletions(-)
 create mode 100644 images/drawable-src/ic_notify_new_mail.svg
 create mode 100644 images/drawable-src/ic_notify_new_mail__legacy.svg
 create mode 100644 res/drawable-hdpi-v11/ic_notify_new_mail.png
 create mode 100644 res/drawable-hdpi-v9/ic_notify_new_mail.png
 rename res/drawable-hdpi/{stat_notify_email_generic.png => ic_notify_new_mail.png} (100%)
 create mode 100644 res/drawable-ldpi-v11/ic_notify_new_mail.png
 create mode 100644 res/drawable-ldpi-v9/ic_notify_new_mail.png
 create mode 100644 res/drawable-mdpi-v11/ic_notify_new_mail.png
 create mode 100644 res/drawable-mdpi-v9/ic_notify_new_mail.png
 rename res/drawable-mdpi/{stat_notify_email_generic.png => ic_notify_new_mail.png} (100%)
 create mode 100644 res/drawable-xhdpi-v11/ic_notify_new_mail.png
 create mode 100644 res/drawable-xhdpi-v9/ic_notify_new_mail.png

diff --git a/images/drawable-src/ic_notify_new_mail.svg b/images/drawable-src/ic_notify_new_mail.svg
new file mode 100644
index 000000000..577574a75
--- /dev/null
+++ b/images/drawable-src/ic_notify_new_mail.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="ic_notify_new_mail.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.065577"
+     inkscape:cy="10.235229"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     inkscape:window-x="1592"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <g
+       id="g3796">
+      <path
+         d="m 0.99999987,1037.0174 0,11.5081 22.00000013,0 0,-11.5081 -11.000333,5.4691 -10.99966713,-5.4691 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path1198"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 0.99999987,1032.199 0,3.0621 10.99966713,5.4674 L 23,1035.2611 l 0,-3.0621 -22.00000013,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path1202"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/images/drawable-src/ic_notify_new_mail__legacy.svg b/images/drawable-src/ic_notify_new_mail__legacy.svg
new file mode 100644
index 000000000..0962ffdb2
--- /dev/null
+++ b/images/drawable-src/ic_notify_new_mail__legacy.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="ic_notify_new_mail__legacy.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#828282;stop-opacity:1;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#919191;stop-opacity:1;"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3809"
+       x1="11.985409"
+       y1="21.207491"
+       x2="11.985409"
+       y2="4.8303633"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72727273,0,0,0.72727273,-0.72727273,1030.4076)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.065577"
+     inkscape:cy="10.235229"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     inkscape:window-x="1592"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:url(#linearGradient3809);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 0,1033.9303 0,2.2273 8,3.9773 8,-3.9773 0,-2.2273 -16,0 z m 0,3.5 0,8.3638 16,0 0,-8.3638 -8,3.9773 -8,-3.9773 z"
+       id="path1198"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/res/drawable-hdpi-v11/ic_notify_new_mail.png b/res/drawable-hdpi-v11/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..138569d3397813b7d38b216a928f888bdbac7902
GIT binary patch
literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ar;xK~z|U?bthR!axwl@z01RJ+G1@<((s>4dMcn2?^mqIRsBp
zMjQfY|0yyftyX{`PU0>6Nh83_?))TMSSACMQfg%b;#8o#BnPV7YuBpGtR<}l2pCX)
z20(hJtODi5K_8M<B|27SkYCgSYQO`q{KpG<X)|l?2ti&Ma1Sj05VEitSv=q0^nquf
z5y9?&`7c7|wr2=w*zA4?^53Bi@B%a=*lj`B-1Z0|O`El`p20qlX9EoPz;1xq8IYN+
zi6O%P;yDWPY=Kvx6~V57=@H1(dO}Fc_Szm;a}p?oy#ehAb_Gm=zKI<RA#GcG2=XIP
z2pjEzU0TJE(Fu@3AkPkX2RZ@3t7G5o&fK%m&GkZ3PtvEPv80aG*pBtA=j_z;TXJDf
zk{*N4g;EscDGc!>d$&&}6(}ziC@;x@GQR))=qiy1MF%C5<W5-y%1d&fFPAevc+?1B
Q-T(jq07*qoM6N<$f+`Qb?f?J)

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi-v9/ic_notify_new_mail.png b/res/drawable-hdpi-v9/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..279e527c2c594f1366c44c3163515871e32d78fe
GIT binary patch
literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq000;O001Tk1^@s6-UnMH00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10m4Z{K~zYI?Upf%6HySy|Fd`Ny6gsQPxLCQoS(-gr-j&^o`m<B
z2oi#z3A-V8TG*)MipyQ$CrD$HHm#L8?ueftfz3wP`P(cCq9%uKq3pnG9y9;nFmGmf
zLJ~!qQ>c0gC;|TlV6)%vUo8|co6Q!50*YQ0g##RtM<g?n_{%3Fc_bv!>-BDtd<vij
zVB-&y&Hx;X$g_IA{%NC9sXU&~=N}r4#{1D|bRr_x0NlpqTR0;*P}Muu+PA~uFd2`>
zdk%nuFbvP)INnc^WNM7LCn8k<#{hH<Va+qHT5InnNivP&cs~roGXMupUau_xhd~fb
z;y8Zjy6%NBW;e^SD#-y!{Yj0L<RHtksxfBQb=`|7iXH_)FadB#a*HIKAA+uve3ho@
zB#NRv-}le0wKWmhQPtC2R8{p<M0TvTHQ)EoqbS--({uvhWv=l}Q#zf_@A~vJfESC!
z;!U&J{L<}qs{mk(`Pgc;uK2$H06+u4jb8~!yWL(n2qH37)#uCQ@*Mzpo_F7IoF^o2
zu8Li2&~l;Ip6504t8LYF-XGXp%j>&sU()|S*hM8^H9%GUA^}o<eoH_JC?4<?v6)NL
T*p%jj00000NkvXXu0mjf?bQ9n

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/stat_notify_email_generic.png b/res/drawable-hdpi/ic_notify_new_mail.png
similarity index 100%
rename from res/drawable-hdpi/stat_notify_email_generic.png
rename to res/drawable-hdpi/ic_notify_new_mail.png
diff --git a/res/drawable-ldpi-v11/ic_notify_new_mail.png b/res/drawable-ldpi-v11/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0ef756e69d750224eea3c84ff9da75e171c1e49
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
zxDr8_@y{7ARiL0`iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0v#JY5_^
zEPBsQIo-+RDB|kxt<U2SEv_fZdoXo&ONZo1g9I+6JfA}XK8G2i?r0o8n=SCCr)TR2
zC&!Pk?lB*&4xQ=6WjZOKK_-LgF27~Fj0E#;e#glv;n@t;37m8OO|*9{>%SHJJInoV
zX#c;p$raWU-!7c?Dl&E@^VWd+E3X(AbZu7Jv--p|(-qeuV^=$GU8|=Qb9A3<`s)wZ
zb}?VwwL-dd$+o24MP-!_^goOH&R{l9klw1P&-O#|g_uS4@><X5FLpc3ob}{lTHWpX
a64u--iH=Ec`J93NV(@hJb6Mw<&;$T_8-8v8

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi-v9/ic_notify_new_mail.png b/res/drawable-ldpi-v9/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ddc6031e159cab3532a64b3ab6a47345d351839
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eW!3HFke0{SLNU;<<d4_NRK@CSr2awNM;1OBO
zz`&IV!i;~;c&P#fB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSTIcEF
z7@{%p>7;|4Oo2Qu@rM>oOJIy@Rk)VG`N&nEm6iME;v3CJb40sTYbJeMBwl!QFDKub
zT&GWmW~lr+QN6UjctO^zW#Xk%XNo8MN&WZe-M$lNqArCB$?i)_d;5-Cf9aM<%MREm
z@y)C}?IX9(^$6n(?^#oVZh2i|xZ!f-)EU1?X_KZgq?MU%j&<2`;KRued-6GQ8chpW
yCR|}!9R4DFgW!hue}eAo?Y;dW@LPZGUS_$gW%kKBQ_X=cXYh3Ob6Mw<&;$VQ40q80

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi-v11/ic_notify_new_mail.png b/res/drawable-mdpi-v11/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..75e144e3f10b931b2c8ca8ddfcc6009e34241727
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQs&Wx;Tb-
zbl#m3$#uv<z{UEJ<(=sqI}7d{;9dVDv?qC<y{VOk6m#DKR%idTRj+GHCb4Xok>%q1
zpKZa)S#GE7Rc1M^aa4()?I@|Zn}>1c%(wO|T2rUaoGF>$;BCrUc3|c&tJUVb#<mYQ
zo;XCGPflRoVcsOWA+%ppIsBREgHVRx1&comZm44_+9iGRc3{3>g&c!o246|3Jxdr@
z=`H@!>#S+z2d6Tu7v8{7^@(?jPdazyyp=)%P179Wvm*s-Sg-t@G&k$>($~wL#4Zkx
s{V)G#UA_E+cC${_59>2c{{G|9vt?F(u}<8sALvyEPgg&ebxsLQ0OVqTcK`qY

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi-v9/ic_notify_new_mail.png b/res/drawable-mdpi-v9/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..e037bf6600145d265a51317225da821659243e27
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRu!3HEP{;XRGq*#ibJVQ8upoSx*1IXtr@Q5r1
zs=p4xj7}P}D?mC*Tq8<?^V3So6N^$A%FE03GV`*FlM@S4_413-XTP(N0xEj!>Eak-
z(ff9aVHR^Bk4yT$yqVsA9?v-XLyPkXlb$$_<~Gw~J52JN{T|-_^C?@+mus^{;^g~F
zHY8Y`br$N$kk*|#>kdBy!-DzCUhd>nc)6A{VK+m?uf_Y9bex#v=IJUVw#q|FSxJ4;
z?+%OG=NQ~>A2r(-`193C!9um2{*%m9)^FqAdX2jwr<zY|n>)kKYgHR-6)LB0d6~ay
zgWAr%j_>PUZ(}Ii7SGu5gwLU`L;2)GGyA<uekQg>y=Hjed`XNU$V;6;n_))#`u~c(
y+LOwCy&1b--Q(KNY~r8rdnxOI<KDm78~j&So|92uSknpgE`z75pUXO@geCy*w~Ctp

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/stat_notify_email_generic.png b/res/drawable-mdpi/ic_notify_new_mail.png
similarity index 100%
rename from res/drawable-mdpi/stat_notify_email_generic.png
rename to res/drawable-mdpi/ic_notify_new_mail.png
diff --git a/res/drawable-xhdpi-v11/ic_notify_new_mail.png b/res/drawable-xhdpi-v11/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..b468d662473135613a26d97467f58113eb3d8e18
GIT binary patch
literal 582
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?hdo^!
zLoyoQ&b;e&*g?Qe{Za4N<+rr%{dW1K5+$;At&);bm%_fz{HOkF-ELnx{n#~K^@y)W
z?xoyQavZs{?#_IFU|NbNgU8Is0@;M1Jq_7F<fXqs;^)5CI!FIk2nlj3eQ(@!SAc1v
zWrS1Q0n=htgOX`UHFcZaSj$|VIHpCXXe{or-oKyWW3u!PcD6Ho%x*Kcbw1t7IU|{S
z2kS3BCh1=X=B90Y)-z9r!F!tH>;t?PW+#1^_wCM>Cy|%d)Uz<mYh){%XjQ;lBQEhL
zy84Q6levkqCsUjF1A!G0Tvr>kA7~$c5FfQU?Pd5y9sP}#E1BBDA8<r$6S>Er*I3Z>
zVBxhJ8?MA(ySJXR*qBq|Uc+OSiCP7WHGP7Af}e*7H_2z8H#sI`P|_fraP(3IuLbii
z&Ck27(#{&yyJnXgrTv`V@K82Gtz!+7uB@=^{Y%-~9-O`L;}Gj6HtVa(t6yAU<%wO;
zTbp@fTGZ?>OQ*HQu=2<su>5A99=g8v$rbO0L))e-v@5ZF^>bf`iA##@ak)m1kJXO?
z>_7A5&FFHN_`~<F&jZ$&$1o&ZdvN1(oue!+^IN?<UrwJOUeGIE;QNxbj)7reh`0P%
SsY$>%XYh3Ob6Mw<&;$TD1o5H(

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi-v9/ic_notify_new_mail.png b/res/drawable-xhdpi-v9/ic_notify_new_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7f71b95ba75ee6cc6a9a4e5940f3bf07796f983
GIT binary patch
literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq001BW001%w1^@s6J!IKr00004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10q99YK~z|U?bgkz(?A%2;rE;7KHT^ZMMUu$L_`tcwCYtfA%Q|$
zu`RSs(iVCJZq%c25Jkjm5Jf~e{x0+uvTo;dlayH;vDTlQMP@lk^FAcaOhi>FbC^==
z6`%rCfC^9n4g<hjEEeBN1*qzgG6Cg3g0jB{JXPHXPM6f*H(8d|frhHS|6kR-)yT4}
zF3uy6>2!KsM0!B|AGP19YCi~qJwO2@P1C!^m|?5c`szTg0X^W%Ukbkk`auvpF2eKq
z{HV3IBWao{uu|1~syYnA@QVYvnnTWR8Ge(8pA_LFNsfs~M?`J`HA#}heGOK?ePhhf
z_x;bs<ZL#(Vy*1~=Qa$#HpcXQ-+$^{<G8i91Kb2^#k|CEe9(Ki0v^<AwSfyslH@XQ
z8#w=y@GIa>7>3W>@M^W{0yo_7uK+G&S5*g56n%0amvYF3eClN$eqNjt$MFdf=>pAz
z!fU`}GTCG$vLdp(TrLOgcKf3Pxd;%3;frE!G#Z`sJg=*&O*U9*HwCOAz(ZgVMbQWM
zKpe-XfG*J3B)kTU$K!3*VhcR7)(!xSF<oHicf!Tkb}ukMQ$%(ERCVi3&D-{e4&;x<
zq1X*e1ymm-)gACu^?R8BDf<qT{vW6S6`%rCfC^AL;0FqM&Q7iNyQ}~J002ovPDHLk
FV1f-{3h4j<

literal 0
HcmV?d00001

diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 16301720e..88ae84191 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -2642,7 +2642,7 @@ public class MessagingController implements Runnable {
                 R.string.notification_certificate_error_title, account.getName());
 
         final NotificationCompat.Builder builder = new NotificationBuilder(context);
-        builder.setSmallIcon(R.drawable.stat_notify_email_generic);
+        builder.setSmallIcon(R.drawable.ic_notify_new_mail);
         builder.setWhen(System.currentTimeMillis());
         builder.setAutoCancel(true);
         builder.setTicker(title);
@@ -3384,7 +3384,7 @@ public class MessagingController implements Runnable {
                 (NotificationManager) mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
 
         NotificationCompat.Builder builder = new NotificationBuilder(mApplication);
-        builder.setSmallIcon(R.drawable.stat_notify_email_generic);
+        builder.setSmallIcon(R.drawable.ic_notify_new_mail);
         builder.setWhen(System.currentTimeMillis());
         builder.setAutoCancel(true);
         builder.setTicker(mApplication.getString(R.string.send_failure_subject));
@@ -4804,7 +4804,7 @@ public class MessagingController implements Runnable {
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
         NotificationCompat.Builder builder = new NotificationBuilder(context);
-        builder.setSmallIcon(R.drawable.stat_notify_email_generic);
+        builder.setSmallIcon(R.drawable.ic_notify_new_mail);
         builder.setWhen(System.currentTimeMillis());
         if (!updateSilently) {
             builder.setTicker(summary);