diff --git a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_0.png b/res/drawable-hdpi-v11/ic_notify_check_mail_anim_0.png
deleted file mode 100644
index 837495c23..000000000
Binary files a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_0.png and /dev/null differ
diff --git a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_1.png b/res/drawable-hdpi-v11/ic_notify_check_mail_anim_1.png
deleted file mode 100644
index 6db06a75c..000000000
Binary files a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_1.png and /dev/null differ
diff --git a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_2.png b/res/drawable-hdpi-v11/ic_notify_check_mail_anim_2.png
deleted file mode 100644
index d27b881a7..000000000
Binary files a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_2.png and /dev/null differ
diff --git a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_3.png b/res/drawable-hdpi-v11/ic_notify_check_mail_anim_3.png
deleted file mode 100644
index 2d5837622..000000000
Binary files a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_3.png and /dev/null differ
diff --git a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_4.png b/res/drawable-hdpi-v11/ic_notify_check_mail_anim_4.png
deleted file mode 100644
index cc8891de5..000000000
Binary files a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_4.png and /dev/null differ
diff --git a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_5.png b/res/drawable-hdpi-v11/ic_notify_check_mail_anim_5.png
deleted file mode 100644
index 396582de5..000000000
Binary files a/res/drawable-hdpi-v11/ic_notify_check_mail_anim_5.png and /dev/null differ
diff --git a/res/drawable-hdpi-v11/ic_notify_new_mail.png b/res/drawable-hdpi-v11/ic_notify_new_mail.png
deleted file mode 100644
index 138569d33..000000000
Binary files a/res/drawable-hdpi-v11/ic_notify_new_mail.png and /dev/null differ
diff --git a/res/drawable-hdpi-v9/ic_notify_new_mail.png b/res/drawable-hdpi-v9/ic_notify_new_mail.png
deleted file mode 100644
index 279e527c2..000000000
Binary files a/res/drawable-hdpi-v9/ic_notify_new_mail.png and /dev/null differ
diff --git a/res/drawable-hdpi/button_indicator_next.png b/res/drawable-hdpi/button_indicator_next.png
deleted file mode 100644
index c7c553b1f..000000000
Binary files a/res/drawable-hdpi/button_indicator_next.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_0.png b/res/drawable-hdpi/ic_notify_check_mail_anim_0.png
index f9c230678..837495c23 100644
Binary files a/res/drawable-hdpi/ic_notify_check_mail_anim_0.png and b/res/drawable-hdpi/ic_notify_check_mail_anim_0.png differ
diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_1.png b/res/drawable-hdpi/ic_notify_check_mail_anim_1.png
index 7b71aa654..6db06a75c 100644
Binary files a/res/drawable-hdpi/ic_notify_check_mail_anim_1.png and b/res/drawable-hdpi/ic_notify_check_mail_anim_1.png differ
diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_2.png b/res/drawable-hdpi/ic_notify_check_mail_anim_2.png
index 128b81875..d27b881a7 100644
Binary files a/res/drawable-hdpi/ic_notify_check_mail_anim_2.png and b/res/drawable-hdpi/ic_notify_check_mail_anim_2.png differ
diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_3.png b/res/drawable-hdpi/ic_notify_check_mail_anim_3.png
index 9b33b637f..2d5837622 100644
Binary files a/res/drawable-hdpi/ic_notify_check_mail_anim_3.png and b/res/drawable-hdpi/ic_notify_check_mail_anim_3.png differ
diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_4.png b/res/drawable-hdpi/ic_notify_check_mail_anim_4.png
index 2f21c89d4..cc8891de5 100644
Binary files a/res/drawable-hdpi/ic_notify_check_mail_anim_4.png and b/res/drawable-hdpi/ic_notify_check_mail_anim_4.png differ
diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_5.png b/res/drawable-hdpi/ic_notify_check_mail_anim_5.png
index b8b6e8173..396582de5 100644
Binary files a/res/drawable-hdpi/ic_notify_check_mail_anim_5.png and b/res/drawable-hdpi/ic_notify_check_mail_anim_5.png differ
diff --git a/res/drawable-hdpi/ic_notify_new_mail.png b/res/drawable-hdpi/ic_notify_new_mail.png
index 26f423779..138569d33 100644
Binary files a/res/drawable-hdpi/ic_notify_new_mail.png and b/res/drawable-hdpi/ic_notify_new_mail.png differ
diff --git a/res/drawable-ldpi-v9/ic_notify_new_mail.png b/res/drawable-ldpi-v9/ic_notify_new_mail.png
deleted file mode 100644
index 1ddc6031e..000000000
Binary files a/res/drawable-ldpi-v9/ic_notify_new_mail.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_0.png b/res/drawable-mdpi-v11/ic_notify_check_mail_anim_0.png
deleted file mode 100644
index a8ea61f4e..000000000
Binary files a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_0.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_1.png b/res/drawable-mdpi-v11/ic_notify_check_mail_anim_1.png
deleted file mode 100644
index 7dc44ba19..000000000
Binary files a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_1.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_2.png b/res/drawable-mdpi-v11/ic_notify_check_mail_anim_2.png
deleted file mode 100644
index c05e17a4e..000000000
Binary files a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_2.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_3.png b/res/drawable-mdpi-v11/ic_notify_check_mail_anim_3.png
deleted file mode 100644
index 93f0ea1c0..000000000
Binary files a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_3.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_4.png b/res/drawable-mdpi-v11/ic_notify_check_mail_anim_4.png
deleted file mode 100644
index 2ab90799e..000000000
Binary files a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_4.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_5.png b/res/drawable-mdpi-v11/ic_notify_check_mail_anim_5.png
deleted file mode 100644
index f2b77f4ee..000000000
Binary files a/res/drawable-mdpi-v11/ic_notify_check_mail_anim_5.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_notify_new_mail.png b/res/drawable-mdpi-v11/ic_notify_new_mail.png
deleted file mode 100644
index 75e144e3f..000000000
Binary files a/res/drawable-mdpi-v11/ic_notify_new_mail.png and /dev/null differ
diff --git a/res/drawable-mdpi-v9/ic_notify_new_mail.png b/res/drawable-mdpi-v9/ic_notify_new_mail.png
deleted file mode 100644
index e037bf660..000000000
Binary files a/res/drawable-mdpi-v9/ic_notify_new_mail.png and /dev/null differ
diff --git a/res/drawable-mdpi/button_indicator_next.png b/res/drawable-mdpi/button_indicator_next.png
deleted file mode 100644
index 784d72225..000000000
Binary files a/res/drawable-mdpi/button_indicator_next.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_0.png b/res/drawable-mdpi/ic_notify_check_mail_anim_0.png
index 71b9cf449..a8ea61f4e 100644
Binary files a/res/drawable-mdpi/ic_notify_check_mail_anim_0.png and b/res/drawable-mdpi/ic_notify_check_mail_anim_0.png differ
diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_1.png b/res/drawable-mdpi/ic_notify_check_mail_anim_1.png
index c7d5c6d36..7dc44ba19 100644
Binary files a/res/drawable-mdpi/ic_notify_check_mail_anim_1.png and b/res/drawable-mdpi/ic_notify_check_mail_anim_1.png differ
diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_2.png b/res/drawable-mdpi/ic_notify_check_mail_anim_2.png
index 22b1b2fc6..c05e17a4e 100644
Binary files a/res/drawable-mdpi/ic_notify_check_mail_anim_2.png and b/res/drawable-mdpi/ic_notify_check_mail_anim_2.png differ
diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_3.png b/res/drawable-mdpi/ic_notify_check_mail_anim_3.png
index 4b2515534..93f0ea1c0 100644
Binary files a/res/drawable-mdpi/ic_notify_check_mail_anim_3.png and b/res/drawable-mdpi/ic_notify_check_mail_anim_3.png differ
diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_4.png b/res/drawable-mdpi/ic_notify_check_mail_anim_4.png
index 423609963..2ab90799e 100644
Binary files a/res/drawable-mdpi/ic_notify_check_mail_anim_4.png and b/res/drawable-mdpi/ic_notify_check_mail_anim_4.png differ
diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_5.png b/res/drawable-mdpi/ic_notify_check_mail_anim_5.png
index a1a0a9751..f2b77f4ee 100644
Binary files a/res/drawable-mdpi/ic_notify_check_mail_anim_5.png and b/res/drawable-mdpi/ic_notify_check_mail_anim_5.png differ
diff --git a/res/drawable-mdpi/ic_notify_new_mail.png b/res/drawable-mdpi/ic_notify_new_mail.png
index 686033f8d..75e144e3f 100644
Binary files a/res/drawable-mdpi/ic_notify_new_mail.png and b/res/drawable-mdpi/ic_notify_new_mail.png differ
diff --git a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_0.png b/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_0.png
deleted file mode 100644
index aa48274d0..000000000
Binary files a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_0.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_1.png b/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_1.png
deleted file mode 100644
index de8b57e18..000000000
Binary files a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_1.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_2.png b/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_2.png
deleted file mode 100644
index a9d28b9ff..000000000
Binary files a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_2.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_3.png b/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_3.png
deleted file mode 100644
index 5212e3bfd..000000000
Binary files a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_3.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_4.png b/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_4.png
deleted file mode 100644
index 9c3dbdd5b..000000000
Binary files a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_4.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_5.png b/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_5.png
deleted file mode 100644
index 3a4557820..000000000
Binary files a/res/drawable-xhdpi-v11/ic_notify_check_mail_anim_5.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v9/ic_notify_new_mail.png b/res/drawable-xhdpi-v9/ic_notify_new_mail.png
deleted file mode 100644
index f7f71b95b..000000000
Binary files a/res/drawable-xhdpi-v9/ic_notify_new_mail.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_moreoverflow_holo_dark.png b/res/drawable-xhdpi/ic_menu_moreoverflow_holo_dark.png
deleted file mode 100644
index a92fb1d4a..000000000
Binary files a/res/drawable-xhdpi/ic_menu_moreoverflow_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_moreoverflow_holo_light.png b/res/drawable-xhdpi/ic_menu_moreoverflow_holo_light.png
deleted file mode 100644
index 930ca8d95..000000000
Binary files a/res/drawable-xhdpi/ic_menu_moreoverflow_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_0.png b/res/drawable-xhdpi/ic_notify_check_mail_anim_0.png
index c3e6600ff..aa48274d0 100644
Binary files a/res/drawable-xhdpi/ic_notify_check_mail_anim_0.png and b/res/drawable-xhdpi/ic_notify_check_mail_anim_0.png differ
diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_1.png b/res/drawable-xhdpi/ic_notify_check_mail_anim_1.png
index d0e53fd3b..de8b57e18 100644
Binary files a/res/drawable-xhdpi/ic_notify_check_mail_anim_1.png and b/res/drawable-xhdpi/ic_notify_check_mail_anim_1.png differ
diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_2.png b/res/drawable-xhdpi/ic_notify_check_mail_anim_2.png
index 49089ff39..a9d28b9ff 100644
Binary files a/res/drawable-xhdpi/ic_notify_check_mail_anim_2.png and b/res/drawable-xhdpi/ic_notify_check_mail_anim_2.png differ
diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_3.png b/res/drawable-xhdpi/ic_notify_check_mail_anim_3.png
index 42f5daaaa..5212e3bfd 100644
Binary files a/res/drawable-xhdpi/ic_notify_check_mail_anim_3.png and b/res/drawable-xhdpi/ic_notify_check_mail_anim_3.png differ
diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_4.png b/res/drawable-xhdpi/ic_notify_check_mail_anim_4.png
index 470708ff2..9c3dbdd5b 100644
Binary files a/res/drawable-xhdpi/ic_notify_check_mail_anim_4.png and b/res/drawable-xhdpi/ic_notify_check_mail_anim_4.png differ
diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_5.png b/res/drawable-xhdpi/ic_notify_check_mail_anim_5.png
index fba9844cd..3a4557820 100644
Binary files a/res/drawable-xhdpi/ic_notify_check_mail_anim_5.png and b/res/drawable-xhdpi/ic_notify_check_mail_anim_5.png differ
diff --git a/res/drawable-xhdpi-v11/ic_notify_new_mail.png b/res/drawable-xhdpi/ic_notify_new_mail.png
similarity index 100%
rename from res/drawable-xhdpi-v11/ic_notify_new_mail.png
rename to res/drawable-xhdpi/ic_notify_new_mail.png
diff --git a/res/layout-v14/wizard_cancel.xml b/res/layout-v14/wizard_cancel.xml
deleted file mode 100644
index a8c816f20..000000000
--- a/res/layout-v14/wizard_cancel.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/cancel"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/cancel_action" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-    </LinearLayout>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout-v14/wizard_done.xml b/res/layout-v14/wizard_done.xml
deleted file mode 100644
index 6d2bf39d3..000000000
--- a/res/layout-v14/wizard_done.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/done"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/done_action" />
-    </LinearLayout>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout-v14/wizard_next.xml b/res/layout-v14/wizard_next.xml
deleted file mode 100644
index 46f8cde36..000000000
--- a/res/layout-v14/wizard_next.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/next_action" />
-    </LinearLayout>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout-v14/wizard_setup.xml b/res/layout-v14/wizard_setup.xml
deleted file mode 100644
index 2a447e6a9..000000000
--- a/res/layout-v14/wizard_setup.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/manual_setup"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/account_setup_basics_manual_setup_action" />
-
-        <Button
-            android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/next_action" />
-    </LinearLayout>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout-v14/wizard_welcome.xml b/res/layout-v14/wizard_welcome.xml
deleted file mode 100644
index 30877890e..000000000
--- a/res/layout-v14/wizard_welcome.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/import_settings"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/settings_import" />
-
-        <Button
-            android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/selectable_item_background"
-            android:text="@string/next_action" />
-    </LinearLayout>
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/wizard_cancel.xml b/res/layout/wizard_cancel.xml
index 893826232..a8c816f20 100644
--- a/res/layout/wizard_cancel.xml
+++ b/res/layout/wizard_cancel.xml
@@ -1,18 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
     <LinearLayout
