diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
new file mode 100644
index 0000000000..2eef7b53ce
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 0000000000..6c7cb61d60
Binary files /dev/null and b/res/drawable-mdpi/ic_contact_picture.png differ
diff --git a/res/drawable-xhdpi/ic_contact_picture.png b/res/drawable-xhdpi/ic_contact_picture.png
new file mode 100644
index 0000000000..1a2bfde385
Binary files /dev/null and b/res/drawable-xhdpi/ic_contact_picture.png differ
diff --git a/res/drawable/ic_contact_picture.png b/res/drawable/ic_contact_picture.png
deleted file mode 100644
index 1ea44c675e..0000000000
Binary files a/res/drawable/ic_contact_picture.png and /dev/null differ
diff --git a/res/layout/conversation_header_view.xml b/res/layout/conversation_header_view.xml
index eb854fdc7d..198b4e6cb1 100644
--- a/res/layout/conversation_header_view.xml
+++ b/res/layout/conversation_header_view.xml
@@ -2,7 +2,7 @@
 <org.thoughtcrime.securesms.ConversationHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingRight="10dip" 
+    android:paddingRight="10dip"
     >
 
     <ImageView android:id="@+id/unread_indicator"
@@ -11,22 +11,14 @@
         android:layout_alignParentLeft="true"
         android:visibility="invisible"
         android:src="@drawable/ic_sms_unread_msg_indicator" />
-        
-<!--   <android.widget.QuickContactBadge android:id="@+id/contact_photo"-->
-<!--   									 android:layout_width="60dp"-->
-<!--   									 android:layout_height="60dp"-->
-<!--   									 android:cropToPadding="true"-->
-<!--   									 android:scaleType="centerCrop"-->
-<!--   									 android:layout_toRightOf="@id/unread_indicator"-->
-<!--   									 android:visibility="gone" />-->
 
-	<ImageView android:id="@+id/contact_photo"
-			   android:layout_width="60dp"
-			   android:layout_height="60dp"
-			   android:cropToPadding="true"
-			   android:scaleType="centerCrop"
-			   android:layout_toRightOf="@id/unread_indicator"
-			   android:visibility="gone" />
+    <QuickContactBadge android:id="@+id/contact_photo"
+                       android:layout_width="60dp"
+                       android:layout_height="60dp"
+                       android:cropToPadding="true"
+                       android:scaleType="centerCrop"
+                       android:layout_toRightOf="@id/unread_indicator"
+                       android:visibility="gone" />
 
 
    <ImageView android:id="@+id/key_indicator"
@@ -35,13 +27,13 @@
         android:layout_alignParentLeft="true"
         android:visibility="invisible"
         android:src="@drawable/key_exchange_indicator" />
-        
+
     <CheckBox android:id="@+id/checkbox"
-    		  android:layout_width="wrap_content"
-    		  android:layout_height="wrap_content"
-    		  android:layout_alignParentRight="true"
-    		  android:layout_alignParentTop="true"
-    		  android:visibility="gone" />
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_alignParentRight="true"
+              android:layout_alignParentTop="true"
+              android:visibility="gone" />
 
     <TextView android:id="@+id/from"
         android:layout_width="wrap_content"
@@ -55,10 +47,10 @@
         android:layout_toRightOf="@id/contact_photo"
         android:layout_toLeftOf="@id/checkbox"
         android:layout_alignWithParentIfMissing="true"
-        android:ellipsize="marquee"  
+        android:ellipsize="marquee"
         android:textColor="#000000"/>
-        
-         
+
+
     <TextView android:id="@+id/date"
         android:layout_marginBottom="10dip"
         android:layout_marginLeft="5dip"
@@ -101,4 +93,3 @@
         android:ellipsize="end" />
 
 </org.thoughtcrime.securesms.ConversationHeaderView>
-         
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index df834cf537..fe2e862934 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -29,17 +29,13 @@
                    />
 
         <ListView android:id="@android:id/list"
