diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
new file mode 100755
index 000000000..7c34f5c94
Binary files /dev/null and b/res/drawable-hdpi/ic_contact_picture.png differ
diff --git a/res/drawable-mdpi/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png
new file mode 100644
index 000000000..3a338e8e2
Binary files /dev/null and b/res/drawable-mdpi/ic_contact_picture.png differ
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 6d524b238..64241cd7d 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -57,7 +57,7 @@ public class NotificationController {
     private final Context mContext;
     private final NotificationManager mNotificationManager;
     private final AudioManager mAudioManager;
-    private final Bitmap mAppIcon;
+    private final Bitmap mGenericSenderIcon;
     private final Clock mClock;
 
     /** Constructor */
@@ -66,7 +66,8 @@ public class NotificationController {
         mNotificationManager = (NotificationManager) context.getSystemService(
                 Context.NOTIFICATION_SERVICE);
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        mAppIcon = BitmapFactory.decodeResource(mContext.getResources(), R.mipmap.icon);
+        mGenericSenderIcon = BitmapFactory.decodeResource(mContext.getResources(),
+                R.drawable.ic_contact_picture);
         mClock = clock;
     }
 
@@ -221,7 +222,7 @@ public class NotificationController {
         Notification.Builder builder = new Notification.Builder(mContext)
                 .setSmallIcon(R.drawable.stat_notify_email_generic)
                 .setWhen(mClock.getTime())
-                .setLargeIcon(senderPhoto != null ? senderPhoto : mAppIcon)
+                .setLargeIcon(senderPhoto != null ? senderPhoto : mGenericSenderIcon)
                 .setContentTitle(getNotificationTitle(senderName, account.mDisplayName))
                 .setContentText(subject)
                 .setContentIntent(contentIntent);
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 55ecac316..21ec9fa30 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -544,11 +544,8 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         showDefaultQuickContactBadgeImage();
     }
 
-    private static final Drawable sEmptyBadgeDrawable = new ColorDrawable(0xFF808080);
-
     private void showDefaultQuickContactBadgeImage() {
-        // STOPSHIP Show the default 'Andy' icon.
-        mFromBadge.setImageDrawable(sEmptyBadgeDrawable);
+        mFromBadge.setImageResource(R.drawable.ic_contact_picture);
     }
 
     protected final void addTabFlags(int tabFlags) {