diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index d7670a0c6..b5db0e555 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -58,4 +58,9 @@
 
     <color name="widget_background">#2B203A</color>
     <color name="text_gold">@color/yellow_100</color>
+
+    <color name="text_green10_green500">@color/green_500</color>
+    <color name="gray200_gray400">@color/gray_400</color>
+    <color name="gray700_gray10">@color/gray_10</color>
+
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 2aa694a7a..9ce855bde 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -125,4 +125,8 @@
     <color name="error_banner_background">@color/maroon_5</color>
     <color name="text_green1_green500">@color/green_1</color>
     <color name="text_gold">@color/yellow_1</color>
+
+    <color name="text_green10_green500">@color/green_10</color>
+    <color name="gray200_gray400">@color/gray_200</color>
+    <color name="gray700_gray10">@color/gray_700</color>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
index debc0f55c..8d473b0a7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
@@ -205,6 +205,17 @@ class HabiticaColors(
             colorResource(if (hasIcon) R.color.content_background else R.color.content_background_offset)
         }
     }
+
+    @Composable
+    fun basicTextColor(): Color {
+        return colorResource(R.color.gray200_gray400)
+    }
+
+    @Composable
+    fun basicButtonColor(): Color {
+        return colorResource(R.color.gray700_gray10)
+    }
+
 }
 
 class HabiticaTypography {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
index 0332c7d2c..0c720238f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
@@ -177,7 +177,7 @@ fun AppHeaderView(
                         )
                     } else if (user?.preferences?.disableClasses != true && user?.flags?.classSelected == false) {
                         HabiticaButton(
-                            background = MaterialTheme.colors.primarySurface,
+                            background = HabiticaTheme.colors.basicButtonColor(),
                             color = MaterialTheme.colors.onPrimary,
                             onClick = {
                                 MainNavigationController.navigate(R.id.classSelectionActivity)
@@ -186,7 +186,10 @@ fun AppHeaderView(
                             fontSize = 14.sp,
                             modifier = Modifier.height(28.dp)
                         ) {
-                            Text(stringResource(R.string.choose_class))
+                            Text(
+                                text = stringResource(R.string.choose_class),
+                                color = HabiticaTheme.colors.basicTextColor()
+                            )
                         }
                     } else {
                         Spacer(modifier = Modifier.weight(1f))