diff --git a/res/layout/welcome_message.xml b/res/layout/welcome_message.xml
index 9f6358b26..f33e790df 100644
--- a/res/layout/welcome_message.xml
+++ b/res/layout/welcome_message.xml
@@ -23,14 +23,6 @@
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="14sp" />
 
-            <Button
-                android:id="@+id/import_settings"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:minWidth="@dimen/button_minWidth"
-                android:text="@string/settings_import" />
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="0dip"
@@ -38,6 +30,35 @@
         </LinearLayout>
     </ScrollView>
 
-    <include layout="@layout/wizard_next" />
+    <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>
 
 </LinearLayout>
\ No newline at end of file