diff --git a/F-Droid/res/layout/swap_join_wifi.xml b/F-Droid/res/layout/swap_join_wifi.xml
index 0c9e48bc0..bf24e6ff4 100644
--- a/F-Droid/res/layout/swap_join_wifi.xml
+++ b/F-Droid/res/layout/swap_join_wifi.xml
@@ -5,6 +5,7 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       xmlns:tools="http://schemas.android.com/tools"
+      android:background="@color/swap_blue"
       tools:context=".views.swap.SwapActivity">
 
     <TextView
@@ -52,6 +53,7 @@
             android:layout_height="wrap_content"
             android:text="@string/swap_view_available_networks"
             android:id="@+id/wifi_available_networks_prompt"
+            style="@style/SwapTheme.Wizard.Text"
             android:layout_centerHorizontal="true"
             android:layout_below="@id/wifi_ssid"
             android:paddingBottom="20dp"/>
diff --git a/F-Droid/res/layout/swap_nfc.xml b/F-Droid/res/layout/swap_nfc.xml
index f58ba7fc7..33deea105 100644
--- a/F-Droid/res/layout/swap_nfc.xml
+++ b/F-Droid/res/layout/swap_nfc.xml
@@ -4,6 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/swap_blue"
     android:paddingTop="38.8dp"> <!-- 69px * 96dpi / 160dpi -->
 
     <ImageView
@@ -25,6 +26,7 @@
     <CheckBox
             android:id="@+id/checkbox_dont_show"
             android:text="@string/swap_dont_show_again"
+            style="@style/SwapTheme.Wizard.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/text_description"
diff --git a/F-Droid/res/layout/swap_wifi_qr.xml b/F-Droid/res/layout/swap_wifi_qr.xml
index 3e461aeaa..ae6a11d76 100644
--- a/F-Droid/res/layout/swap_wifi_qr.xml
+++ b/F-Droid/res/layout/swap_wifi_qr.xml
@@ -3,6 +3,7 @@
 <org.fdroid.fdroid.views.swap.views.WifiQrView
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/swap_blue"
     android:layout_height="match_parent"
     android:layout_width="wrap_content">
 
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index a0522db1a..4c49996c2 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -33,9 +33,9 @@
         <!-- customizations that are not API-level specific go here. -->
     </style>
 
-    <style name="SwapTheme.Wizard" parent="AppThemeDark">
-        <item name="android:windowBackground">@drawable/swap_window_background</item>
-        <item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>
+    <style name="SwapTheme.Wizard" parent="AppThemeLightWithDarkActionBar">
+        <!--<item name="android:windowBackground">@drawable/swap_window_background</item>-->
+        <!--<item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>-->
         <item name="android:actionButtonStyle">@style/SwapTheme.Wizard.ActionButton</item>
     </style>