-            style="?android:attr/listViewWhiteStyle"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:drawSelectorOnTop="false"
-            android:scrollbarStyle="insideOverlay"
-            android:fadingEdgeLength="16dip"
-            android:background="@android:color/white"
-            android:cacheColorHint="@android:color/white"
-            android:layout_alignParentTop="true"
-            android:layout_above="@id/search_text" />
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:drawSelectorOnTop="false"
+                  android:scrollbarStyle="insideOverlay"
+                  android:fadingEdgeLength="16dip"
+                  android:layout_alignParentTop="true"
+                  android:layout_above="@id/search_text" />
 
         <ProgressBar android:id="@+id/search_progress"
                      android:layout_width="wrap_content"
diff --git a/src/org/thoughtcrime/securesms/ConversationHeaderView.java b/src/org/thoughtcrime/securesms/ConversationHeaderView.java
index 1448bc3ae9..a1285857ea 100644
--- a/src/org/thoughtcrime/securesms/ConversationHeaderView.java
+++ b/src/org/thoughtcrime/securesms/ConversationHeaderView.java
@@ -17,8 +17,6 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.preference.PreferenceManager;
 import android.text.Spannable;
 import android.text.format.DateUtils;
 import android.text.style.StyleSpan;
@@ -27,7 +25,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.ImageView;
+import android.widget.QuickContactBadge;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -48,23 +46,22 @@ public class ConversationHeaderView extends RelativeLayout {
   private final Context   context;
   private       Set<Long> selectedThreads;
 
-  private Recipients recipients;
-  private long       threadId;
-  private boolean    first;
-  private TextView   subjectView;
-  private TextView   fromView;
-  private TextView   dateView;
-  private View       unreadIndicator;
-  private View       keyIndicator;
-  private CheckBox   checkbox;
-  private ImageView  contactPhoto;
+  private Recipients        recipients;
+  private long              threadId;
+  private boolean           first;
+  private TextView          subjectView;
+  private TextView          fromView;
+  private TextView          dateView;
+  private View              unreadIndicator;
+  private View              keyIndicator;
+  private CheckBox          checkbox;
+  private QuickContactBadge contactPhoto;
 
   public ConversationHeaderView(Context context, boolean first) {
     this(context, (Set<Long>)null);
 
     this.first = true;
     contactPhoto.setVisibility(View.GONE);
-    this.setBackgroundColor(Color.TRANSPARENT);
   }
 
   public ConversationHeaderView(Context context, Set<Long> selectedThreads) {
@@ -80,7 +77,7 @@ public class ConversationHeaderView extends RelativeLayout {
     this.dateView        = (TextView)findViewById(R.id.date);
     this.unreadIndicator = findViewById(R.id.unread_indicator);
     this.keyIndicator    = findViewById(R.id.key_indicator);
-    this.contactPhoto    = (ImageView)findViewById(R.id.contact_photo);
+    this.contactPhoto    = (QuickContactBadge)findViewById(R.id.contact_photo);
     this.checkbox        = (CheckBox)findViewById(R.id.checkbox);
 
     intializeListeners();
@@ -117,13 +114,9 @@ public class ConversationHeaderView extends RelativeLayout {
       if (batchMode) checkbox.setVisibility(View.VISIBLE);
       else           checkbox.setVisibility(View.GONE);
 
-      if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.CONVERSATION_ICONS_LIST_PREF, ApplicationPreferencesActivity.showIcon())) {
-        contactPhoto.setVisibility(View.GONE);
-      } else {
-        contactPhoto.setImageBitmap(message.getRecipients().getPrimaryRecipient().getContactPhoto());
-        contactPhoto.setBackgroundResource(R.drawable.light_border_background);
-        contactPhoto.setVisibility(View.VISIBLE);
-      }
+      contactPhoto.setImageBitmap(this.recipients.getPrimaryRecipient().getContactPhoto());
+      contactPhoto.assignContactFromPhone(this.recipients.getPrimaryRecipient().getNumber(), true);
+      contactPhoto.setVisibility(View.VISIBLE);
     }
   }