diff --git a/res/xml/authenticator_alternate.xml b/res/xml/authenticator_alternate.xml
index fd29bb63b..4019c34ac 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/ic_notification_mail_wht_24dp"
+    android:smallIcon="@drawable/ic_notification_mail_24dp"
     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 8970d510d..d1f3a952d 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/ic_notification_mail_wht_24dp"
+    android:smallIcon="@drawable/ic_notification_mail_24dp"
     android:label="@string/exchange_eas_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_imap.xml b/res/xml/authenticator_imap.xml
index 487b3a20d..41ade5050 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/ic_notification_mail_wht_24dp"
+    android:smallIcon="@drawable/ic_notification_mail_24dp"
     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 c4bdd14fb..424cf90be 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/ic_notification_mail_wht_24dp"
+    android:smallIcon="@drawable/ic_notification_mail_24dp"
     android:label="@string/exchange_eas_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_email.xml b/res/xml/authenticator_legacy_email.xml
index 0b0d1f222..5f1b2122f 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/ic_notification_mail_wht_24dp"
+    android:smallIcon="@drawable/ic_notification_mail_24dp"
     android:label="@string/exchange_eas_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_imap.xml b/res/xml/authenticator_legacy_imap.xml
index 838d0e404..3dc362562 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/ic_notification_mail_wht_24dp"
+    android:smallIcon="@drawable/ic_notification_mail_24dp"
     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 589e80a92..f0cfc77e9 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/ic_notification_mail_wht_24dp"
+    android:smallIcon="@drawable/ic_notification_mail_24dp"
     android:label="@string/pop3_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/src/com/android/email/EmailNotificationController.java b/src/com/android/email/EmailNotificationController.java
index 893101234..e57b41833 100644
--- a/src/com/android/email/EmailNotificationController.java
+++ b/src/com/android/email/EmailNotificationController.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
@@ -143,7 +144,7 @@ public class EmailNotificationController implements NotificationController {
                 .setContentText(contentText)
                 .setContentIntent(pending)
                 .setNumber(number == null ? 0 : number)
-                .setSmallIcon(R.drawable.ic_notification_mail_wht_24dp)
+                .setSmallIcon(R.drawable.ic_notification_mail_24dp)
                 .setWhen(mClock.getTime())
                 .setTicker(ticker)
                 .setOngoing(ongoing);