diff --git a/res/drawable-hdpi/ic_button_add_contact_dark.png b/res/drawable-hdpi/ic_button_add_contact_dark.png
new file mode 100644
index 000000000..d22a3ea94
Binary files /dev/null and b/res/drawable-hdpi/ic_button_add_contact_dark.png differ
diff --git a/res/drawable-hdpi/ic_button_add_contact.png b/res/drawable-hdpi/ic_button_add_contact_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_button_add_contact.png
rename to res/drawable-hdpi/ic_button_add_contact_light.png
diff --git a/res/drawable-ldpi/ic_button_add_contact_dark.png b/res/drawable-ldpi/ic_button_add_contact_dark.png
new file mode 100644
index 000000000..7bb94245b
Binary files /dev/null and b/res/drawable-ldpi/ic_button_add_contact_dark.png differ
diff --git a/res/drawable-ldpi/ic_button_add_contact.png b/res/drawable-ldpi/ic_button_add_contact_light.png
similarity index 100%
rename from res/drawable-ldpi/ic_button_add_contact.png
rename to res/drawable-ldpi/ic_button_add_contact_light.png
diff --git a/res/drawable-mdpi/ic_button_add_contact_dark.png b/res/drawable-mdpi/ic_button_add_contact_dark.png
new file mode 100644
index 000000000..9d24b732f
Binary files /dev/null and b/res/drawable-mdpi/ic_button_add_contact_dark.png differ
diff --git a/res/drawable-mdpi/ic_button_add_contact.png b/res/drawable-mdpi/ic_button_add_contact_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_button_add_contact.png
rename to res/drawable-mdpi/ic_button_add_contact_light.png
diff --git a/res/drawable-xhdpi/ic_button_add_contact_dark.png b/res/drawable-xhdpi/ic_button_add_contact_dark.png
new file mode 100644
index 000000000..08d874d25
Binary files /dev/null and b/res/drawable-xhdpi/ic_button_add_contact_dark.png differ
diff --git a/res/drawable-xhdpi/ic_button_add_contact.png b/res/drawable-xhdpi/ic_button_add_contact_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_button_add_contact.png
rename to res/drawable-xhdpi/ic_button_add_contact_light.png
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index dd02a659c..c4beee4af 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -55,7 +55,7 @@
                     <ImageButton
                         android:id="@+id/add_to"
                         android:contentDescription="@string/message_compose_description_add_to"
-                        android:src="@drawable/ic_button_add_contact"
+                        android:src="?attr/messageComposeAddContactImage"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:padding="8dip"
@@ -87,7 +87,7 @@
                     <ImageButton
                         android:id="@+id/add_cc"
                         android:contentDescription="@string/message_compose_description_add_cc"
-                        android:src="@drawable/ic_button_add_contact"
+                        android:src="?attr/messageComposeAddContactImage"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="8dip"
@@ -123,7 +123,7 @@
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:padding="8dip"
-                        android:src="@drawable/ic_button_add_contact"/>
+                        android:src="?attr/messageComposeAddContactImage"/>
 
                 </LinearLayout>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a89956faf..0cb0714d4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -46,6 +46,7 @@
         <attr name="messageListDividerColor" format="reference|color"/>
         <attr name="messageViewHeaderBackgroundColor" format="reference|color"/>
         <attr name="messageViewAttachmentBackground" format="reference"/>
+        <attr name="messageComposeAddContactImage" format="reference"/>
         <attr name="composerBackgroundColor" format="color"/>
 
     </declare-styleable>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index dda884e68..685eafe6e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -45,6 +45,7 @@
         <item name="messageListDividerColor">#ffcccccc</item>
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
+        <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_light</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -91,6 +92,7 @@
         <item name="messageListDividerColor">#ff333333</item>
         <item name="messageViewHeaderBackgroundColor">#000000</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
+        <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_dark</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">