diff --git a/app/src/main/res/values-sw600dp/themes_base.xml b/app/src/main/res/values-sw600dp/themes_base.xml
index 98f97ef546f0e098b5e1ed9a4327a8d21e77a1af..6de25da0149d03f5c78dda7c7f3345a1e97e90c1 100644
--- a/app/src/main/res/values-sw600dp/themes_base.xml
+++ b/app/src/main/res/values-sw600dp/themes_base.xml
@@ -19,7 +19,9 @@
 
 <resources>
 
-  <style name="Theme.SetupTheme" parent="Theme.AppTheme.Light.NoActionBar">
+  <style name="Theme.SetupTheme" parent="Theme.ChatTheme.Material_Light">
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
     <item name="android:windowBackground">?attr/colorPrimary</item>
   </style>
 </resources>
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 9aed501fe353083424e36a63946397688cef31cb..db2505afb0ddaeccdccff33dfb0e7b07573fc623 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -57,18 +57,9 @@
 
   <style name="Theme.Base.ChatTheme.Light" parent="Theme.AppTheme.Light.NoActionBar" />
 
-  <style name="Theme.SetupTheme" parent="Theme.AppTheme.Light.NoActionBar">
-    <item name="actionBarTheme">@style/Widget.AppBarOverlay</item>
-    <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light</item>
-
-    <item name="colorTextPrimary">#ffffffff</item>
-    <item name="colorTextPrimaryInverse">#de000000</item>
-    <item name="colorTextSecondary">#b3ffffff</item>
-    <item name="colorTextSecondaryInverse">#8a000000</item>
-    <item name="colorDivider">#1FFFFFFF</item>
-    <item name="android:textColorHint">?colorTextSecondary</item>
-
-    <item name="colorBackground">#FAFAFA</item>
+  <style name="Theme.SetupTheme" parent="Theme.ChatTheme.Material_Light">
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
   </style>
 
   <style name="Theme.SplashTheme" parent="Theme.AppTheme.Light.NoActionBar">