diff --git a/res/drawable-hdpi/ic_call_log_list_incoming_call.png b/res/drawable-hdpi/ic_call_log_list_incoming_call.png
deleted file mode 100755
index 15b5e44..0000000
--- a/res/drawable-hdpi/ic_call_log_list_incoming_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_log_list_missed_call.png b/res/drawable-hdpi/ic_call_log_list_missed_call.png
deleted file mode 100755
index 8dcb279..0000000
--- a/res/drawable-hdpi/ic_call_log_list_missed_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_log_list_outgoing_call.png b/res/drawable-hdpi/ic_call_log_list_outgoing_call.png
deleted file mode 100755
index 160c707..0000000
--- a/res/drawable-hdpi/ic_call_log_list_outgoing_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_call_log_list_voicemail.png b/res/drawable-hdpi/ic_call_log_list_voicemail.png
deleted file mode 100644
index 0c2a6f4..0000000
--- a/res/drawable-hdpi/ic_call_log_list_voicemail.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_log_list_incoming_call.png b/res/drawable-mdpi/ic_call_log_list_incoming_call.png
deleted file mode 100644
index c7eec52..0000000
--- a/res/drawable-mdpi/ic_call_log_list_incoming_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_log_list_missed_call.png b/res/drawable-mdpi/ic_call_log_list_missed_call.png
deleted file mode 100644
index 1907a62..0000000
--- a/res/drawable-mdpi/ic_call_log_list_missed_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_log_list_outgoing_call.png b/res/drawable-mdpi/ic_call_log_list_outgoing_call.png
deleted file mode 100644
index 041d086..0000000
--- a/res/drawable-mdpi/ic_call_log_list_outgoing_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_call_log_list_voicemail.png b/res/drawable-mdpi/ic_call_log_list_voicemail.png
deleted file mode 100644
index 6aec9ed..0000000
--- a/res/drawable-mdpi/ic_call_log_list_voicemail.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_log_list_incoming_call.png b/res/drawable-xhdpi/ic_call_log_list_incoming_call.png
deleted file mode 100644
index 31be214..0000000
--- a/res/drawable-xhdpi/ic_call_log_list_incoming_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_log_list_missed_call.png b/res/drawable-xhdpi/ic_call_log_list_missed_call.png
deleted file mode 100644
index b00e68a..0000000
--- a/res/drawable-xhdpi/ic_call_log_list_missed_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call_log_list_outgoing_call.png b/res/drawable-xhdpi/ic_call_log_list_outgoing_call.png
deleted file mode 100644
index 6a19a96..0000000
--- a/res/drawable-xhdpi/ic_call_log_list_outgoing_call.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/call_log_phone_call_details.xml b/res/layout/call_log_phone_call_details.xml
index f22efba..3f46c8d 100644
--- a/res/layout/call_log_phone_call_details.xml
+++ b/res/layout/call_log_phone_call_details.xml
@@ -26,6 +26,7 @@
             android:id="@+id/call_type_icons"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="bottom"
         />
         <TextView
             android:id="@+id/call_type_name"
@@ -43,18 +44,18 @@
             android:textColor="?attr/call_log_primary_text_color"
             android:text="@string/call_log_type_date_separator"
         />
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?attr/call_log_primary_text_color"
+            android:layout_toRightOf="@id/call_type"
+            android:layout_marginLeft="?attr/call_log_date_margin"
+            android:layout_alignParentBottom="true"
+        />
     </LinearLayout>
     <TextView
-        android:id="@+id/date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?attr/call_log_primary_text_color"
-        android:layout_toRightOf="@id/call_type"
-        android:layout_marginLeft="?attr/call_log_date_margin"
-        android:layout_alignParentBottom="true"
-    />
-    <TextView
         android:id="@+id/number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
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(
diff --git a/tests/src/com/android/contacts/activities/CallLogActivityTests.java b/tests/src/com/android/contacts/activities/CallLogActivityTests.java
index 67e6196..4004227 100644
--- a/tests/src/com/android/contacts/activities/CallLogActivityTests.java
+++ b/tests/src/com/android/contacts/activities/CallLogActivityTests.java
@@ -320,9 +320,9 @@
     private void buildIconMap() {
         mCallTypeIcons = new HashMap<Integer, Bitmap>(3);
 
-        mCallTypeIcons.put(Calls.INCOMING_TYPE, getBitmap("ic_call_log_list_incoming_call"));
-        mCallTypeIcons.put(Calls.MISSED_TYPE, getBitmap("ic_call_log_list_missed_call"));
-        mCallTypeIcons.put(Calls.OUTGOING_TYPE, getBitmap("ic_call_log_list_outgoing_call"));
+        mCallTypeIcons.put(Calls.INCOMING_TYPE, getBitmap("ic_call_incoming_holo_dark"));
+        mCallTypeIcons.put(Calls.MISSED_TYPE, getBitmap("ic_call_missed_holo_dark"));
+        mCallTypeIcons.put(Calls.OUTGOING_TYPE, getBitmap("ic_call_outgoing_holo_dark"));
     }
 
     //
diff --git a/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java
index a9f4e79..b311454 100644
--- a/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java
+++ b/tests/src/com/android/contacts/calllog/CallLogListItemHelperTest.java
@@ -19,6 +19,7 @@
 import com.android.contacts.PhoneCallDetails;
 import com.android.contacts.PhoneCallDetailsHelper;
 import com.android.contacts.PhoneCallDetailsViews;
+import com.android.contacts.R;
 import com.android.internal.telephony.CallerInfo;
 
 import android.content.Context;
@@ -73,8 +74,10 @@
         Context context = getContext();
         Resources resources = context.getResources();
         CallTypeHelper callTypeHelper = new CallTypeHelper(resources,
-                TEST_INCOMING_DRAWABLE, TEST_OUTGOING_DRAWABLE, TEST_MISSED_DRAWABLE,
-                TEST_VOICEMAIL_DRAWABLE);
+                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));
         PhoneNumberHelper phoneNumberHelper =
                 new PhoneNumberHelper(resources, TEST_VOICEMAIL_NUMBER);
         PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper(context,
