diff --git a/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png
old mode 100644
new mode 100755
index 2f7529768..e13702baf
Binary files a/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png and b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png differ
diff --git a/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png
old mode 100644
new mode 100755
index 39b3ebb2c..c55aa1481
Binary files a/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png and b/android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png differ
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt
index 194f44655..d0567b630 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt
@@ -19,18 +19,18 @@
 
 package org.isoron.uhabits.activities.common.dialogs
 
-import android.content.Context
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.WindowManager
-import android.widget.Button
-import androidx.appcompat.app.AlertDialog
-import org.isoron.androidbase.activities.ActivityContext
-import org.isoron.androidbase.utils.InterfaceUtils
-import org.isoron.uhabits.R
-import org.isoron.uhabits.core.models.Checkmark
-import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
-import javax.inject.Inject
+import android.content.*
+import android.graphics.*
+import android.view.*
+import android.widget.*
+import androidx.appcompat.app.*
+import org.isoron.androidbase.activities.*
+import org.isoron.androidbase.utils.*
+import org.isoron.uhabits.*
+import org.isoron.uhabits.core.models.*
+import org.isoron.uhabits.core.ui.screens.habits.list.*
+import javax.inject.*
+
 
 class CheckmarkOptionPickerFactory
 @Inject constructor(
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
index 01bd44d65..9f3373b5e 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
@@ -26,7 +26,7 @@ import android.view.*
 import android.view.View.MeasureSpec.*
 import com.google.auto.factory.*
 import org.isoron.androidbase.activities.*
-import org.isoron.androidbase.utils.ColorUtils
+import org.isoron.androidbase.utils.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.core.models.Checkmark.*
 import org.isoron.uhabits.core.preferences.*
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
index c1ab2a4f8..f0efd2056 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
@@ -27,7 +27,7 @@ import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.core.models.*;
-import org.isoron.uhabits.core.preferences.Preferences;
+import org.isoron.uhabits.core.preferences.*;
 import org.isoron.uhabits.core.ui.callbacks.*;
 import org.isoron.uhabits.core.ui.screens.habits.show.*;
 import org.isoron.uhabits.intents.*;
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
index f618724b6..bf7179567 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
@@ -19,14 +19,13 @@
 
 package org.isoron.uhabits.widgets
 
-import android.app.PendingIntent
-import android.content.Context
-import android.view.View
-import org.isoron.uhabits.HabitsApplication
-import org.isoron.uhabits.core.models.Checkmark
-import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.utils.PaletteUtils
-import org.isoron.uhabits.widgets.views.CheckmarkWidgetView
+import android.app.*
+import android.content.*
+import android.view.*
+import org.isoron.uhabits.*
+import org.isoron.uhabits.core.models.*
+import org.isoron.uhabits.utils.*
+import org.isoron.uhabits.widgets.views.*
 
 open class CheckmarkWidget(
         context: Context,
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
index cc1b22421..afd1345bd 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
@@ -23,7 +23,7 @@ import android.app.*
 import android.content.*
 import android.os.*
 import android.view.*
-import android.widget.FrameLayout
+import android.widget.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.activities.*
 import org.isoron.uhabits.activities.common.dialogs.*
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/YesNoCheckmarkWidgetActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/YesNoCheckmarkWidgetActivity.kt
index 33819ca4f..4c1f4905e 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/YesNoCheckmarkWidgetActivity.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/YesNoCheckmarkWidgetActivity.kt
@@ -23,7 +23,7 @@ import android.app.*
 import android.content.*
 import android.os.*
 import android.view.*
-import android.widget.FrameLayout
+import android.widget.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.activities.*
 import org.isoron.uhabits.activities.common.dialogs.*
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
index 2659a2373..ffab4a1da 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
@@ -20,7 +20,6 @@
 package org.isoron.uhabits.widgets.views;
 
 import android.content.*;
-import android.graphics.Color;
 import android.util.*;
 import android.widget.*;
 
diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
index 5459bc7b0..8c698a2d2 100644
--- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
+++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommandTest.java
@@ -57,6 +57,7 @@ public class ToggleRepetitionCommandTest extends BaseUnitTest
         assertFalse(habit.getRepetitions().containsTimestamp(today));
 
         command.undo();
+        assertTrue(habit.getRepetitions().containsTimestamp(today));
 
         command.execute();
         assertFalse(habit.getRepetitions().containsTimestamp(today));