diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 39df173..6650892 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -341,7 +341,8 @@
                     .setContentTitle(notificationTitle)
                     .setContentText(notificationText)
                     .setContentIntent(pendingIntent)
-                    .setSound(ringtoneUri);
+                    .setSound(ringtoneUri)
+                    .setColor(mContext.getResources().getColor(R.color.dialer_theme_color));
             Notification notification = builder.getNotification();
 
             CallFeaturesSetting.migrateVoicemailVibrationSettingsIfNeeded(prefs);
@@ -428,6 +429,7 @@
         final Notification.Builder builder = new Notification.Builder(mContext);
         builder.setSmallIcon(android.R.drawable.stat_sys_warning);
         builder.setContentTitle(mContext.getText(R.string.roaming));
+        builder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color));
         builder.setContentText(contentText);
         builder.setContentIntent(PendingIntent.getActivity(mContext, 0, intent, 0));
 
