diff --git a/Habitica/res/drawable/task_form_control_bg.xml b/Habitica/res/drawable/task_form_control_bg.xml
index 612626f02..9c58286f2 100644
--- a/Habitica/res/drawable/task_form_control_bg.xml
+++ b/Habitica/res/drawable/task_form_control_bg.xml
@@ -2,11 +2,17 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?colorPrimaryDistinct" />
+            <solid android:color="?textColorTintedSecondary" />
             <corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
         </shape>
     </item>
 
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
+        </shape>
+    </item>
     <item android:bottom="2dp">
         <shape android:shape="rectangle">
             <solid android:color="?colorTintedBackgroundOffset" />
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 22b77a58a..229b721ec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -498,7 +498,7 @@ class TaskFormActivity : BaseActivity() {
             val view = CheckBox(this)
             view.setPadding(padding, view.paddingTop, view.paddingRight, view.paddingBottom)
             view.text = tag.name
-            view.setTextColor(getThemeColor(R.attr.tintedUiDetails))
+            view.setTextColor(getThemeColor(R.attr.textColorTintedPrimary))
             if (preselectedTags?.contains(tag.id) == true) {
                 view.isChecked = true
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
index ecfacc868..f0c1c486c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
@@ -105,7 +105,7 @@ private fun TaskDifficultySelection(
                         .background(HabiticaTheme.colors.tintedUiMain, MaterialTheme.shapes.medium)
                 )
             }
-            Image(icon, null, colorFilter = ColorFilter.tint(HabiticaTheme.colors.tintedUiDetails))
+            Image(icon, null, colorFilter = ColorFilter.tint(textColor.value))
         }
         Text(
             text,
diff --git a/version.properties b/version.properties
index 267497586..a7b7d53e5 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.1
-CODE=5051
\ No newline at end of file
+CODE=5071
\ No newline at end of file