diff --git a/build.gradle b/build.gradle
index e50c4709d..278f33713 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,9 +91,8 @@ dependencies {
 
     compile group: 'net.i2p.android.ext', name: 'floatingactionbutton', version: '1.8.0'
 
-    compile ("com.doomonafireball.betterpickers:library:1.5.4") {
+    compile (group: 'com.github.flavienlaurent.datetimepicker', name: 'library', version: '0.0.2') {
         exclude group: 'com.android.support', module: 'support-v4'
-        exclude group: 'org.jraf', module: 'android-switch-backport'
     }
 
     compile(group: 'com.google.apis', name: 'google-api-services-tasks', version: 'v1-rev33-1.18.0-rc') {
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 3e1d32ba5..b7b8e6bfe 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.tasks">
 
     <!-- ================================================== Used Permissions = -->
@@ -99,8 +98,6 @@
         android:name="android.hardware.touchscreen"
         android:required="false" />
 
-    <uses-sdk tools:overrideLibrary="com.doomonafireball.betterpickers"/>
-
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name"
diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
index 0a4bf3148..8d8589f6f 100644
--- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -5,7 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import android.content.DialogInterface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -121,12 +120,7 @@ public class ReminderControlSet extends TaskEditControlSetBase implements Adapte
             public void onDateTimePicked(DateTime dateTime) {
                 addAlarmRow(dateTime.getMillis());
             }
-        }, new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-
-            }
-        });
+        }, null);
     }
 
     private void updateSpinner() {
diff --git a/src/main/java/org/tasks/dialogs/DateAndTimePickerDialog.java b/src/main/java/org/tasks/dialogs/DateAndTimePickerDialog.java
index 21ae48a62..4981ffad9 100644
--- a/src/main/java/org/tasks/dialogs/DateAndTimePickerDialog.java
+++ b/src/main/java/org/tasks/dialogs/DateAndTimePickerDialog.java
@@ -5,8 +5,9 @@ import android.content.DialogInterface;
 import android.support.v4.app.FragmentManager;
 import android.text.format.DateFormat;
 
-import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog;
-import com.doomonafireball.betterpickers.radialtimepicker.RadialTimePickerDialog;
+import com.fourmob.datetimepicker.date.DatePickerDialog;
+import com.sleepbot.datetimepicker.time.RadialPickerLayout;
+import com.sleepbot.datetimepicker.time.TimePickerDialog;
 
 import org.joda.time.DateTime;
 
@@ -29,36 +30,27 @@ public class DateAndTimePickerDialog {
     private static final String FRAG_TAG_DATE_PICKER = "frag_tag_date_picker";
     private static final String FRAG_TAG_TIME_PICKER = "frag_tag_time_picker";
 
-    public static void datePickerDialog(FragmentManager fragmentManager, DateTime initial, final OnDatePicked onDatePicked, final DialogInterface.OnDismissListener onDismissListener) {
-        MyCalendarDatePickerDialog dialog = new MyCalendarDatePickerDialog();
-        dialog.setOnDismissListener(onDismissListener);
-        dialog.initialize(new CalendarDatePickerDialog.OnDateSetListener() {
+    public static void datePickerDialog(FragmentManager fragmentManager, DateTime initial, final OnDatePicked onDatePicked, DialogInterface.OnDismissListener dismissed) {
+        MyDatePickerDialog dialog = new MyDatePickerDialog();
+        dialog.initialize(new DatePickerDialog.OnDateSetListener() {
             @Override
-            public void onDateSet(CalendarDatePickerDialog calendarDatePickerDialog, int year, int month, int day) {
+            public void onDateSet(DatePickerDialog datePickerDialog, int year, int month, int day) {
                 onDatePicked.onDatePicked(newDateTime().withYear(year).withMonthOfYear(month + 1).withDayOfMonth(day).withMillisOfDay(0));
             }
-        }, initial.getYear(), initial.getMonthOfYear() - 1, initial.getDayOfMonth());
+        }, initial.getYear(), initial.getMonthOfYear() - 1, initial.getDayOfMonth(), true);
+        dialog.setOnDismissListener(dismissed);
         dialog.show(fragmentManager, FRAG_TAG_DATE_PICKER);
     }
 
-    public static void timePickerDialog(FragmentManager fragmentManager, Context context, DateTime initial, final OnTimePicked onTimePicked, final DialogInterface.OnDismissListener onDismissListener) {
-        final boolean[] success = new boolean[1];
-        RadialTimePickerDialog dialog = new RadialTimePickerDialog();
-        dialog.initialize(new RadialTimePickerDialog.OnTimeSetListener() {
+    public static void timePickerDialog(FragmentManager fragmentManager, Context context, DateTime initial, final OnTimePicked onTimePicked, DialogInterface.OnDismissListener dismissed) {
+        MyTimePickerDialog dialog = new MyTimePickerDialog();
+        dialog.initialize(new TimePickerDialog.OnTimeSetListener() {
             @Override
-            public void onTimeSet(RadialTimePickerDialog radialTimePickerDialog, int hours, int minutes) {
-                success[0] = true;
+            public void onTimeSet(RadialPickerLayout radialPickerLayout, int hours, int minutes) {
                 onTimePicked.onTimePicked(newDateTime().withMillisOfDay(0).withHourOfDay(hours).withMinuteOfHour(minutes).getMillisOfDay());
             }
-        }, initial.getHourOfDay(), initial.getMinuteOfHour(), DateFormat.is24HourFormat(context));
-        dialog.setOnDismissListener(new RadialTimePickerDialog.OnDialogDismissListener() {
-            @Override
-            public void onDialogDismiss(DialogInterface dialogInterface) {
-                if (!success[0]) {
-                    onDismissListener.onDismiss(dialogInterface);
-                }
-            }
-        });
+        }, initial.getHourOfDay(), initial.getMinuteOfHour(), DateFormat.is24HourFormat(context), true);
+        dialog.setOnDismissListener(dismissed);
         dialog.show(fragmentManager, FRAG_TAG_TIME_PICKER);
     }
 
diff --git a/src/main/java/org/tasks/dialogs/MyCalendarDatePickerDialog.java b/src/main/java/org/tasks/dialogs/MyDatePickerDialog.java
similarity index 71%
rename from src/main/java/org/tasks/dialogs/MyCalendarDatePickerDialog.java
rename to src/main/java/org/tasks/dialogs/MyDatePickerDialog.java
index c5979ed9e..fe74fb672 100644
--- a/src/main/java/org/tasks/dialogs/MyCalendarDatePickerDialog.java
+++ b/src/main/java/org/tasks/dialogs/MyDatePickerDialog.java
@@ -2,9 +2,9 @@ package org.tasks.dialogs;
 
 import android.content.DialogInterface;
 
-import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog;
+import com.fourmob.datetimepicker.date.DatePickerDialog;
 
-public class MyCalendarDatePickerDialog extends CalendarDatePickerDialog {
+public class MyDatePickerDialog extends DatePickerDialog {
 
     private DialogInterface.OnDismissListener listener;
 
diff --git a/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java b/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java
new file mode 100644
index 000000000..3bc3fb3a4
--- /dev/null
+++ b/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java
@@ -0,0 +1,21 @@
+package org.tasks.dialogs;
+
+import android.content.DialogInterface;
+
+import com.sleepbot.datetimepicker.time.TimePickerDialog;
+
+public class MyTimePickerDialog extends TimePickerDialog {
+
+    private DialogInterface.OnDismissListener listener;
+
+    public void setOnDismissListener(DialogInterface.OnDismissListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        if (listener != null) {
+            listener.onDismiss(dialog);
+        }
+    }
+}