diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f382bc930..2c50a744a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,41 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <declare-styleable name="K9Styles">
-        <attr name="iconFolder" format="reference"/>
+        <attr name="iconFolder" format="reference" />
         <attr name="listDivider" format="reference" />
-		<attr name="iconListItemMenu" format="reference" />
-		<attr name="iconMenuInfoDetails" 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="iconActionMoveOrCopy" 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" />
+        <attr name="iconListItemMenu" format="reference" />
+        <attr name="iconMenuInfoDetails" 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="iconActionMoveOrCopy" 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 801dcadc6..e052da581 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -6,41 +6,39 @@
         <item name="iconFolder">@drawable/folder_light</item>
         <item name="listDivider">@drawable/divider_light</item>
         <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_light</item>
-		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
-		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_light</item>
-		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc_light</item>
-		<item name="iconActionArchive">@drawable/ic_action_archive_light</item>
-		<item name="iconActionCompose">@drawable/ic_action_compose_light</item>
-		<item name="iconActionDelete">@drawable/ic_action_delete_light</item>
-		<item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_light</item>
-		<item name="iconActionNextMessage">@drawable/ic_action_next_message_light</item>
-		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_light</item>
-		<item name="iconActionRead">@drawable/ic_action_read_light</item>
-		<item name="iconActionRefresh">@drawable/ic_action_refresh_light</item>
-		<item name="iconActionSearch">@drawable/ic_action_search_light</item>
-		<item name="iconActionSend">@drawable/ic_action_send_light</item>
-		<item name="iconActionSettings">@drawable/ic_action_settings_light</item>
-		<item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_light</item>
-		<item name="iconActionSort">@drawable/ic_action_sort_light</item>
-		<item name="iconActionSpam">@drawable/ic_action_spam_light</item>
-		<item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag_light</item>
-		<item name="iconActionToggleRead">@drawable/ic_action_toggle_read_light</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>
-
-
+        <item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
+        <item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_light</item>
+        <item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc_light</item>
+        <item name="iconActionArchive">@drawable/ic_action_archive_light</item>
+        <item name="iconActionCompose">@drawable/ic_action_compose_light</item>
+        <item name="iconActionDelete">@drawable/ic_action_delete_light</item>
+        <item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_light</item>
+        <item name="iconActionNextMessage">@drawable/ic_action_next_message_light</item>
+        <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_light</item>
+        <item name="iconActionRead">@drawable/ic_action_read_light</item>
+        <item name="iconActionRefresh">@drawable/ic_action_refresh_light</item>
+        <item name="iconActionSearch">@drawable/ic_action_search_light</item>
+        <item name="iconActionSend">@drawable/ic_action_send_light</item>
+        <item name="iconActionSettings">@drawable/ic_action_settings_light</item>
+        <item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_light</item>
+        <item name="iconActionSort">@drawable/ic_action_sort_light</item>
+        <item name="iconActionSpam">@drawable/ic_action_spam_light</item>
+        <item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag_light</item>
+        <item name="iconActionToggleRead">@drawable/ic_action_toggle_read_light</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">
@@ -48,39 +46,39 @@
         <item name="iconFolder">@drawable/folder_dark</item>
         <item name="listDivider">@drawable/divider_dark</item>
         <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_dark</item>
-		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
-		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_dark</item>
-		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bcc_dark</item>
-		<item name="iconActionArchive">@drawable/ic_action_archive_dark</item>
-		<item name="iconActionCompose">@drawable/ic_action_compose_dark</item>
-		<item name="iconActionDelete">@drawable/ic_action_delete_dark</item>
-		<item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_dark</item>
-		<item name="iconActionNextMessage">@drawable/ic_action_next_message_dark</item>
-		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_dark</item>
-		<item name="iconActionRead">@drawable/ic_action_read_dark</item>
-		<item name="iconActionRefresh">@drawable/ic_action_refresh_dark</item>
-		<item name="iconActionSearch">@drawable/ic_action_search_dark</item>
-		<item name="iconActionSend">@drawable/ic_action_send_dark</item>
-		<item name="iconActionSettings">@drawable/ic_action_settings_dark</item>
-		<item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_dark</item>
-		<item name="iconActionSort">@drawable/ic_action_sort_dark</item>
-		<item name="iconActionSpam">@drawable/ic_action_spam_dark</item>
-		<item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag_dark</item>
-		<item name="iconActionToggleRead">@drawable/ic_action_toggle_read_dark</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>
+        <item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
+        <item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_dark</item>
+        <item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bcc_dark</item>
+        <item name="iconActionArchive">@drawable/ic_action_archive_dark</item>
+        <item name="iconActionCompose">@drawable/ic_action_compose_dark</item>
+        <item name="iconActionDelete">@drawable/ic_action_delete_dark</item>
+        <item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_dark</item>
+        <item name="iconActionNextMessage">@drawable/ic_action_next_message_dark</item>
+        <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_dark</item>
+        <item name="iconActionRead">@drawable/ic_action_read_dark</item>
+        <item name="iconActionRefresh">@drawable/ic_action_refresh_dark</item>
+        <item name="iconActionSearch">@drawable/ic_action_search_dark</item>
+        <item name="iconActionSend">@drawable/ic_action_send_dark</item>
+        <item name="iconActionSettings">@drawable/ic_action_settings_dark</item>
+        <item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_dark</item>
+        <item name="iconActionSort">@drawable/ic_action_sort_dark</item>
+        <item name="iconActionSpam">@drawable/ic_action_spam_dark</item>
+        <item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag_dark</item>
+        <item name="iconActionToggleRead">@drawable/ic_action_toggle_read_dark</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>
+</resources>
\ No newline at end of file