diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 8d4e070eb..1b73c8113 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -475,7 +475,7 @@ public class TagSettingsActivity extends FragmentActivity {
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-        item.setIcon(android.R.drawable.ic_menu_save);
+        item.setIcon(R.drawable.ic_menu_save);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         return super.onCreateOptionsMenu(menu);
     }
diff --git a/astrid/res/drawable-hdpi/close_clear_cancel.png b/astrid/res/drawable-hdpi/close_clear_cancel.png
deleted file mode 100644
index 778c7f081..000000000
Binary files a/astrid/res/drawable-hdpi/close_clear_cancel.png and /dev/null differ
diff --git a/astrid/res/drawable-hdpi/ic_menu_attach.png b/astrid/res/drawable-hdpi/ic_menu_attach.png
new file mode 100644
index 000000000..9a974fac6
Binary files /dev/null and b/astrid/res/drawable-hdpi/ic_menu_attach.png differ
diff --git a/astrid/res/drawable-hdpi/ic_menu_camera.png b/astrid/res/drawable-hdpi/ic_menu_camera.png
new file mode 100644
index 000000000..439e1118e
Binary files /dev/null and b/astrid/res/drawable-hdpi/ic_menu_camera.png differ
diff --git a/astrid/res/drawable-hdpi/ic_menu_close.png b/astrid/res/drawable-hdpi/ic_menu_close.png
new file mode 100644
index 000000000..daadfe766
Binary files /dev/null and b/astrid/res/drawable-hdpi/ic_menu_close.png differ
diff --git a/astrid/res/drawable-hdpi/ic_menu_mic.png b/astrid/res/drawable-hdpi/ic_menu_mic.png
new file mode 100644
index 000000000..f5f35f906
Binary files /dev/null and b/astrid/res/drawable-hdpi/ic_menu_mic.png differ
diff --git a/astrid/res/drawable-hdpi/ic_menu_save.png b/astrid/res/drawable-hdpi/ic_menu_save.png
new file mode 100644
index 000000000..f1b115b1d
Binary files /dev/null and b/astrid/res/drawable-hdpi/ic_menu_save.png differ
diff --git a/astrid/res/drawable/close_clear_cancel.png b/astrid/res/drawable/close_clear_cancel.png
deleted file mode 100644
index 778c7f081..000000000
Binary files a/astrid/res/drawable/close_clear_cancel.png and /dev/null differ
diff --git a/astrid/res/drawable/ic_menu_attach.png b/astrid/res/drawable/ic_menu_attach.png
new file mode 100644
index 000000000..e1bef9e08
Binary files /dev/null and b/astrid/res/drawable/ic_menu_attach.png differ
diff --git a/astrid/res/drawable/ic_menu_camera.png b/astrid/res/drawable/ic_menu_camera.png
new file mode 100644
index 000000000..99442f943
Binary files /dev/null and b/astrid/res/drawable/ic_menu_camera.png differ
diff --git a/astrid/res/drawable/ic_menu_close.png b/astrid/res/drawable/ic_menu_close.png
new file mode 100644
index 000000000..33c5bbfb1
Binary files /dev/null and b/astrid/res/drawable/ic_menu_close.png differ
diff --git a/astrid/res/drawable/ic_menu_mic.png b/astrid/res/drawable/ic_menu_mic.png
new file mode 100644
index 000000000..c33cd2053
Binary files /dev/null and b/astrid/res/drawable/ic_menu_mic.png differ
diff --git a/astrid/res/drawable/ic_menu_save.png b/astrid/res/drawable/ic_menu_save.png
new file mode 100644
index 000000000..d748aaaad
Binary files /dev/null and b/astrid/res/drawable/ic_menu_save.png differ
diff --git a/astrid/res/layout-land/astrid_reminder_view.xml b/astrid/res/layout-land/astrid_reminder_view.xml
index 8e13547f5..f27c529b3 100644
--- a/astrid/res/layout-land/astrid_reminder_view.xml
+++ b/astrid/res/layout-land/astrid_reminder_view.xml
@@ -53,7 +53,7 @@
             android:scaleType="fitCenter"
             android:layout_gravity="right"
             android:layout_marginBottom="10dip"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
 	    <Button
 	        android:id="@+id/reminder_edit"
 	        android:layout_width="fill_parent"
diff --git a/astrid/res/layout/astrid_missed_call_view.xml b/astrid/res/layout/astrid_missed_call_view.xml
index e7b772884..199806126 100644
--- a/astrid/res/layout/astrid_missed_call_view.xml
+++ b/astrid/res/layout/astrid_missed_call_view.xml
@@ -40,7 +40,7 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
     
     </LinearLayout>
     
diff --git a/astrid/res/layout/astrid_reminder_view.xml b/astrid/res/layout/astrid_reminder_view.xml
index 50c0a907a..e8991fe74 100644
--- a/astrid/res/layout/astrid_reminder_view.xml
+++ b/astrid/res/layout/astrid_reminder_view.xml
@@ -28,7 +28,7 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
     
     </LinearLayout>
     
diff --git a/astrid/res/layout/astrid_reminder_view_portrait.xml b/astrid/res/layout/astrid_reminder_view_portrait.xml
index 50c0a907a..e8991fe74 100644
--- a/astrid/res/layout/astrid_reminder_view_portrait.xml
+++ b/astrid/res/layout/astrid_reminder_view_portrait.xml
@@ -28,7 +28,7 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
     
     </LinearLayout>
     
diff --git a/astrid/res/layout/file_row.xml b/astrid/res/layout/file_row.xml
index e020c19df..ad8018ebd 100644
--- a/astrid/res/layout/file_row.xml
+++ b/astrid/res/layout/file_row.xml
@@ -23,7 +23,7 @@
         android:id="@+id/remove_file"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/close_clear_cancel"
+        android:src="@drawable/ic_menu_close"
         android:layout_marginLeft="5dip"
         android:layout_marginRight="5dip"
         android:visibility="gone"/>
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 1d15e4333..9944e63c7 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -33,7 +33,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dip"
                     android:background="@android:color/transparent"
-                    android:src="@drawable/close_clear_cancel" />
+                    android:src="@drawable/ic_menu_close" />
 
                 <ImageButton
                     android:id="@+id/save"
@@ -41,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dip"
                     android:background="@android:color/transparent"
-                    android:src="@android:drawable/ic_menu_save" />
+                    android:src="@drawable/ic_menu_save" />
             </LinearLayout>
 
             <RelativeLayout
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index d5a2102ad..cbd265300 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -43,14 +43,14 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="10dip"
                         android:background="@android:color/transparent"
-                        android:src="@drawable/close_clear_cancel" />
+                        android:src="@drawable/ic_menu_close" />
 
                     <ImageButton
                         android:id="@+id/save"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@android:color/transparent"
-                        android:src="@android:drawable/ic_menu_save" />
+                        android:src="@drawable/ic_menu_save" />
                 </LinearLayout>
             </LinearLayout>
 
diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index 0a469d5da..46afcd62b 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -6,4 +6,7 @@
     <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
     <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
     
+    <string name="premium_attach_file">Attach a file</string>
+    <string name="premium_record_audio">Record a note</string>
+    
 </resources>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 6205ba76c..d4d97abd1 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -158,6 +158,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
     private static final int MENU_DELETE_ID = R.string.TEA_menu_delete;
     private static final int MENU_COMMENTS_REFRESH_ID = R.string.TEA_menu_comments;
+    private static final int MENU_ATTACH_ID = R.string.premium_attach_file;
+    private static final int MENU_RECORD_ID = R.string.premium_record_audio;
 
     // --- result codes
 
@@ -1000,7 +1002,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         case MENU_DELETE_ID:
             deleteButtonClick();
             return true;
-
+        case MENU_ATTACH_ID:
+            System.err.println("Attach file!"); //$NON-NLS-1$
+            return true;
+        case MENU_RECORD_ID:
+            System.err.println("Record audio!"); //$NON-NLS-1$
+            return true;
         case MENU_COMMENTS_REFRESH_ID: {
                 editNotes.refreshData(true, null);
             return true;
@@ -1022,13 +1029,22 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         MenuItem item;
 
         AstridActivity activity = (AstridActivity) getActivity();
+
+        item = menu.add(Menu.NONE, MENU_ATTACH_ID, 0, R.string.premium_attach_file);
+        item.setIcon(R.drawable.ic_menu_attach);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
+        item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio);
+        item.setIcon(R.drawable.ic_menu_mic);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
         if (activity instanceof TaskListActivity && activity.fragmentLayout != AstridActivity.LAYOUT_DOUBLE || activity instanceof TaskEditActivity) {
             item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
-            item.setIcon(R.drawable.close_clear_cancel);
+            item.setIcon(R.drawable.ic_menu_close);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
             item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-            item.setIcon(android.R.drawable.ic_menu_save);
+            item.setIcon(R.drawable.ic_menu_save);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }