diff --git a/res/drawable-xhdpi/item_focused.9.png b/res/drawable-xhdpi/item_focused.9.png
new file mode 100644
index 000000000..b545f8e57
Binary files /dev/null and b/res/drawable-xhdpi/item_focused.9.png differ
diff --git a/res/drawable-xhdpi/item_pressed.9.png b/res/drawable-xhdpi/item_pressed.9.png
new file mode 100644
index 000000000..e4b33935a
Binary files /dev/null and b/res/drawable-xhdpi/item_pressed.9.png differ
diff --git a/res/drawable/selectable_item_background.xml b/res/drawable/selectable_item_background.xml
new file mode 100644
index 000000000..0eafef893
--- /dev/null
+++ b/res/drawable/selectable_item_background.xml
@@ -0,0 +1,22 @@
+<!--
+  Copyright 2012 Roman Nurik
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/item_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/item_focused" android:state_focused="true" />
+    <item android:drawable="@drawable/item_focused" android:state_selected="true" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/res/layout-v11/wizard_cancel.xml b/res/layout-v11/wizard_cancel.xml
new file mode 100644
index 000000000..a8c816f20
--- /dev/null
+++ b/res/layout-v11/wizard_cancel.xml
@@ -0,0 +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
+        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-v11/wizard_done.xml b/res/layout-v11/wizard_done.xml
new file mode 100644
index 000000000..6d2bf39d3
--- /dev/null
+++ b/res/layout-v11/wizard_done.xml
@@ -0,0 +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
+        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-v11/wizard_next.xml b/res/layout-v11/wizard_next.xml
new file mode 100644
index 000000000..46f8cde36
--- /dev/null
+++ b/res/layout-v11/wizard_next.xml
@@ -0,0 +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
+        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-v11/wizard_setup.xml b/res/layout-v11/wizard_setup.xml
new file mode 100644
index 000000000..2a447e6a9
--- /dev/null
+++ b/res/layout-v11/wizard_setup.xml
@@ -0,0 +1,35 @@
+<?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-v11/wizard_welcome.xml b/res/layout-v11/wizard_welcome.xml
new file mode 100644
index 000000000..30877890e
--- /dev/null
+++ b/res/layout-v11/wizard_welcome.xml
@@ -0,0 +1,35 @@
+<?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/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 50f6c4d67..4d7129373 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -7,8 +7,8 @@
 
 <ScrollView
     android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
-    android:layout_marginBottom="54dip" 
+    android:layout_height="0dp"
+    android:layout_weight="1"
     android:padding="6dip"
     android:fadingEdge="none"
     android:scrollbarStyle="outsideInset">
@@ -42,34 +42,5 @@
         />
     </LinearLayout>
     </ScrollView>
-    <RelativeLayout
-        android:layout_marginTop="-45dip" 
-        android:padding="0dip"
-        android:layout_alignParentBottom="true"
-        android:gravity="bottom|right" 
-        android:background="@android:drawable/bottom_bar"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent">
-        <Button
-            android:id="@+id/manual_setup"
-            android:text="@string/account_setup_basics_manual_setup_action"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginBottom="-4dip" 
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="false" 
-            />
-        <Button
-            android:id="@+id/next"
-            android:text="@string/next_action"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:layout_marginBottom="-4dip" 
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false" 
-            />
-    </RelativeLayout>
+    <include layout="@layout/wizard_setup"/>
 </LinearLayout>
diff --git a/res/layout/account_setup_check_settings.xml b/res/layout/account_setup_check_settings.xml
index 3c7731cee..e1648b28d 100644
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@@ -6,8 +6,8 @@
     android:orientation="vertical">
 <ScrollView
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginBottom="54dip"
+    android:layout_height="0dp"
+    android:layout_weight="1"
     android:padding="6dip"
     android:fadingEdge="none"
     android:scrollbarStyle="outsideInset">
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 2d8929c12..fa2b70122 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -7,8 +7,8 @@
 
 <ScrollView
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginBottom="54dip"
+    android:layout_height="0dp"
+    android:layout_weight="1"
     android:padding="6dip"
     android:fadingEdge="none"
     android:scrollbarStyle="outsideInset">
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index dc0affc3b..efe6ed640 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -7,8 +7,8 @@
 
 <ScrollView
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginBottom="54dip" 
+    android:layout_height="0dp"
+    android:layout_weight="1"
     android:padding="6dip"
     android:fadingEdge="none"
     android:scrollbarStyle="outsideInset">
@@ -38,22 +38,5 @@
         android:layout_weight="1" />
 </LinearLayout>
 </ScrollView>
-    <RelativeLayout
-        android:layout_marginTop="-45dip" 
-        android:padding="0dip"
-        android:layout_alignParentBottom="true"
-        android:gravity="bottom|right" 
-        android:background="@android:drawable/bottom_bar"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent">
-        <Button
-            android:id="@+id/done"
-            android:text="@string/done_action"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginBottom="-4dip" 
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false" 
-            />
-    </RelativeLayout>
+    <include layout="@layout/wizard_done" />
 </LinearLayout>
