diff --git a/app/src/main/res/drawable/toast_background.xml b/app/src/main/res/drawable/toast_background.xml
index f573ff9d95..561b7660de 100644
--- a/app/src/main/res/drawable/toast_background.xml
+++ b/app/src/main/res/drawable/toast_background.xml
@@ -2,8 +2,5 @@
-
-
-
\ No newline at end of file
+
+
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 2bde008cfe..2311a9d81c 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -100,9 +100,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
- android:backgroundTint="?attr/colorPrimary"
+ android:backgroundTint="@color/colorPrimaryButtonBackground"
android:text="@string/title_setup_go"
- android:textColor="@android:color/white"
+ android:textColor="@color/colorPrimaryButtonForeground"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuick" />
diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml
index 26326ae6c8..3e759ede46 100644
--- a/app/src/main/res/layout/toast.xml
+++ b/app/src/main/res/layout/toast.xml
@@ -16,5 +16,5 @@
android:gravity="center"
android:text="Message"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
- android:textColor="@android:color/white" />
+ android:textColor="@color/colorToastForeground" />
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8b902bcb15..a9de4022db 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,6 +13,12 @@
#fff
#ccc
+ #fff
+ #039be5
+
+ #fff
+ #039be5
+
#fff
#7f000000