diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index ef0cd8313..0f22a0661 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -389,10 +389,13 @@ public class EditPeopleControlSet extends PopupControlSet {
             CheckedTextView ctv = (CheckedTextView) convertView.findViewById(android.R.id.text1);
             super.getView(position, ctv, parent);
             AsyncImageView image = (AsyncImageView) convertView.findViewById(R.id.person_image);
-            if (position <= 1) {
-                image.setVisibility(View.GONE);
+            image.setDefaultImageResource(R.drawable.icn_default_person_image);
+            if (position == 0) {
+                image.setUrl(ActFmPreferenceService.thisUser().optString("picture"));
+            } else if (position == 1) {
+                image.setUrl("");
+                image.setDefaultImageResource(R.drawable.icn_anyone);
             } else {
-                image.setVisibility(View.VISIBLE);
                 image.setUrl(getItem(position).user.optString("picture"));
             }
             return convertView;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index 3021f043c..e0d5c93c3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -378,7 +378,7 @@ public class TagViewActivity extends TaskListActivity {
         AsyncImageView image = new AsyncImageView(this);
         image.setLayoutParams(new LinearLayout.LayoutParams((int)(50 * displayMetrics.density),
                 (int)(50 * displayMetrics.density)));
-        image.setDefaultImageResource(R.drawable.ic_contact_picture_2);
+        image.setDefaultImageResource(R.drawable.icn_default_person_image);
         image.setScaleType(ImageView.ScaleType.FIT_XY);
         try {
             final long id = member.getLong("id");
diff --git a/astrid/res/drawable/icn_anyone.png b/astrid/res/drawable/icn_anyone.png
new file mode 100644
index 000000000..fa830dcd4
Binary files /dev/null and b/astrid/res/drawable/icn_anyone.png differ
diff --git a/astrid/res/drawable/icn_default_person_image.png b/astrid/res/drawable/icn_default_person_image.png
new file mode 100644
index 000000000..22b6fb987
Binary files /dev/null and b/astrid/res/drawable/icn_default_person_image.png differ
diff --git a/astrid/res/layout/assigned_adapter_row.xml b/astrid/res/layout/assigned_adapter_row.xml
index 7d7a09139..9a20981a1 100644
--- a/astrid/res/layout/assigned_adapter_row.xml
+++ b/astrid/res/layout/assigned_adapter_row.xml
@@ -11,7 +11,7 @@
         android:gravity="center"
         android:layout_gravity="center_vertical"
         android:scaleType="fitCenter"
-        astrid:defaultSrc="@drawable/ic_contact_picture_2" />
+        astrid:defaultSrc="@drawable/icn_default_person_image" />
     <include layout="@android:layout/simple_list_item_single_choice"
         android:layout_toRightOf="@id/person_image"/>
 
diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml
index ef2979ced..e74602664 100644
--- a/astrid/res/layout/contact_adapter_row.xml
+++ b/astrid/res/layout/contact_adapter_row.xml
@@ -15,7 +15,7 @@
         android:layout_height="44dip"
         android:gravity="center"
         android:scaleType="fitCenter"
-        astrid:defaultSrc="@drawable/ic_contact_picture_2" />
+        astrid:defaultSrc="@drawable/icn_default_person_image" />
         
     <!-- person name -->
     <TextView android:id="@android:id/text1"
diff --git a/astrid/res/layout/task_adapter_draggable_row.xml b/astrid/res/layout/task_adapter_draggable_row.xml
index d4caf7ed2..1aef9372a 100644
--- a/astrid/res/layout/task_adapter_draggable_row.xml
+++ b/astrid/res/layout/task_adapter_draggable_row.xml
@@ -75,7 +75,7 @@
                 android:layout_height="fill_parent"
                 android:padding="5dip" 
                 android:scaleType="fitCenter"
-                astrid:defaultSrc="@drawable/ic_contact_picture_2"
+                astrid:defaultSrc="@drawable/icn_default_person_image"
                 android:visibility="gone"/>
     
         </LinearLayout>
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index af17dfc0b..b78ca46e5 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -56,7 +56,7 @@
                 android:layout_height="35dip"
                 android:padding="5dip" 
                 android:scaleType="fitCenter"
-                astrid:defaultSrc="@drawable/ic_contact_picture_2"
+                astrid:defaultSrc="@drawable/icn_default_person_image"
                 android:visibility="gone"/>
     
         </LinearLayout>
diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/res/layout/update_adapter_row.xml
index cc0953e4d..b15a90444 100644
--- a/astrid/res/layout/update_adapter_row.xml
+++ b/astrid/res/layout/update_adapter_row.xml
@@ -22,7 +22,7 @@
 	        android:layout_alignParentTop="true"
 	        android:layout_alignParentLeft="true"
 	        android:paddingTop="5dip" 
-	        astrid:defaultSrc="@drawable/ic_contact_picture_2"
+	        astrid:defaultSrc="@drawable/icn_default_person_image"
 	        android:scaleType="fitCenter" />
 	        
 	    <!-- title -->
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
index 99e77b435..a7b48ba77 100644
--- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
+++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
@@ -82,7 +82,7 @@ public class ContactListAdapter extends CursorAdapter {
                 text1.setText(cursor.getString(name));
                 text2.setText(cursor.getString(email));
             }
-            imageView.setImageResource(R.drawable.ic_contact_picture_2);
+            imageView.setImageResource(R.drawable.icn_default_person_image);
             Uri uri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, cursor.getLong(0));
             imageView.setTag(uri);
             ContactImageTask ciTask = new ContactImageTask(imageView);