diff --git a/res/xml/authenticator_alternate.xml b/res/xml/authenticator_alternate.xml
index 1403535c8..00e0c762c 100644
--- a/res/xml/authenticator_alternate.xml
+++ b/res/xml/authenticator_alternate.xml
@@ -25,7 +25,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_exchange"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email"
+    android:smallIcon="@drawable/ic_notification_mail_16dp"
     android:label="@string/exchange_name_alternate"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_eas.xml b/res/xml/authenticator_eas.xml
index eed4c1019..daa6b32e7 100644
--- a/res/xml/authenticator_eas.xml
+++ b/res/xml/authenticator_eas.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_exchange"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email"
+    android:smallIcon="@drawable/ic_notification_mail_16dp"
     android:label="@string/exchange_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_imap.xml b/res/xml/authenticator_imap.xml
index 75445645c..c365124fa 100644
--- a/res/xml/authenticator_imap.xml
+++ b/res/xml/authenticator_imap.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_imap"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email"
+    android:smallIcon="@drawable/ic_notification_mail_16dp"
     android:label="@string/imap_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_eas.xml b/res/xml/authenticator_legacy_eas.xml
index 041ad2011..b7127bd99 100644
--- a/res/xml/authenticator_legacy_eas.xml
+++ b/res/xml/authenticator_legacy_eas.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="com.android.exchange"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email"
+    android:smallIcon="@drawable/ic_notification_mail_16dp"
     android:label="@string/exchange_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_email.xml b/res/xml/authenticator_legacy_email.xml
index 532cc058b..aaf91ae94 100644
--- a/res/xml/authenticator_legacy_email.xml
+++ b/res/xml/authenticator_legacy_email.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="com.android.email"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email"
+    android:smallIcon="@drawable/ic_notification_mail_16dp"
     android:label="@string/exchange_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_imap.xml b/res/xml/authenticator_legacy_imap.xml
index 43e0e5d17..17f560466 100644
--- a/res/xml/authenticator_legacy_imap.xml
+++ b/res/xml/authenticator_legacy_imap.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_legacy_imap"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email"
+    android:smallIcon="@drawable/ic_notification_mail_16dp"
     android:label="@string/imap_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_pop3.xml b/res/xml/authenticator_pop3.xml
index 6bced4fce..dd08ead1b 100644
--- a/res/xml/authenticator_pop3.xml
+++ b/res/xml/authenticator_pop3.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_pop3"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email"
+    android:smallIcon="@drawable/ic_notification_mail_16dp"
     android:label="@string/pop3_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index d288b3984..fa4b30983 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -146,7 +146,7 @@ public class NotificationController {
                 .setContentIntent(pending)
                 .setLargeIcon(largeIcon)
                 .setNumber(number == null ? 0 : number)
-                .setSmallIcon(R.drawable.stat_notify_email)
+                .setSmallIcon(R.drawable.ic_notification_mail_16dp)
                 .setWhen(mClock.getTime())
                 .setTicker(ticker)
                 .setOngoing(ongoing);