-        android:layout_width="fill_parent"
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
-        android:gravity="bottom|left" >
+        android:orientation="horizontal" >
 
         <Button
             android:id="@+id/cancel"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/cancel_action" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
     </LinearLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/wizard_done.xml b/res/layout/wizard_done.xml
index 6ff67ad61..6d2bf39d3 100644
--- a/res/layout/wizard_done.xml
+++ b/res/layout/wizard_done.xml
@@ -1,18 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
     <LinearLayout
-        android:layout_width="fill_parent"
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
-        android:gravity="bottom|right" >
+        android:orientation="horizontal" >
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
 
         <Button
             android:id="@+id/done"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/done_action" />
     </LinearLayout>
 
diff --git a/res/layout/wizard_next.xml b/res/layout/wizard_next.xml
index 8ae0e3948..46f8cde36 100644
--- a/res/layout/wizard_next.xml
+++ b/res/layout/wizard_next.xml
@@ -1,18 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
     <LinearLayout
-        android:layout_width="fill_parent"
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
-        android:gravity="bottom|right" >
+        android:orientation="horizontal" >
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
 
         <Button
             android:id="@+id/next"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/next_action" />
     </LinearLayout>
 
diff --git a/res/layout/wizard_setup.xml b/res/layout/wizard_setup.xml
index cd5327624..2a447e6a9 100644
--- a/res/layout/wizard_setup.xml
+++ b/res/layout/wizard_setup.xml
@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
+    <LinearLayout
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
-        android:gravity="bottom|right" >
+        android:orientation="horizontal" >
 
         <Button
             android:id="@+id/manual_setup"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/account_setup_basics_manual_setup_action" />
 
         <Button
             android:id="@+id/next"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/next_action" />
