diff --git a/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
index 798ecdb88..fb204e06b 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
@@ -326,7 +326,7 @@ public class HistoryChart extends ScrollableChart
         else
         {
             int checkmark = checkmarks[checkmarkOffset];
-            pSquareBg.setColor(colors[Integer.min(2, checkmark)]);
+            pSquareBg.setColor(colors[Math.min(2, checkmark)]);
         }
 
         pSquareFg.setColor(reverseTextColor);
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java
index ccb2026e9..816e36b95 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java
@@ -58,10 +58,12 @@ public class NumberButtonView extends View
 
     private TextPaint pBold;
 
-    private int grey;
+    private int lightGrey;
 
     private float em;
 
+    private int darkGrey;
+
     public NumberButtonView(@Nullable Context context)
     {
         super(context);
@@ -137,16 +139,12 @@ public class NumberButtonView extends View
     @Override
     protected void onDraw(Canvas canvas)
     {
-        if(value < threshold)
-        {
-            pRegular.setColor(grey);
-            pBold.setColor(grey);
-        }
-        else
-        {
-            pRegular.setColor(color);
-            pBold.setColor(color);
-        }
+        int activeColor = lightGrey;
+        if(value > 0 && value < threshold) activeColor = darkGrey;
+        if(value >= threshold) activeColor = color;
+
+        pRegular.setColor(activeColor);
+        pBold.setColor(activeColor);
 
         String fv = formatValue(value);
 
@@ -184,6 +182,7 @@ public class NumberButtonView extends View
         pBold.setTextAlign(Paint.Align.CENTER);
 
         em = pBold.measureText("m");
-        grey = sr.getColor(R.attr.lowContrastTextColor);
+        lightGrey = sr.getColor(R.attr.lowContrastTextColor);
+        darkGrey = sr.getColor(R.attr.mediumContrastTextColor);
     }
 }
diff --git a/app/src/main/res/layout/list_habits_panel_preview.xml b/app/src/main/res/layout/list_habits_panel_preview.xml
index b08a1b7b6..e20ca4438 100644
--- a/app/src/main/res/layout/list_habits_panel_preview.xml
+++ b/app/src/main/res/layout/list_habits_panel_preview.xml
@@ -62,7 +62,7 @@
         android:layout_height="wrap_content"
         app:button_count="8"
         app:color="6"
-        app:threshold="10"
+        app:threshold="2"
         app:unit="min"
         />