diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
index 46ba97f0e..47df88dcf 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -180,7 +180,8 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
             colors[0] = Color.argb(16, 255, 255, 255);
             colors[1] = Color.argb(128, red, green, blue);
             colors[2] = primaryColor;
-            textColor = Color.rgb(255, 255, 255);
+            textColor = Color.WHITE;
+            reverseTextColor = Color.WHITE;
         }
         else
         {
@@ -200,10 +201,8 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
         pTextHeader.setAntiAlias(true);
 
         pSquareBg = new Paint();
-        pSquareBg.setColor(primaryColor);
 
         pSquareFg = new Paint();
-        pSquareFg.setColor(reverseTextColor);
         pSquareFg.setAntiAlias(true);
         pSquareFg.setTextAlign(Align.CENTER);
     }
@@ -293,6 +292,7 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
         if (checkmarkOffset >= checkmarks.length) pSquareBg.setColor(colors[0]);
         else pSquareBg.setColor(colors[checkmarks[checkmarkOffset]]);
 
+        pSquareFg.setColor(reverseTextColor);
         canvas.drawRect(location, pSquareBg);
         String text = Integer.toString(date.get(Calendar.DAY_OF_MONTH));
         canvas.drawText(text, location.centerX(), location.centerY() + squareTextOffset, pSquareFg);
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
index 6cb5b9fa2..bf86541a2 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
@@ -143,7 +143,8 @@ public class HabitStreakView extends View implements HabitDataView
             colors[2] = Color.argb(213, red, green, blue);
             colors[1] = Color.argb(170, red, green, blue);
             colors[0] = Color.argb(128, red, green, blue);
-            textColor = Color.rgb(255, 255, 255);
+            textColor = Color.WHITE;
+            reverseTextColor = Color.WHITE;
         }
         else
         {