-    </RelativeLayout>
+    </LinearLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/wizard_welcome.xml b/res/layout/wizard_welcome.xml
index 5b38d43a8..30877890e 100644
--- a/res/layout/wizard_welcome.xml
+++ b/res/layout/wizard_welcome.xml
@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/dividerHorizontal" />
+
+    <LinearLayout
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:drawable/bottom_bar"
-        android:gravity="bottom|right" >
+        android:orientation="horizontal" >
 
         <Button
             android:id="@+id/import_settings"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/settings_import" />
 
         <Button
             android:id="@+id/next"
-            android:layout_width="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:minWidth="@dimen/button_minWidth"
+            android:layout_weight="1"
+            android:background="@drawable/selectable_item_background"
             android:text="@string/next_action" />
-    </RelativeLayout>
+    </LinearLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/values-sw600dp-land-v14/styles.xml b/res/values-sw600dp-land/styles.xml
similarity index 100%
rename from res/values-sw600dp-land-v14/styles.xml
rename to res/values-sw600dp-land/styles.xml
diff --git a/res/values-sw600dp-port-v14/styles.xml b/res/values-sw600dp-port/styles.xml
similarity index 100%
rename from res/values-sw600dp-port-v14/styles.xml
rename to res/values-sw600dp-port/styles.xml
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
deleted file mode 100644
index 257591c16..000000000
--- a/res/values-v11/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textColor">#cccccc</item>
-    </style>
-
-    <style name="UnreadWidgetContainer">
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:background">@null</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="UnreadWidgetTextView">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowDy">1</item>
-        <item name="android:shadowRadius">4.0</item>
-    </style>
-
-</resources>
diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml
deleted file mode 100644
index f5d12a370..000000000
--- a/res/values-v11/themes.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="Theme.K9.Startup" parent="Theme.K9.Dark" />
-
-    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
-        <item name="composerBackgroundColor">@android:color/background_dark</item>
-        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
-        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
-    </style>
-
-    <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
-        <item name="composerBackgroundColor">@android:color/background_light</item>
-        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
-        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
-    </style>
-
-    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
-        <item name="backgroundColorChooseAccountHeader">#404040</item>
-    </style>
-
-</resources>
diff --git a/res/values-v14/themes.xml b/res/values-v14/themes.xml
deleted file mode 100644
index e0b863a6f..000000000
--- a/res/values-v14/themes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="Theme.K9.Startup" parent="@android:style/Theme.Holo.NoActionBar">
-        <item name="android:windowBackground">@android:color/black</item>
-    </style>
-
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e1ee146f8..532d5a0eb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,24 +19,24 @@
     </style>
 
     <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">#cccccc</item>
     </style>
 
     <style name="UnreadWidgetContainer">
