diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b6fa5f8796..35051e0751 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -170,6 +170,7 @@
         <activity
             android:name=".startupwizard.SetupWizardActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/AppTheme.SetupWizard"
             android:label="@string/title_activity_setup_wizard"></activity>
     </application>
 
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
index 906d579a47..33dc02457a 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
@@ -76,12 +76,6 @@ public class SWDefinition {
                 .add(new SWInfotext()
                         .label(R.string.backupismissing)
                         .visibility(() -> !ImportExportPrefs.file.exists()))
-               .add(new SWButton()
-                        .text(R.string.exitwizard)
-                        .action(() -> {
-                            SP.putBoolean(R.string.key_setupwizard_processed, true);
-                            getActivity().finish();
-                        }))
         )
         .add(new SWScreen(R.string.language)
                 .skippable(false)
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
index bdde6d00d2..25b31d89c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
@@ -60,6 +60,11 @@ public class SetupWizardActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
+        if (currentWizardPage == 0) OKDialog.showConfirmation(this, MainApp.gs(R.string.exitwizard), this::finish);
+        else showPreviousPage(null);
+    }
+
+    public void exitPressed(View view) {
         OKDialog.showConfirmation(this, MainApp.gs(R.string.exitwizard), this::finish);
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_exit_to_app.png b/app/src/main/res/drawable-hdpi/ic_exit_to_app.png
new file mode 100644
index 0000000000..f028ac5539
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_exit_to_app.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_exit_to_app.png b/app/src/main/res/drawable-mdpi/ic_exit_to_app.png
new file mode 100644
index 0000000000..d2531b3e46
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_exit_to_app.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png
new file mode 100644
index 0000000000..d35a1f0d4e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png
new file mode 100644
index 0000000000..884eb3b242
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png
new file mode 100644
index 0000000000..903a7230fd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png differ
diff --git a/app/src/main/res/layout/activity_setupwizard.xml b/app/src/main/res/layout/activity_setupwizard.xml
index ee43383d58..6141bd53b6 100644
--- a/app/src/main/res/layout/activity_setupwizard.xml
+++ b/app/src/main/res/layout/activity_setupwizard.xml
@@ -1,29 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".startupwizard.SetupWizardActivity">
 
+    <ImageButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:background="@android:color/transparent"
+        android:onClick="exitPressed"
+        app:srcCompat="@drawable/ic_exit_to_app" />
+
     <TextView
         android:id="@+id/sw_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:keepScreenOn="true"
-        android:textColor="#33b5e5"
-        android:textSize="20dp"
-        android:textStyle="bold" />
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="32sp"
+        tools:text="Title" />
 
-    <LinearLayout
-        android:id="@+id/sw_content_fields"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical|center_horizontal"
-        android:orientation="vertical">
-
-    </LinearLayout>
+        android:layout_height="0dp"
+        android:layout_weight="1">
+        <LinearLayout
+            android:id="@+id/sw_content_fields"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical|center_horizontal"
+            android:orientation="vertical"
+            android:padding="16dp" />
+    </ScrollView>
 
     <LinearLayout
         android:id="@+id/sw_content_controls"
@@ -31,42 +46,41 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:background="@color/black_overlay"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
 
         <Button
             android:id="@+id/previous_button"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:onClick="showPreviousPage"
-            android:text="@string/setupwizard_previous" />
+            android:text="@string/setupwizard_previous"
+            android:textColor="#FFFFFF" />
 
-        <Button
-            android:id="@+id/skip_button"
+        <View
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:onClick="showNextPage"
-            android:text="@string/setupwizard_skip"
-            android:visibility="invisible" />
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
         <Button
             android:id="@+id/next_button"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:onClick="showNextPage"
             android:text="@string/setupwizard_next"
-            android:visibility="gone" />
+            android:textColor="#FFFFFF" />
 
         <Button
             android:id="@+id/finish_button"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:background="@android:color/transparent"
             android:onClick="finishSetupWizard"
             android:text="@string/setupwizard_finish"
-            android:visibility="gone" />
+            android:textColor="#FFFFFF" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4f2a8c7429..050d10d4bf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -72,4 +72,10 @@
     <color name="deviationred">#72FF0000</color>
     <color name="deviationblack">#72000000</color>
 
+
+    <color name="swColorPrimary">#303030</color>
+    <color name="swColorPrimaryDark">#303030</color>
+    <color name="swColorAccent">#FFEB3B</color>
+    <color name="swColorBackground">#303030</color>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2ffdad85c2..5519bcb151 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,5 +24,12 @@
         <item name="android:textSize">10sp</item>
     </style>
 
+    <style name="AppTheme.SetupWizard" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorPrimary">@color/swColorPrimary</item>
+        <item name="colorPrimaryDark">@color/swColorPrimaryDark</item>
+        <item name="colorAccent">@color/swColorAccent</item>
+        <item name="android:windowBackground">@color/swColorBackground</item>
+    </style>
+
      <!-- Preferences -->
 </resources>