diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png
index 2f56a45d1..86e6a5406 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png and b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png
index d6178d6f0..4bb74265b 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png and b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png
index 11fe6cb21..5c5df7ce8 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png and b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png
index 11fe6cb21..5c5df7ce8 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png and b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png
index b89868030..39d13ca71 100644
Binary files a/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png and b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png differ
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
index 77d6dd77e..913449df1 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
@@ -117,6 +117,7 @@ class CheckmarkButtonView(
 
     private inner class Drawer {
         private val rect = RectF()
+        private val bgColor = sres.getColor(R.attr.cardBgColor)
         private val lowContrastColor = sres.getColor(R.attr.contrast40)
         private val mediumContrastColor = sres.getColor(R.attr.contrast60)
 
@@ -128,9 +129,7 @@ class CheckmarkButtonView(
 
         fun draw(canvas: Canvas) {
             paint.color = when (value) {
-                YES_MANUAL -> color
-                YES_AUTO -> mediumContrastColor
-                SKIP -> color
+                YES_MANUAL, YES_AUTO, SKIP -> color
                 NO -> {
                     if (preferences.areQuestionMarksEnabled()) mediumContrastColor
                     else lowContrastColor
@@ -146,6 +145,13 @@ class CheckmarkButtonView(
                 }
                 else -> R.string.fa_check
             }
+            if (value == YES_AUTO) {
+                paint.strokeWidth = 5f
+                paint.style = Paint.Style.STROKE
+            } else {
+                paint.strokeWidth = 0f
+                paint.style = Paint.Style.FILL
+            }
 
             paint.textSize = when (value) {
                 UNKNOWN -> dim(R.dimen.smallerTextSize)
@@ -158,6 +164,12 @@ class CheckmarkButtonView(
             rect.set(0f, 0f, width.toFloat(), height.toFloat())
             rect.offset(0f, 0.4f * em)
             canvas.drawText(label, rect.centerX(), rect.centerY(), paint)
+
+            if (value == YES_AUTO) {
+                paint.color = bgColor
+                paint.style = Paint.Style.FILL
+                canvas.drawText(label, rect.centerX(), rect.centerY(), paint)
+            }
         }
     }
 }