diff --git a/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java b/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
index a8ff3abe7..bcc3db46f 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
@@ -25,7 +25,7 @@ import android.support.v7.widget.Toolbar;
 import android.widget.*;
 
 import org.isoron.uhabits.BuildConfig;
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.utils.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
index b86ed2f25..cf5ef4b89 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
@@ -24,7 +24,7 @@ import android.support.v7.app.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.*;
 
 import butterknife.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
index 70c0e445f..b4c228876 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
@@ -28,6 +28,7 @@ import android.view.*;
 import com.android.datetimepicker.time.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.commands.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java
index 78e69c6d4..225b509ff 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java
@@ -24,7 +24,7 @@ import android.support.v4.app.*;
 import android.view.*;
 import android.widget.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
index 7d1bb3568..d25d5d4fd 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java
@@ -26,7 +26,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.*;
 import android.widget.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
index dec6d04b8..bc2123c7c 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
@@ -24,12 +24,10 @@ import android.content.*;
 import android.graphics.drawable.*;
 import android.os.*;
 import android.support.annotation.*;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.*;
 import android.widget.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
index ffeb3ee42..a62056bb8 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
@@ -24,7 +24,7 @@ import android.os.*;
 import android.support.annotation.*;
 import android.support.v7.widget.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.show.views.*;
 import org.isoron.uhabits.models.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
index f9438efe3..d9b6c2786 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
@@ -25,6 +25,7 @@ import android.util.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
index 4e060b990..e2d9e6a4a 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
@@ -25,6 +25,7 @@ import android.util.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
index 24eebec29..db423054b 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
@@ -25,6 +25,7 @@ import android.util.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
index f228c00dd..cbb278310 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
@@ -25,6 +25,7 @@ import android.util.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.preferences.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
index 3389217fb..d1607e973 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
@@ -25,6 +25,7 @@ import android.util.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
index 4d033473e..52a1fe9ad 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java
@@ -25,7 +25,7 @@ import android.content.res.*;
 import android.util.*;
 import android.widget.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java b/app/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
index 264ea8a22..10fad0a0d 100644
--- a/app/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java
@@ -25,7 +25,7 @@ import android.support.v7.widget.*;
 import android.support.v7.widget.Toolbar;
 import android.widget.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;