diff --git a/res/layout/account_setup_options.xml b/res/layout/account_setup_options.xml
index f7961ce73..55330c6dc 100644
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@@ -7,9 +7,10 @@
 
 <ScrollView
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_marginBottom="54dip" 
-	android:fadingEdge="none"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:layout_marginBottom="54dip"
+    android:fadingEdge="none"
     android:padding="6dip"
     android:scrollbarStyle="outsideInset">
     <LinearLayout
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index 21d614198..5952029f5 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -2,14 +2,14 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-	android:layout_height="fill_parent"
+    android:layout_height="fill_parent"
     android:layout_width="fill_parent">
- 
+
 <ScrollView
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1"
     android:padding="6dip"
-    android:layout_marginBottom="54dip" 
     android:fadingEdge="none"
     android:scrollbarStyle="outsideInset">
     <LinearLayout
@@ -108,6 +108,6 @@
             android:layout_height="0dip"
             android:layout_weight="1" />
     </LinearLayout>
-	</ScrollView>
+    </ScrollView>
     <include layout="@layout/wizard_next" />
 </LinearLayout>
diff --git a/res/layout/welcome_message.xml b/res/layout/welcome_message.xml
index f33e790df..a8da14736 100644
--- a/res/layout/welcome_message.xml
+++ b/res/layout/welcome_message.xml
@@ -6,8 +6,8 @@
 
     <ScrollView
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_marginBottom="54dip"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:fadingEdge="none" >
 
         <LinearLayout
@@ -30,35 +30,6 @@
         </LinearLayout>
     </ScrollView>
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="-45dip"
-        android:background="@android:drawable/bottom_bar"
-        android:gravity="bottom|right"
-        android:padding="0dip" >
-
-        <Button
-            android:id="@+id/import_settings"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="false"
-            android:layout_marginBottom="-4dip"
-            android:minWidth="@dimen/button_minWidth"
-            android:text="@string/settings_import" />
-
-        <Button
-            android:id="@+id/next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false"
-            android:layout_marginBottom="-4dip"
-            android:drawableRight="@drawable/button_indicator_next"
-            android:minWidth="@dimen/button_minWidth"
-            android:text="@string/next_action" />
-    </RelativeLayout>
+    <include layout="@layout/wizard_welcome" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/wizard_cancel.xml b/res/layout/wizard_cancel.xml
index 7981957d5..893826232 100644
--- a/res/layout/wizard_cancel.xml
+++ b/res/layout/wizard_cancel.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_marginTop="-45dip" 
-        android:padding="0dip"
-        android:layout_alignParentBottom="true"
-        android:gravity="bottom|left" 
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
         android:background="@android:drawable/bottom_bar"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent">
+        android:gravity="bottom|left" >
+
         <Button
             android:id="@+id/cancel"
-            android:text="@string/cancel_action"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_marginBottom="-4dip" 
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="false" 
-            />
-    </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/cancel_action" />
+    </LinearLayout>
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/wizard_done.xml b/res/layout/wizard_done.xml
new file mode 100644
index 000000000..6ff67ad61
--- /dev/null
+++ b/res/layout/wizard_done.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/bottom_bar"
+        android:gravity="bottom|right" >
+
+        <Button
+            android:id="@+id/done"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableRight="@drawable/button_indicator_next"
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/done_action" />
+    </LinearLayout>
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/wizard_next.xml b/res/layout/wizard_next.xml
index 0949cf303..8ae0e3948 100644
--- a/res/layout/wizard_next.xml
+++ b/res/layout/wizard_next.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_marginTop="-45dip" 
-        android:padding="0dip"
-        android:layout_alignParentBottom="true"
-        android:gravity="bottom|right" 
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
         android:background="@android:drawable/bottom_bar"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent">
+        android:gravity="bottom|right" >
+
         <Button
             android:id="@+id/next"
-            android:text="@string/next_action"
-            android:minWidth="@dimen/button_minWidth"
-            android:layout_height="wrap_content"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:drawableRight="@drawable/button_indicator_next"
-            android:layout_marginBottom="-4dip" 
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="false" 
-            />
-    </RelativeLayout>
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/next_action" />
+    </LinearLayout>
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/wizard_setup.xml b/res/layout/wizard_setup.xml
new file mode 100644
index 000000000..cd5327624
--- /dev/null
+++ b/res/layout/wizard_setup.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/bottom_bar"
+        android:gravity="bottom|right" >
+
+        <Button
+            android:id="@+id/manual_setup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/account_setup_basics_manual_setup_action" />
+
+        <Button
+            android:id="@+id/next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:drawableRight="@drawable/button_indicator_next"
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/next_action" />
+    </RelativeLayout>
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/wizard_welcome.xml b/res/layout/wizard_welcome.xml
new file mode 100644
index 000000000..5b38d43a8
--- /dev/null
+++ b/res/layout/wizard_welcome.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/bottom_bar"
+        android:gravity="bottom|right" >
+
+        <Button
+            android:id="@+id/import_settings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/settings_import" />
+
+        <Button
+            android:id="@+id/next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:drawableRight="@drawable/button_indicator_next"
+            android:minWidth="@dimen/button_minWidth"
+            android:text="@string/next_action" />
+    </RelativeLayout>
+
+</merge>
\ No newline at end of file