diff --git a/res/layout/account_dialog_new.xml b/res/layout/account_dialog_new.xml
index 63e422bef..5165bdd61 100644
--- a/res/layout/account_dialog_new.xml
+++ b/res/layout/account_dialog_new.xml
@@ -39,10 +39,16 @@
         android:lines="1"
         android:text="@string/account_setup_basics_manual_setup_action"/>
 
-    <Button android:id="@+id/account_dialog_next"
-        android:text="@string/next_action"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:drawableRight="@drawable/button_indicator_next"/>
+        android:layout_marginTop="10dp">
+        <Button android:id="@+id/account_dialog_next"
+            android:text="@string/next_action"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawableRight="@drawable/button_indicator_next"  />
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/account_dialog_password.xml b/res/layout/account_dialog_password.xml
index b441fbca4..67917d232 100644
--- a/res/layout/account_dialog_password.xml
+++ b/res/layout/account_dialog_password.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical"
-              android:padding="10dp">
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="10dp">
 
     <TextView android:id="@+id/account_dialog_password_help"
         android:layout_width="wrap_content"
@@ -25,14 +25,16 @@
         android:layout_width="fill_parent"
         android:text="@string/account_setup_basics_manual_setup_action"/>
 
-    <Button android:id="@+id/account_dialog_next"
-        android:text="@string/next_action"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
         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"-->
-
+        android:layout_marginTop="10dp">
+        <Button android:id="@+id/account_dialog_next"
+            android:text="@string/next_action"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_centerInParent="true"
+            android:drawableRight="@drawable/button_indicator_next"  />
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file