-        <item name="android:paddingTop">2dp</item>
-        <item name="android:paddingLeft">2dp</item>
-        <item name="android:paddingRight">2dp</item>
-        <item name="android:paddingBottom">8.5dp</item>
-        <item name="android:background">@drawable/unread_widget_background</item>
-        <item name="android:gravity">bottom|center_horizontal</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingLeft">0dp</item>
+        <item name="android:paddingRight">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:background">@null</item>
+        <item name="android:gravity">center</item>
     </style>
 
     <style name="UnreadWidgetTextView">
-        <item name="android:textSize" tools:ignore="SpUsage">13dp</item>
-        <item name="android:background">@drawable/rounded_corners</item>
+        <item name="android:textSize">12sp</item>
         <item name="android:textColor">#ffffff</item>
         <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowRadius">2.0</item>
+        <item name="android:shadowDy">1</item>
+        <item name="android:shadowRadius">4.0</item>
     </style>
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 40cf9fb9a..ea6d383e5 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Theme.K9.Startup" parent="Theme.K9.Dark" />
+    <style name="Theme.K9.Startup" parent="@android:style/Theme.Holo.NoActionBar">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
 
     <style name="Theme.K9.Light.Base" parent="@android:style/Theme.Holo.Light">
         <item name="iconFolder">@drawable/folder_light</item>
@@ -108,24 +110,24 @@
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
-        <item name="composerBackgroundColor">@android:color/white</item>
+        <item name="composerBackgroundColor">@android:color/background_light</item>
+        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
+        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
     </style>
 
     <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>
+        <item name="composerBackgroundColor">@android:color/background_dark</item>
+        <item name="compatDividerVertical">?android:attr/dividerVertical</item>
+        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
     </style>
 
     <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">
         <item name="backgroundColorChooseAccountHeader">#cccccc</item>
     </style>
 
-    <!-- Prior to Honeycomb we always use the light theme for dialogs -->
-    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dialog.Light" />
+    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
+        <item name="backgroundColorChooseAccountHeader">#404040</item>
+    </style>
 
     <style name="Theme.K9.Dialog.Translucent.Dark" parent="@android:style/Theme.Holo.Dialog">
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -144,4 +146,5 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
     </style>
+
 </resources>