New nice ICS icons for our actionbar.

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_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"
-        android:showAsAction="ifRoom"
 		    />
 		    <item
 		        android:id="@+id/copy"
 		        android:title="@string/copy_action"
-        android:showAsAction="ifRoom"
 		    />
+		</menu>
+	</item>
 </menu>

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

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 -->