diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
index a5d78818f..ed897b160 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java
@@ -4,13 +4,13 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v17.leanback.widget.picker.TimePicker;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.DatePicker;
+import android.widget.TimePicker;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
@@ -174,9 +174,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         String settingValue = item.getValue();
         dp.updateDate(Integer.parseInt(settingValue.substring(0, 4)), Integer.parseInt(settingValue.substring(5, 7)) - 1, Integer.parseInt(settingValue.substring(8, 10)));
 
-        tp.setIs24Hour(true);
-        tp.setHour(Integer.parseInt(settingValue.substring(11, 12)));
-        tp.setMinute(Integer.parseInt(settingValue.substring(14, 15)));
+        tp.setIs24HourView(true);
+        tp.setCurrentHour(Integer.parseInt(settingValue.substring(11, 12)));
+        tp.setCurrentMinute(Integer.parseInt(settingValue.substring(14, 15)));
 
         DialogInterface.OnClickListener ok = new DialogInterface.OnClickListener() {
             @Override
diff --git a/src/android/app/src/main/res/layout/sysclock_datetime_picker.xml b/src/android/app/src/main/res/layout/sysclock_datetime_picker.xml
index e91843f9a..1f0526b55 100644
--- a/src/android/app/src/main/res/layout/sysclock_datetime_picker.xml
+++ b/src/android/app/src/main/res/layout/sysclock_datetime_picker.xml
@@ -15,11 +15,9 @@
         android:datePickerMode="spinner"
         android:spinnersShown="true"/>
 
-    <android.support.v17.leanback.widget.picker.TimePicker
+    <TimePicker
         android:id="@+id/time_picker"
-        android:layout_width="108dp"
-        android:layout_height="108dp"
-        android:scaleX="2.00"
-        android:scaleY="2.00"
-        android:scrollX="-20dp" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:timePickerMode="spinner"/>
 </LinearLayout>