diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 925cd9d7f..a3f8425d2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -34,6 +34,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.CheckedTextView;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -140,6 +141,8 @@ public class EditPeopleControlSet extends PopupControlSet {
         assignedClear = getView().findViewById(R.id.assigned_clear);
 
         assignedDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
+        ImageView image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
+        image.setImageResource(R.drawable.tea_icn_assign);
         setUpListeners();
     }
 
@@ -803,6 +806,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 user = (AssignedToUser) assignedList.getAdapter().getItem(0);
             displayString = activity.getString(R.string.TEA_assigned_to, user.toString());
         }
+
         assignedDisplay.setText(displayString);
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
index b914832c7..1fc38db7e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
@@ -21,6 +21,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -56,6 +57,7 @@ public final class TagsControlSet extends PopupControlSet {
     private ListView selectedTags;
     private boolean populated = false;
     private HashMap<String, Integer> tagIndices;
+    private final ImageView image;
 
     //private final LinearLayout tagsContainer;
     private final TextView tagsDisplay;
@@ -64,6 +66,7 @@ public final class TagsControlSet extends PopupControlSet {
         super(activity, viewLayout, displayViewLayout, title);
         DependencyInjectionService.getInstance().inject(this);
         tagsDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
+        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     private Tag[] getTagArray() {
@@ -308,9 +311,11 @@ public final class TagsControlSet extends PopupControlSet {
         if (!TextUtils.isEmpty(tagString)) {
             tagsDisplay.setText(tagString);
             tagsDisplay.setTextColor(themeColor);
+            image.setImageResource(R.drawable.tea_icn_lists);
         } else {
             tagsDisplay.setText(R.string.tag_FEx_untagged);
             tagsDisplay.setTextColor(unsetColor);
+            image.setImageResource(R.drawable.tea_icn_lists_gray);
         }
     }
 
diff --git a/astrid/res/drawable/tea_icn_assign.png b/astrid/res/drawable/tea_icn_assign.png
new file mode 100644
index 000000000..dabd98d04
Binary files /dev/null and b/astrid/res/drawable/tea_icn_assign.png differ
diff --git a/astrid/res/drawable/tea_icn_assign_gray.png b/astrid/res/drawable/tea_icn_assign_gray.png
new file mode 100644
index 000000000..e1212e083
Binary files /dev/null and b/astrid/res/drawable/tea_icn_assign_gray.png differ
diff --git a/astrid/res/drawable/tea_icn_edit.png b/astrid/res/drawable/tea_icn_edit.png
new file mode 100644
index 000000000..d6bf7c9ea
Binary files /dev/null and b/astrid/res/drawable/tea_icn_edit.png differ
diff --git a/astrid/res/drawable/tea_icn_edit_gray.png b/astrid/res/drawable/tea_icn_edit_gray.png
new file mode 100644
index 000000000..62680c74c
Binary files /dev/null and b/astrid/res/drawable/tea_icn_edit_gray.png differ
diff --git a/astrid/res/drawable/tea_icn_lists.png b/astrid/res/drawable/tea_icn_lists.png
new file mode 100644
index 000000000..78102370a
Binary files /dev/null and b/astrid/res/drawable/tea_icn_lists.png differ
diff --git a/astrid/res/drawable/tea_icn_lists_gray.png b/astrid/res/drawable/tea_icn_lists_gray.png
new file mode 100644
index 000000000..bed907439
Binary files /dev/null and b/astrid/res/drawable/tea_icn_lists_gray.png differ
diff --git a/astrid/res/drawable/tea_icn_priority.png b/astrid/res/drawable/tea_icn_priority.png
new file mode 100644
index 000000000..3342bda3b
Binary files /dev/null and b/astrid/res/drawable/tea_icn_priority.png differ
diff --git a/astrid/res/drawable/tea_icn_priority_gray.png b/astrid/res/drawable/tea_icn_priority_gray.png
new file mode 100644
index 000000000..5bdf2131b
Binary files /dev/null and b/astrid/res/drawable/tea_icn_priority_gray.png differ
diff --git a/astrid/res/layout/control_set_deadline_display.xml b/astrid/res/layout/control_set_deadline_display.xml
index ade5c6a0b..aff2ef995 100644
--- a/astrid/res/layout/control_set_deadline_display.xml
+++ b/astrid/res/layout/control_set_deadline_display.xml
@@ -18,10 +18,11 @@
         android:paddingLeft="10dip"
         android:paddingRight="10dip"
         android:gravity="center_vertical">
-        <View android:id="@+id/display_row_icon"
+        <ImageView android:id="@+id/display_row_icon"
              android:layout_marginRight="10dip"
              android:layout_width="20dip"
              android:layout_height="20dip"
+             android:scaleType="fitCenter"
              android:background="#ff0000"/>
 	     <TextView
 	         android:id="@+id/display_row_edit"
diff --git a/astrid/res/layout/control_set_default_display.xml b/astrid/res/layout/control_set_default_display.xml
index 49decacda..b7ed339fd 100644
--- a/astrid/res/layout/control_set_default_display.xml
+++ b/astrid/res/layout/control_set_default_display.xml
@@ -18,10 +18,11 @@
         android:paddingRight="10dip"
         android:gravity="center_vertical">
         
-         <View android:id="@+id/display_row_icon"
+         <ImageView android:id="@+id/display_row_icon"
              android:layout_marginRight="10dip"
              android:layout_width="20dip"
              android:layout_height="20dip"
+             android:scaleType="fitCenter"
              android:background="#ff0000"/>
 	     <TextView
 	         android:id="@+id/display_row_edit"
diff --git a/astrid/res/layout/control_set_importance.xml b/astrid/res/layout/control_set_importance.xml
index 5c19ff3c5..a547e6dab 100644
--- a/astrid/res/layout/control_set_importance.xml
+++ b/astrid/res/layout/control_set_importance.xml
@@ -20,10 +20,11 @@
         android:paddingLeft="10dip"
         android:paddingRight="10dip"
         android:layout_height="50dip">
-	      <View android:id="@+id/display_row_icon"
+	      <ImageView android:id="@+id/display_row_icon"
              android:layout_width="20dip"
              android:layout_height="20dip"
-             android:background="#ff0000"/>
+             android:scaleType="fitCenter"
+             android:src="@drawable/tea_icn_priority_gray"/>
       </LinearLayout>
       
       <View
diff --git a/astrid/res/layout/control_set_notes_display.xml b/astrid/res/layout/control_set_notes_display.xml
index f0df5b150..b697ed8fa 100644
--- a/astrid/res/layout/control_set_notes_display.xml
+++ b/astrid/res/layout/control_set_notes_display.xml
@@ -20,11 +20,11 @@
         android:orientation="horizontal"
         android:paddingLeft="10dip"
         android:paddingRight="10dip" >
-        <View android:id="@+id/display_row_icon"
+        <ImageView android:id="@+id/display_row_icon"
             android:layout_marginRight="10dip"
             android:layout_width="20dip"
             android:layout_height="20dip"
-            android:background="#ff0000"/>
+            android:scaleType="fitCenter"/>
         <TextView
             android:id="@+id/display_row_edit"
             style="@style/TextAppearance.EditRowDisplay"
diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
index 4815d28f7..90d2b258b 100644
--- a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
@@ -14,6 +14,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -28,12 +29,14 @@ public class DeadlineControlSet extends PopupControlSet {
     private DateAndTimePicker dateAndTimePicker;
     private final View[] extraViews;
     private final RepeatControlSet repeatControlSet;
+    private final ImageView image;
 
     public DeadlineControlSet(Activity activity, int viewLayout, int displayViewLayout,
             RepeatControlSet repeatControlSet, View...extraViews) {
         super(activity, viewLayout, displayViewLayout, 0);
         this.extraViews = extraViews;
         this.repeatControlSet = repeatControlSet;
+        this.image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
index 447ae5b5a..679cf9108 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
@@ -13,6 +13,7 @@ import android.text.util.Linkify;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.timsu.astrid.R;
@@ -22,9 +23,11 @@ public class EditNotesControlSet extends PopupControlSet {
 
     protected EditText editText;
     protected TextView notesPreview;
+    protected ImageView image;
 
     public EditNotesControlSet(Activity activity, int viewLayout, int displayViewLayout) {
         super(activity, viewLayout, displayViewLayout, R.string.TEA_note_label);
+        image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
     @Override
@@ -38,9 +41,11 @@ public class EditNotesControlSet extends PopupControlSet {
         if (TextUtils.isEmpty(textToUse)) {
             notesPreview.setText(R.string.TEA_notes_empty);
             notesPreview.setTextColor(unsetColor);
+            image.setImageResource(R.drawable.tea_icn_edit_gray);
         } else {
             notesPreview.setText(textToUse);
             notesPreview.setTextColor(themeColor);
+            image.setImageResource(R.drawable.tea_icn_edit);
         }
 
         linkifyDisplayView();