diff --git a/res/drawable-hdpi/btn_star_big_buttonless_off.png b/res/drawable-hdpi/btn_star_big_buttonless_off.png
deleted file mode 100644
index a27b7c656..000000000
Binary files a/res/drawable-hdpi/btn_star_big_buttonless_off.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_star_big_buttonless_on.png b/res/drawable-hdpi/btn_star_big_buttonless_on.png
deleted file mode 100644
index 30463436a..000000000
Binary files a/res/drawable-hdpi/btn_star_big_buttonless_on.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_star_big_buttonless_off.png b/res/drawable-mdpi/btn_star_big_buttonless_off.png
deleted file mode 100644
index 55ccbeef9..000000000
Binary files a/res/drawable-mdpi/btn_star_big_buttonless_off.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_star_big_buttonless_on.png b/res/drawable-mdpi/btn_star_big_buttonless_on.png
deleted file mode 100644
index e8ea4c44d..000000000
Binary files a/res/drawable-mdpi/btn_star_big_buttonless_on.png and /dev/null differ
diff --git a/res/drawable/star.xml b/res/drawable/star.xml
deleted file mode 100644
index 919c114a9..000000000
--- a/res/drawable/star.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:state_checked="false"
-         android:drawable="@drawable/btn_star_big_buttonless_off" />
-
-     <item android:state_checked="true"
-         android:drawable="@drawable/btn_star_big_buttonless_on" />
-</selector>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 16b61f416..b79eb7a77 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -173,7 +173,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_alignTop="@id/from"
                         android:focusable="false"
-                        android:button="@drawable/star"
+                        style="?android:attr/starStyle"
                         android:checked="false" />
 
             </RelativeLayout>
diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml
index ac591f45d..b20523ae2 100644
--- a/res/values-v11/themes.xml
+++ b/res/values-v11/themes.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- We need to override the dark theme to *not* use the workarounds of Theme.K9.Dark in
-         res/values/ -->
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
+        <item name="composerBackgroundColor">@android:color/background_dark</item>
+    </style>
+
+    <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
+        <item name="composerBackgroundColor">@android:color/background_light</item>
     </style>
 
     <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index dcd75b5cc..0b17bf8ab 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -44,11 +44,9 @@
         <item name="messageListDividerColor">#ffcccccc</item>
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
-        <item name="composerBackgroundColor">@android:color/white</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
-        <item name="android:windowBackground">@android:color/black</item>
         <item name="iconFolder">@drawable/folder_dark</item>
         <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_dark</item>
         <item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
@@ -91,14 +89,16 @@
         <item name="messageListDividerColor">#ff333333</item>
         <item name="messageViewHeaderBackgroundColor">#000000</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
-        <item name="composerBackgroundColor">@android:color/black</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
+        <item name="composerBackgroundColor">@android:color/white</item>
     </style>
 
-    <!-- Work around some oddities -->
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="composerBackgroundColor">@android:color/black</item>
+        <!-- Work around some oddities -->
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>