diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bd6da72f..946b44e49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 - Fix crash caused by numerical habits with zero target (#903)
+- Fix small issues with font size
 
 ## [2.0.1] - 2021-05-09
 
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 913449df1..8fa15a8f0 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
@@ -153,7 +153,7 @@ class CheckmarkButtonView(
                 paint.style = Paint.Style.FILL
             }
 
-            paint.textSize = when (value) {
+            paint.textSize = when (id) {
                 UNKNOWN -> dim(R.dimen.smallerTextSize)
                 else -> dim(R.dimen.smallTextSize)
             }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
index 9e0c8d1d9..7e240eecb 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
@@ -136,6 +136,7 @@ class BarChart(
             canvas.drawLine(0.0, y, width, y)
             canvas.setColor(theme.mediumContrastTextColor)
             canvas.setTextAlign(TextAlign.CENTER)
+            canvas.setFontSize(theme.smallTextSize)
             var prevMonth = -1
             var prevYear = -1
             val isLargeInterval = axis.size < 2 || (axis[0].distanceTo(axis[1]) > 300)