diff --git a/android/build.sh b/android/build.sh
index c0243db13..4a2c05d2d 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -76,7 +76,7 @@ build_apk() {
     fi
 
     log_info "Building debug APK"
-    ./gradlew assembleDebug || fail
+    ./gradlew assembleDebug --stacktrace || fail
     cp -v uhabits-android/build/outputs/apk/debug/uhabits-android-debug.apk build/loop-$VERSION-debug.apk
 }
 
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
index 87f38a660..d8950ef04 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
@@ -54,12 +54,15 @@ public class HabitsTest extends BaseUserInterfaceTest
         verifyShowsScreen(LIST_HABITS);
         clickMenu(ADD);
 
+        verifyShowsScreen(SELECT_HABIT_TYPE);
+        clickText("Yes or No");
+
         verifyShowsScreen(EDIT_HABIT);
         String testName = "Hello world";
         typeName(testName);
         typeQuestion("Did you say hello to the world today?");
         typeDescription(description);
-        pickFrequency("Every week");
+        pickFrequency();
         pickColor(5);
         clickSave();
 
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
index f7ff2119c..28e09a1b3 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
@@ -152,7 +152,7 @@ public class CommonSteps extends BaseUserInterfaceTest
 
     public enum Screen
     {
-        LIST_HABITS, SHOW_HABIT, EDIT_HABIT
+        LIST_HABITS, SHOW_HABIT, EDIT_HABIT, SELECT_HABIT_TYPE
     }
 
     public static void verifyShowsScreen(Screen screen) {
@@ -176,9 +176,15 @@ public class CommonSteps extends BaseUserInterfaceTest
                 break;
 
             case EDIT_HABIT:
-                onView(withId(R.id.tvQuestion)).check(matches(isDisplayed()));
-                onView(withId(R.id.tvDescription)).check(matches(isDisplayed()));
+                onView(withId(R.id.questionInput)).check(matches(isDisplayed()));
                 break;
+
+            case SELECT_HABIT_TYPE:
+                onView(withText(R.string.yes_or_no_example)).check(matches(isDisplayed()));
+                break;
+
+            default:
+                throw new IllegalStateException();
         }
     }
 }
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
index deddfbd1d..e87e56483 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
@@ -36,42 +36,42 @@ public class EditHabitSteps
         onView(withId(R.id.buttonSave)).perform(click());
     }
 
-    public static void pickFrequency(String freq)
+    public static void pickFrequency()
     {
-        onView(withId(R.id.spinner)).perform(click());
-        device.findObject(By.text(freq)).click();
+        onView(withId(R.id.frequencyPicker)).perform(click());
+        onView(withText("SAVE")).perform(click());
     }
 
     public static void pickColor(int color)
     {
-        onView(withId(R.id.buttonPickColor)).perform(click());
+        onView(withId(R.id.colorButton)).perform(click());
         device.findObject(By.descStartsWith(String.format("Color %d", color))).click();
     }
 
     public static void typeName(String name)
     {
-        typeTextWithId(R.id.tvName, name);
+        typeTextWithId(R.id.nameInput, name);
     }
 
     public static void typeQuestion(String name)
     {
-        typeTextWithId(R.id.tvQuestion, name);
+        typeTextWithId(R.id.questionInput, name);
     }
 
     public static void typeDescription(String description)
     {
-        typeTextWithId(R.id.tvDescription, description);
+        typeTextWithId(R.id.notesInput, description);
     }
 
     public static void setReminder()
     {
-        onView(withId(R.id.tvReminderTime)).perform(click());
+        onView(withId(R.id.reminderTimePicker)).perform(click());
         onView(withId(R.id.done_button)).perform(click());
     }
 
     public static void clickReminderDays()
     {
-        onView(withId(R.id.tvReminderDays)).perform(click());
+        onView(withId(R.id.reminderDatePicker)).perform(click());
     }
 
     public static void unselectAllDays()
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
index 99d739e1f..39154b529 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
@@ -60,7 +60,7 @@ public abstract class ListHabitsSteps
                 break;
 
             case ADD:
-                clickViewWithId(R.id.actionCreateBooleanHabit);
+                clickViewWithId(R.id.actionCreateHabit);
                 break;
 
             case EDIT: