diff --git a/res/drawable-hdpi/ic_action_archive.png b/res/drawable-hdpi/ic_action_archive.png
new file mode 100644
index 000000000..c38723212
Binary files /dev/null and b/res/drawable-hdpi/ic_action_archive.png differ
diff --git a/res/drawable-hdpi/ic_action_compose.png b/res/drawable-hdpi/ic_action_compose.png
new file mode 100644
index 000000000..1a876e8ed
Binary files /dev/null and b/res/drawable-hdpi/ic_action_compose.png differ
diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png
new file mode 100644
index 000000000..09abb199e
Binary files /dev/null and b/res/drawable-hdpi/ic_action_delete.png differ
diff --git a/res/drawable-hdpi/ic_action_move_or_copy.png b/res/drawable-hdpi/ic_action_move_or_copy.png
new file mode 100644
index 000000000..a11c32645
Binary files /dev/null and b/res/drawable-hdpi/ic_action_move_or_copy.png differ
diff --git a/res/drawable-hdpi/ic_action_refresh.png b/res/drawable-hdpi/ic_action_refresh.png
new file mode 100644
index 000000000..2df79d81f
Binary files /dev/null and b/res/drawable-hdpi/ic_action_refresh.png differ
diff --git a/res/drawable-hdpi/ic_action_sort.png b/res/drawable-hdpi/ic_action_sort.png
new file mode 100644
index 000000000..d64712778
Binary files /dev/null and b/res/drawable-hdpi/ic_action_sort.png differ
diff --git a/res/drawable-hdpi/ic_action_spam.png b/res/drawable-hdpi/ic_action_spam.png
new file mode 100644
index 000000000..003e3c9c0
Binary files /dev/null and b/res/drawable-hdpi/ic_action_spam.png differ
diff --git a/res/drawable-hdpi/ic_action_toggle_flag.png b/res/drawable-hdpi/ic_action_toggle_flag.png
new file mode 100644
index 000000000..e7a143b4b
Binary files /dev/null and b/res/drawable-hdpi/ic_action_toggle_flag.png differ
diff --git a/res/drawable-hdpi/ic_action_toggle_read.png b/res/drawable-hdpi/ic_action_toggle_read.png
new file mode 100644
index 000000000..0ed1e97d5
Binary files /dev/null and b/res/drawable-hdpi/ic_action_toggle_read.png differ
diff --git a/res/drawable-ldpi/ic_action_archive.png b/res/drawable-ldpi/ic_action_archive.png
new file mode 100644
index 000000000..f10021c5b
Binary files /dev/null and b/res/drawable-ldpi/ic_action_archive.png differ
diff --git a/res/drawable-ldpi/ic_action_compose.png b/res/drawable-ldpi/ic_action_compose.png
new file mode 100644
index 000000000..46681e033
Binary files /dev/null and b/res/drawable-ldpi/ic_action_compose.png differ
diff --git a/res/drawable-ldpi/ic_action_delete.png b/res/drawable-ldpi/ic_action_delete.png
new file mode 100644
index 000000000..73fecae54
Binary files /dev/null and b/res/drawable-ldpi/ic_action_delete.png differ
diff --git a/res/drawable-ldpi/ic_action_move_or_copy.png b/res/drawable-ldpi/ic_action_move_or_copy.png
new file mode 100644
index 000000000..cbea7ae44
Binary files /dev/null and b/res/drawable-ldpi/ic_action_move_or_copy.png differ
diff --git a/res/drawable-ldpi/ic_action_refresh.png b/res/drawable-ldpi/ic_action_refresh.png
new file mode 100644
index 000000000..806bd49ae
Binary files /dev/null and b/res/drawable-ldpi/ic_action_refresh.png differ
diff --git a/res/drawable-ldpi/ic_action_sort.png b/res/drawable-ldpi/ic_action_sort.png
new file mode 100644
index 000000000..69fd0d2a4
Binary files /dev/null and b/res/drawable-ldpi/ic_action_sort.png differ
diff --git a/res/drawable-ldpi/ic_action_spam.png b/res/drawable-ldpi/ic_action_spam.png
new file mode 100644
index 000000000..02fcb4083
Binary files /dev/null and b/res/drawable-ldpi/ic_action_spam.png differ
diff --git a/res/drawable-ldpi/ic_action_toggle_flag.png b/res/drawable-ldpi/ic_action_toggle_flag.png
new file mode 100644
index 000000000..529815d10
Binary files /dev/null and b/res/drawable-ldpi/ic_action_toggle_flag.png differ
diff --git a/res/drawable-ldpi/ic_action_toggle_read.png b/res/drawable-ldpi/ic_action_toggle_read.png
new file mode 100644
index 000000000..4de40d45b
Binary files /dev/null and b/res/drawable-ldpi/ic_action_toggle_read.png differ
diff --git a/res/drawable-mdpi/ic_action_archive.png b/res/drawable-mdpi/ic_action_archive.png
new file mode 100644
index 000000000..02eed0944
Binary files /dev/null and b/res/drawable-mdpi/ic_action_archive.png differ
diff --git a/res/drawable-mdpi/ic_action_compose.png b/res/drawable-mdpi/ic_action_compose.png
new file mode 100644
index 000000000..c34f3d660
Binary files /dev/null and b/res/drawable-mdpi/ic_action_compose.png differ
diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png
new file mode 100644
index 000000000..60903db9d
Binary files /dev/null and b/res/drawable-mdpi/ic_action_delete.png differ
diff --git a/res/drawable-mdpi/ic_action_move_or_copy.png b/res/drawable-mdpi/ic_action_move_or_copy.png
new file mode 100644
index 000000000..a8972a10f
Binary files /dev/null and b/res/drawable-mdpi/ic_action_move_or_copy.png differ
diff --git a/res/drawable-mdpi/ic_action_refresh.png b/res/drawable-mdpi/ic_action_refresh.png
new file mode 100644
index 000000000..eae201673
Binary files /dev/null and b/res/drawable-mdpi/ic_action_refresh.png differ
diff --git a/res/drawable-mdpi/ic_action_sort.png b/res/drawable-mdpi/ic_action_sort.png
new file mode 100644
index 000000000..d01929ed8
Binary files /dev/null and b/res/drawable-mdpi/ic_action_sort.png differ
diff --git a/res/drawable-mdpi/ic_action_spam.png b/res/drawable-mdpi/ic_action_spam.png
new file mode 100644
index 000000000..c512d1a4b
Binary files /dev/null and b/res/drawable-mdpi/ic_action_spam.png differ
diff --git a/res/drawable-mdpi/ic_action_toggle_flag.png b/res/drawable-mdpi/ic_action_toggle_flag.png
new file mode 100644
index 000000000..3c8cea965
Binary files /dev/null and b/res/drawable-mdpi/ic_action_toggle_flag.png differ
diff --git a/res/drawable-mdpi/ic_action_toggle_read.png b/res/drawable-mdpi/ic_action_toggle_read.png
new file mode 100644
index 000000000..4f4b42671
Binary files /dev/null and b/res/drawable-mdpi/ic_action_toggle_read.png differ
diff --git a/res/drawable-xhdpi/ic_action_archive.png b/res/drawable-xhdpi/ic_action_archive.png
new file mode 100644
index 000000000..80f42280e
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_archive.png differ
diff --git a/res/drawable-xhdpi/ic_action_compose.png b/res/drawable-xhdpi/ic_action_compose.png
new file mode 100644
index 000000000..1faf38c69
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_compose.png differ
diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png
new file mode 100644
index 000000000..311511330
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_delete.png differ
diff --git a/res/drawable-xhdpi/ic_action_move_or_copy.png b/res/drawable-xhdpi/ic_action_move_or_copy.png
new file mode 100644
index 000000000..5721c615c
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_move_or_copy.png differ
diff --git a/res/drawable-xhdpi/ic_action_refresh.png b/res/drawable-xhdpi/ic_action_refresh.png
new file mode 100644
index 000000000..9ded06afb
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_refresh.png differ
diff --git a/res/drawable-xhdpi/ic_action_sort.png b/res/drawable-xhdpi/ic_action_sort.png
new file mode 100644
index 000000000..aeaa83fa0
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_sort.png differ
diff --git a/res/drawable-xhdpi/ic_action_spam.png b/res/drawable-xhdpi/ic_action_spam.png
new file mode 100644
index 000000000..d83ef256d
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_spam.png differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_flag.png b/res/drawable-xhdpi/ic_action_toggle_flag.png
new file mode 100644
index 000000000..9ef985d53
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_toggle_flag.png differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_read.png b/res/drawable-xhdpi/ic_action_toggle_read.png
new file mode 100644
index 000000000..4cd651b26
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_toggle_read.png differ
diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index a13358f38..2711c6b97 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -4,35 +4,46 @@
         android:id="@+id/delete"
         android:title="@string/delete_action"
         android:showAsAction="always"
+        android:icon="@drawable/ic_action_delete"
     />
     <item
         android:id="@+id/read_toggle"
         android:title="@string/read_toggle_action"
         android:showAsAction="always"
+        android:icon="@drawable/ic_action_toggle_read"
     />
     <item
         android:id="@+id/archive"
         android:title="@string/archive_action"
         android:showAsAction="always"
+        android:icon="@drawable/ic_action_archive"
     />
     <item
         android:id="@+id/flag_toggle"
         android:title="@string/flag_toggle_action"
         android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_toggle_flag"
     />
     <item
         android:id="@+id/spam"
         android:title="@string/spam_action"
         android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_spam"
     />
     <item
-        android:id="@+id/move"
-        android:title="@string/move_action"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/copy"
-        android:title="@string/copy_action"
-        android:showAsAction="ifRoom"
-    />
+		android:id="@+id/move_or_copy"
+	    android:title="@string/move_or_copy_action"
+	    android:showAsAction="ifRoom"
+	    android:icon="@drawable/ic_action_move_or_copy">
+	    <menu>
+		    <item
+		        android:id="@+id/move"
+		        android:title="@string/move_action"
+		    />
+		    <item
+		        android:id="@+id/copy"
+		        android:title="@string/copy_action"
+		    />
+		</menu>
+	</item>
 </menu>
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index 127b1c787..dfa5d5faa 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -4,13 +4,13 @@
         android:id="@+id/compose"
         android:alphabeticShortcut="c"
         android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose"
+        android:icon="@drawable/ic_action_compose"
         android:showAsAction="always"
     />
     <item
         android:id="@+id/set_sort"
         android:title="@string/sort_by"
-        android:icon="@drawable/ic_menu_set_sort"
+        android:icon="@drawable/ic_action_sort"
         android:showAsAction="always" >
 		<menu>
             <item
@@ -53,13 +53,14 @@
         android:id="@+id/send_messages"
         android:alphabeticShortcut="r"
         android:title="@string/send_messages_action"
-        android:icon="@drawable/ic_menu_refresh"
+        android:icon="@drawable/ic_action_refresh"
+        android:showAsAction="never"
     />
     <item
         android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
         android:title="@string/check_mail_action"
-        android:icon="@drawable/ic_menu_refresh"
+        android:icon="@drawable/ic_action_refresh"
         android:showAsAction="always"
     />
     <item
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 76f7020d5..3b96a4d0e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -117,6 +117,7 @@ http://k9mail.googlecode.com/
     <string name="delete_all_action">Clear folder</string>
     <string name="forward_action">Forward</string>
     <string name="move_action">Move</string>
+    <string name="move_or_copy_action">Move or Copymove_or_copy_action</string>
     <string name="continue_action">Continue</string>
     <string name="back_action">Back</string>
     <string name="done_action">Done</string> <!--  Used to complete a multi-step process -->