diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java
new file mode 100644
index 000000000..cdcd18661
--- /dev/null
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.activities.habits.edit.views;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import org.isoron.uhabits.R;
+import org.isoron.uhabits.core.models.Frequency;
+import org.isoron.uhabits.core.models.Habit;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnItemSelected;
+
+import static org.isoron.uhabits.R.id.numerator;
+
+
+public class TypePanel extends FrameLayout
+{
+    @BindView(R.id.spinner)
+    Spinner spinner;
+
+    public TypePanel(@NonNull Context context,
+                     @Nullable AttributeSet attrs)
+    {
+        super(context, attrs);
+
+        View view = inflate(context, R.layout.edit_habit_type, null);
+        ButterKnife.bind(this, view);
+        addView(view);
+    }
+
+    @NonNull
+    public Integer getType()
+    {
+        Integer type = spinner.getSelectedItemPosition();
+        if (type.equals(0)) return Habit.YES_NO_HABIT;
+        if (type.equals(0)) return Habit.NUMBER_HABIT;
+        return -1;
+    }
+
+    public void setType(@NonNull Integer type)
+    {
+        int position = getQuickSelectPosition(type);
+        spinner.setSelection(position);
+    }
+
+    @OnItemSelected(R.id.spinner)
+    public void onTypeSelected(int position)
+    {
+        if (position < 0 || position > 1) throw new IllegalArgumentException();
+        // TODO: A callback?
+    }
+
+    private int getQuickSelectPosition(@NonNull Integer type)
+    {
+        if (type.equals(Habit.YES_NO_HABIT)) return 0;
+        if (type.equals(Habit.NUMBER_HABIT)) return 1;
+        return -1;
+    }
+}
diff --git a/uhabits-android/src/main/res/layout/edit_habit.xml b/uhabits-android/src/main/res/layout/edit_habit.xml
index da5357c7b..15fd1a4f7 100644
--- a/uhabits-android/src/main/res/layout/edit_habit.xml
+++ b/uhabits-android/src/main/res/layout/edit_habit.xml
@@ -34,6 +34,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
+        <org.isoron.uhabits.activities.habits.edit.views.TypePanel
+            android:id="@+id/typePanel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
         <org.isoron.uhabits.activities.habits.edit.views.FrequencyPanel
             android:id="@+id/frequencyPanel"
             android:layout_width="match_parent"
diff --git a/uhabits-android/src/main/res/layout/edit_habit_type.xml b/uhabits-android/src/main/res/layout/edit_habit_type.xml
new file mode 100644
index 000000000..f79de6f6a
--- /dev/null
+++ b/uhabits-android/src/main/res/layout/edit_habit_type.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout style="@style/dialogFormRow"
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingTop="12dp"
+              android:paddingBottom="12dp"
+              android:orientation="horizontal">
+
+    <TextView
+        style="@style/dialogFormLabel"
+        android:text="@string/type"/>
+
+    <android.support.v7.widget.AppCompatSpinner
+        android:id="@+id/spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="25dp"
+        android:entries="@array/habitTypes"
+        android:minWidth="400dp"
+        android:theme="@style/dialogFormText"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/values/constants.xml b/uhabits-android/src/main/res/values/constants.xml
index 34e8136a5..07282b4ef 100644
--- a/uhabits-android/src/main/res/values/constants.xml
+++ b/uhabits-android/src/main/res/values/constants.xml
@@ -80,7 +80,7 @@
     </string-array>
 
     <string-array name="habitTypes" translatable="false">
-        <item>Yes or No</item>
+        <item>Checked/Unchecked</item>
         <item>Number</item>
     </string-array>
 
diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml
index 5c043b111..78a132290 100644
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -45,6 +45,7 @@
     <string name="history">History</string>
     <string name="clear">Clear</string>
     <string name="description_hint">Question (Did you … today?)</string>
+    <string name="type">Type</string>
     <string name="repeat">Repeat</string>
     <string name="times_every">times in</string>
     <string name="days">days</string>