diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index 892e6e751..e0f81175b 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -33,7 +33,7 @@
         android:id="@+id/read_toggle"
         android:title="@string/read_toggle_action"
         android:showAsAction="always"
-        android:icon="?attr/toggleFlaggedMessages"
+        android:icon="?attr/iconActionToggleFlag"
     />
     <item
         android:id="@+id/archive"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 00606f6fb..527431be5 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,6 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="K9Styles">
-        <attr name="toggleFlaggedMessages" format="reference"/>
+		<attr name="iconMenuInfoDetails" format="reference" />
+		<attr name="iconMenuPreferences" format="reference" />
+		<attr name="iconActionAddAttachment" format="reference" />
+		<attr name="iconActionAddCcBcc" format="reference" />
+		<attr name="iconActionArchive" format="reference" />
+		<attr name="iconActionCompose" format="reference" />
+		<attr name="iconActionDelete" format="reference" />
+		<attr name="iconActionMoveCopy" format="reference" />
+		<attr name="iconActionNextMessage" format="reference" />
+		<attr name="iconActionPreviousMessage" format="reference" />
+		<attr name="iconActionRead" format="reference" />
+		<attr name="iconActionRefresh" format="reference" />
+		<attr name="iconActionSearch" format="reference" />
+		<attr name="iconActionSend" format="reference" />
+		<attr name="iconActionSettings" format="reference" />
+		<attr name="iconActionSingleMessageOptions" format="reference" />
+		<attr name="iconActionSort" format="reference" />
+		<attr name="iconActionSpam" format="reference" />
+		<attr name="iconActionToggleFlag" format="reference" />
+		<attr name="iconActionToggleRead" format="reference" />
+		<attr name="iconMenuAdd" format="reference" />
+		<attr name="iconMenuAttachment" format="reference" />
+		<attr name="iconMenuClear" format="reference" />
+		<attr name="iconMenuCloseClearCancel" format="reference" />
+		<attr name="iconMenuCompact" format="reference" />
+		<attr name="iconMenuDelete" format="reference" />
+		<attr name="iconMenuInbox" format="reference" />
+		<attr name="iconMenuPreferences" format="reference" />
+		<attr name="iconMenuRefresh" format="reference" />
+		<attr name="iconMenuReplyReceipt" format="reference" />
+		<attr name="iconMenuSaveDraft" format="reference" />
+		<attr name="iconMenuSearch" format="reference" />
+		<attr name="iconMenuSelectAll" format="reference" />
+		<attr name="iconMenuShowFolders" format="reference" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b5aed20b7..c9a941607 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -3,12 +3,80 @@
 
     <style name="Theme.K9.Light" parent="Theme.Sherlock.Light">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
-        <item name="toggleFlaggedMessages">@drawable/ic_action_toggle_flag</item>
+		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
+		<item name="iconMenuPreferences">@android:drawable/ic_menu_preferences</item>
+		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment</item>
+		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc</item>
+		<item name="iconActionArchive">@drawable/ic_action_archive</item>
+		<item name="iconActionCompose">@drawable/ic_action_compose</item>
+		<item name="iconActionDelete">@drawable/ic_action_delete</item>
+		<item name="iconActionMoveCopy">@drawable/ic_action_move_or_copy</item>
+		<item name="iconActionNextMessage">@drawable/ic_action_next_message</item>
+		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message</item>
+		<item name="iconActionRead">@drawable/ic_action_read</item>
+		<item name="iconActionRefresh">@drawable/ic_action_refresh</item>
+		<item name="iconActionSearch">@drawable/ic_action_search</item>
+		<item name="iconActionSend">@drawable/ic_action_send</item>
+		<item name="iconActionSettings">@drawable/ic_action_settings</item>
+		<item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options</item>
+		<item name="iconActionSort">@drawable/ic_action_sort</item>
+		<item name="iconActionSpam">@drawable/ic_action_spam</item>
+		<item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag</item>
+		<item name="iconActionToggleRead">@drawable/ic_action_toggle_read</item>
+		<item name="iconMenuAdd">@drawable/ic_menu_add</item>
+		<item name="iconMenuAttachment">@drawable/ic_menu_attachment</item>
+		<item name="iconMenuClear">@drawable/ic_menu_clear</item>
+		<item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
+		<item name="iconMenuCompact">@drawable/ic_menu_compact</item>
+		<item name="iconMenuDelete">@drawable/ic_menu_delete</item>
+		<item name="iconMenuInbox">@drawable/ic_menu_inbox</item>
+		<item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
+		<item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
+		<item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
+		<item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
+		<item name="iconMenuSearch">@drawable/ic_menu_search</item>
+		<item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
+		<item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
+
+
     </style>
 
     <style name="Theme.K9.Dark" parent="Theme.Sherlock">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
-        <item name="toggleFlaggedMessages">@drawable/ic_action_toggle_flag_dark</item>
+		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
+		<item name="iconMenuPreferences">@android:drawable/ic_menu_preferences</item>
+		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment</item>
+		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc</item>
+		<item name="iconActionArchive">@drawable/ic_action_archive</item>
+		<item name="iconActionCompose">@drawable/ic_action_compose</item>
+		<item name="iconActionDelete">@drawable/ic_action_delete</item>
+		<item name="iconActionMoveCopy">@drawable/ic_action_move_or_copy</item>
+		<item name="iconActionNextMessage">@drawable/ic_action_next_message</item>
+		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message</item>
+		<item name="iconActionRead">@drawable/ic_action_read</item>
+		<item name="iconActionRefresh">@drawable/ic_action_refresh</item>
+		<item name="iconActionSearch">@drawable/ic_action_search</item>
+		<item name="iconActionSend">@drawable/ic_action_send</item>
+		<item name="iconActionSettings">@drawable/ic_action_settings</item>
+		<item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options</item>
+		<item name="iconActionSort">@drawable/ic_action_sort</item>
+		<item name="iconActionSpam">@drawable/ic_action_spam</item>
+		<item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag_dark</item>
+		<item name="iconActionToggleRead">@drawable/ic_action_toggle_read</item>
+		<item name="iconMenuAdd">@drawable/ic_menu_add</item>
+		<item name="iconMenuAttachment">@drawable/ic_menu_attachment</item>
+		<item name="iconMenuClear">@drawable/ic_menu_clear</item>
+		<item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
+		<item name="iconMenuCompact">@drawable/ic_menu_compact</item>
+		<item name="iconMenuDelete">@drawable/ic_menu_delete</item>
+		<item name="iconMenuInbox">@drawable/ic_menu_inbox</item>
+		<item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
+		<item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
+		<item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
+		<item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
+		<item name="iconMenuSearch">@drawable/ic_menu_search</item>
+		<item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
+		<item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
     </style>
 
 </resources>