diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
index 3c475a0a0..5b0a62dc9 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java
@@ -53,7 +53,7 @@ public class HabitFixtures
         Habit habit = modelFactory.buildHabit();
         habit.setName("Meditate");
         habit.setDescription("Did you meditate this morning?");
-        habit.setColor(3);
+        habit.setColor(5);
         habit.setFrequency(Frequency.DAILY);
         habit.setId(id);
         habitList.add(habit);
@@ -64,7 +64,7 @@ public class HabitFixtures
     {
         Habit habit = createEmptyHabit();
         habit.setFrequency(new Frequency(3, 7));
-        habit.setColor(4);
+        habit.setColor(7);
 
         long day = DateUtils.millisecondsInOneDay;
         long today = DateUtils.getStartOfToday();
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.java
index 4e3ccd64a..890337e59 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.java
@@ -51,7 +51,7 @@ public class NumberButtonViewTest extends BaseViewTest
         view = new NumberButtonView(targetContext);
         view.setUnit("steps");
         view.setThreshold(100.0);
-        view.setColor(ColorUtils.getAndroidTestColor(5));
+        view.setColor(ColorUtils.getAndroidTestColor(8));
 
         measureView(view, dpToPixels(48), dpToPixels(48));
 
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java
index c04b54a33..6e7daa279 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java
@@ -180,8 +180,8 @@ public class HabitListTest extends BaseAndroidTest
 
         String expectedCSV =
             "Position,Name,Description,NumRepetitions,Interval,Color\n" +
-            "001,Meditate,Did you meditate this morning?,1,1,#F9A825\n" +
-            "002,Wake up early,Did you wake up before 6am?,2,3,#388E3C\n";
+            "001,Meditate,Did you meditate this morning?,1,1,#FF8F00\n" +
+            "002,Wake up early,Did you wake up before 6am?,2,3,#AFB42B\n";
 
         StringWriter writer = new StringWriter();
         habitList.writeCSV(writer);
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
index 6616155ee..00d090703 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
@@ -372,7 +372,7 @@ public class Habit
 
         public HabitData()
         {
-            this.color = 5;
+            this.color = 8;
             this.archived = false;
             this.frequency = new Frequency(3, 7);
             this.type = YES_NO_HABIT;
diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
index 3e2632b5b..506baee68 100644
--- a/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
+++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java
@@ -94,13 +94,13 @@ public class ListHabitsSelectionMenuBehaviorTest extends BaseUnitTest
     @Test
     public void onChangeColor() throws Exception
     {
-        assertThat(habit1.getColor(), equalTo(5));
-        assertThat(habit2.getColor(), equalTo(5));
+        assertThat(habit1.getColor(), equalTo(8));
+        assertThat(habit2.getColor(), equalTo(8));
         when(adapter.getSelected()).thenReturn(asList(habit1, habit2));
 
         behavior.onChangeColor();
 
-        verify(screen).showColorPicker(eq(5), colorPickerCallback.capture());
+        verify(screen).showColorPicker(eq(8), colorPickerCallback.capture());
         colorPickerCallback.getValue().onColorPicked(30);
         assertThat(habit1.getColor(), equalTo(30));
     }