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 000000000..138569d33
Binary files /dev/null and b/res/drawable-hdpi-v11/ic_notify_new_mail.png differ
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 000000000..279e527c2
Binary files /dev/null and b/res/drawable-hdpi-v9/ic_notify_new_mail.png differ
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 000000000..d0ef756e6
Binary files /dev/null and b/res/drawable-ldpi-v11/ic_notify_new_mail.png differ
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 000000000..1ddc6031e
Binary files /dev/null and b/res/drawable-ldpi-v9/ic_notify_new_mail.png differ
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 000000000..75e144e3f
Binary files /dev/null and b/res/drawable-mdpi-v11/ic_notify_new_mail.png differ
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 000000000..e037bf660
Binary files /dev/null and b/res/drawable-mdpi-v9/ic_notify_new_mail.png differ
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 000000000..b468d6624
Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_notify_new_mail.png differ
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 000000000..f7f71b95b
Binary files /dev/null and b/res/drawable-xhdpi-v9/ic_notify_new_mail.png differ
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);