diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml
index 001b81cc9..52acd3873 100644
--- a/app/src/main/res/values-v11/styles.xml
+++ b/app/src/main/res/values-v11/styles.xml
@@ -2,6 +2,8 @@
 <resources>
 
     <style name="SwapTheme.Wizard" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorButtonNormal">@color/swap_bright_blue</item>
+        <item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>
         <item name="android:actionButtonStyle">@style/SwapTheme.Wizard.ActionButton</item>
     </style>
 
diff --git a/app/src/main/res/values-v17/styles.xml b/app/src/main/res/values-v17/styles.xml
index bf5eeee8b..1500affdb 100644
--- a/app/src/main/res/values-v17/styles.xml
+++ b/app/src/main/res/values-v17/styles.xml
@@ -4,11 +4,34 @@
     <style name="CaptionTextV17" parent="CaptionTextBase">
         <item name="android:textDirection">locale</item>
     </style>
+
     <style name="CaptionText" parent="CaptionTextV17" />
 
     <style name="BodyTextV17" parent="BodyTextV16">
         <item name="android:textDirection">locale</item>
     </style>
+
     <style name="BodyText" parent="BodyTextV17" />
 
+    <style name="SwapTheme.AppList.SwapSuccess" parent="SwapTheme.AppList.SwapSuccessBase">
+        <item name="android:textAlignment">center</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+
+    <style name="SwapTheme.AppList.SwapSuccessDetails" parent="SwapTheme.AppList.SwapSuccessDetailsBase">
+        <item name="android:textAlignment">center</item>
+    </style>
+
+    <style name="SwapTheme.StartSwap.MainText" parent="SwapTheme.StartSwap.MainTextBase">
+        <item name="android:textAlignment">center</item>
+    </style>
+
+    <style name="SwapTheme.Wizard.Text" parent="SwapTheme.Wizard.TextBase">
+        <item name="android:textAlignment">center</item>
+    </style>
+
+    <style name="SwapTheme.Wizard.MainText" parent="SwapTheme.Wizard.MainTextBase">
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5a9c2e85c..b6ff997b4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -103,8 +103,6 @@
 
     <style name="SwapTheme.Wizard" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorButtonNormal">@color/swap_bright_blue</item>
-        <item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>
-        <item name="android:actionButtonStyle">@style/SwapTheme.Wizard.ActionButton</item>
         <item name="actionButtonStyle">@style/SwapTheme.Wizard.ActionButton</item>
         <item name="actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>
     </style>
@@ -125,17 +123,16 @@
     <style name="SwapTheme.AppList.ListItem" parent="AppThemeLight">
     </style>
 
-    <style name="SwapTheme.AppList.SwapSuccess">
-        <item name="android:textAlignment">center</item>
+    <style name="SwapTheme.AppList.SwapSuccessBase">
         <item name="android:gravity">center</item>
         <item name="android:textSize">25.7sp</item> <!-- 46px * 96dpi / 160dpi -->
         <item name="android:paddingTop">28dp</item> <!-- 50px * 96dpi / 160dpi -->
         <item name="android:paddingBottom">20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
-        <item name="android:fontFamily">sans-serif-light</item>
     </style>
 
-    <style name="SwapTheme.AppList.SwapSuccessDetails">
-        <item name="android:textAlignment">center</item>
+    <style name="SwapTheme.AppList.SwapSuccess" parent="SwapTheme.AppList.SwapSuccessBase" />
+
+    <style name="SwapTheme.AppList.SwapSuccessDetailsBase">
         <item name="android:gravity">center</item>
         <item name="android:textSize">20.1sp</item> <!-- 36px * 96dpi / 160dpi -->
         <item name="android:paddingTop">20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
@@ -143,8 +140,9 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="SwapTheme.StartSwap.MainText">
-        <item name="android:textAlignment">center</item>
+    <style name="SwapTheme.AppList.SwapSuccessDetails" parent="SwapTheme.AppList.SwapSuccessDetailsBase" />
+
+    <style name="SwapTheme.StartSwap.MainTextBase">
         <item name="android:gravity">center</item>
         <item name="android:textSize">20.1sp</item> <!-- 36px * 96dpi / 160dpi -->
         <item name="android:paddingLeft">28dp</item> <!-- 50px * 96dpi / 160dpi -->
@@ -153,14 +151,18 @@
         <item name="android:paddingBottom">16.8dp</item> <!-- 30px * 96dpi / 160dpi -->
     </style>
 
-    <style name="SwapTheme.Wizard.Text">
-        <item name="android:textAlignment">center</item>
+    <style name="SwapTheme.StartSwap.MainText" parent="SwapTheme.StartSwap.MainTextBase">
+    </style>
+
+    <style name="SwapTheme.Wizard.TextBase">
         <item name="android:gravity">center</item>
         <item name="android:textColor">#fff</item>
         <item name="android:textColorPrimary">#fff</item>
         <item name="android:textColorSecondary">#fff</item>
     </style>
 
+    <style name="SwapTheme.Wizard.Text" parent="SwapTheme.Wizard.TextBase" />
+
     <style name="SwapTheme.Wizard.Text.Toolbar" parent="SwapTheme.Wizard.Text">
         <item name="android:textSize">22sp</item>
     </style>
@@ -173,14 +175,15 @@
         <item name="android:paddingBottom">5dp</item>
     </style>
 
-    <style name="SwapTheme.Wizard.MainText" parent="@style/SwapTheme.Wizard.Text">
+    <style name="SwapTheme.Wizard.MainTextBase" parent="@style/SwapTheme.Wizard.Text">
         <item name="android:paddingLeft">40dp</item>
         <item name="android:paddingRight">40dp</item>
         <item name="android:paddingTop">20dp</item>
         <item name="android:paddingBottom">15dp</item>
-        <item name="android:fontFamily">sans-serif-light</item>
     </style>
 
+    <style name="SwapTheme.Wizard.MainText" parent="SwapTheme.Wizard.MainTextBase" />
+
     <style name="SwapTheme.Wizard.LocalIpAddress" parent="@style/SwapTheme.Wizard.Text">
         <item name="android:textSize">20sp</item>
         <item name="android:paddingLeft">40dp</item>
@@ -198,20 +201,10 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="SwapTheme.Wizard.ButtonBase" parent="Widget.AppCompat.Button">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:padding">19dp</item> <!-- 34px * 96dpi / 160dpi -->
-        <item name="android:textSize">20.25sp</item> <!-- 36px * 96dpi / 160dpi -->
-        <item name="android:textColor">#fff</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-    </style>
-
     <!--
     Buttons down the bottom of the screen, which prompt the user for further
     info, or to change the process somehow (e.g. Use Bluetooth instead of Wifi).
     -->
-    <!--<style name="SwapTheme.Wizard.OptionButton" parent="SwapTheme.Wizard.ButtonBase">-->
     <style name="SwapTheme.Wizard.OptionButton" parent="Widget.AppCompat.Button">
         <item name="android:textColor">@android:color/white</item>
         <item name="android:layout_width">wrap_content</item>