diff --git a/src/com/android/contacts/CallDetailActivity.java b/src/com/android/contacts/CallDetailActivity.java
index 9e8d471..5f55f80 100644
--- a/src/com/android/contacts/CallDetailActivity.java
+++ b/src/com/android/contacts/CallDetailActivity.java
@@ -124,10 +124,10 @@
 
         mPhoneCallDetailsViews = PhoneCallDetailsViews.fromView(getWindow().getDecorView());
         mCallTypeHelper = new CallTypeHelper(getResources(),
-                getResources().getDrawable(R.drawable.ic_call_log_list_incoming_call),
-                getResources().getDrawable(R.drawable.ic_call_log_list_outgoing_call),
-                getResources().getDrawable(R.drawable.ic_call_log_list_missed_call),
-                getResources().getDrawable(R.drawable.ic_call_log_list_voicemail));
+                getResources().getDrawable(R.drawable.ic_call_incoming_holo_dark),
+                getResources().getDrawable(R.drawable.ic_call_outgoing_holo_dark),
+                getResources().getDrawable(R.drawable.ic_call_missed_holo_dark),
+                getResources().getDrawable(R.drawable.ic_call_voicemail_holo_dark));
         mPhoneNumberHelper = new PhoneNumberHelper(mResources, getVoicemailNumber());
         mPhoneCallDetailsHelper = new PhoneCallDetailsHelper(this, mResources, mCallTypeHelper,
                 mPhoneNumberHelper);
diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index 0c87ebb..90e405a 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -251,22 +251,17 @@
             mPreDrawListener = null;
 
             Resources resources = getResources();
-            Drawable incomingDrawable = resources.getDrawable(
-                    R.drawable.ic_call_log_list_incoming_call);
-            Drawable outgoingDrawable = resources.getDrawable(
-                    R.drawable.ic_call_log_list_outgoing_call);
-            Drawable missedDrawable = resources.getDrawable(
-                    R.drawable.ic_call_log_list_missed_call);
-            Drawable voicemailDrawable = resources.getDrawable(
-                    R.drawable.ic_call_log_list_voicemail);
+            CallTypeHelper callTypeHelper = new CallTypeHelper(resources,
+                    resources.getDrawable(R.drawable.ic_call_incoming_holo_dark),
+                    resources.getDrawable(R.drawable.ic_call_outgoing_holo_dark),
+                    resources.getDrawable(R.drawable.ic_call_missed_holo_dark),
+                    resources.getDrawable(R.drawable.ic_call_voicemail_holo_dark));
             Drawable callDrawable = resources.getDrawable(
                     R.drawable.ic_call_log_list_action_call);
             Drawable playDrawable = resources.getDrawable(
                     R.drawable.ic_call_log_list_action_play);
 
             mContactPhotoManager = ContactPhotoManager.getInstance(getActivity());
-            CallTypeHelper callTypeHelper = new CallTypeHelper(resources, incomingDrawable,
-                    outgoingDrawable, missedDrawable, voicemailDrawable);
             PhoneNumberHelper phoneNumberHelper =
                     new PhoneNumberHelper(getResources(), mVoiceMailNumber);
             PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper(
