diff --git a/app/src/main/res/layout-sw600dp-land/activity_setup.xml b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
index fcd55958882d18e251b18dcff4ac54709a45765c..eec5ead77f10f8f234525e109d2a2e2584d69fa5 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
@@ -43,6 +43,7 @@
     android:layout_marginBottom="24dp"
     android:layout_marginRight="24dp"
     android:tint="#ffffff"
+    app:tint="#ffffff"
     app:backgroundTint="#8A000000"
     app:elevation="0dip"
     app:fabSize="normal"
diff --git a/app/src/main/res/layout-sw600dp/activity_setup.xml b/app/src/main/res/layout-sw600dp/activity_setup.xml
index fcd55958882d18e251b18dcff4ac54709a45765c..eec5ead77f10f8f234525e109d2a2e2584d69fa5 100644
--- a/app/src/main/res/layout-sw600dp/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp/activity_setup.xml
@@ -43,6 +43,7 @@
     android:layout_marginBottom="24dp"
     android:layout_marginRight="24dp"
     android:tint="#ffffff"
+    app:tint="#ffffff"
     app:backgroundTint="#8A000000"
     app:elevation="0dip"
     app:fabSize="normal"
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 547e97acacf238d0c0c6a0338e7da258481b2773..2031241c05a102527d97d034ce36785f3f0d1e42 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -44,6 +44,8 @@
     android:layout_marginRight="16dp"
     android:tint="#ffffff"
     app:fabSize="normal"
-    tools:ignore="RtlHardcoded" />
+    app:tint="#ffffff"
+    tools:ignore="RtlHardcoded"
+    tools:src="@drawable/ic_arrow_right" />
 
 </merge>