diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java
index c2ebc1fe..79833f6e 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java
@@ -15,6 +15,7 @@
 */
 package com.health.openscale.gui.views;
 
+import android.app.DatePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
@@ -94,15 +95,17 @@ public class DateMeasurementView extends MeasurementView {
 
     @Override
     protected View getInputView() {
-        DatePicker datePicker = new DatePicker(getContext());
-        datePicker.setPadding(0, 15, 0, 0);
-
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        datePicker.updateDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH),
+
+        DatePickerDialog datePickerDialog = new DatePickerDialog(
+                getContext(),
+                null,
+                cal.get(Calendar.YEAR),
+                cal.get(Calendar.MONTH),
                 cal.get(Calendar.DAY_OF_MONTH));
 
-        return datePicker;
+        return datePickerDialog.getDatePicker();
     }
 
     @Override
diff --git a/android_app/app/src/main/res/values/styles.xml b/android_app/app/src/main/res/values/styles.xml
index 9f3cd6f0..8bc850bd 100644
--- a/android_app/app/src/main/res/values/styles.xml
+++ b/android_app/app/src/main/res/values/styles.xml
@@ -4,8 +4,14 @@
         <item name="colorPrimary">@color/primaryColor</item>
         <item name="colorPrimaryDark">@color/primaryDarkColor</item>
         <item name="colorAccent">@color/primaryLightColor</item>
+        <item name="android:datePickerStyle">@style/DatePickerStyle</item>
     </style>
 
     <style name="AppTheme_Dark" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:datePickerStyle">@style/DatePickerStyle</item>
+    </style>
+
+    <style name="DatePickerStyle" parent="@android:style/Widget.Material.Light.DatePicker">
+        <item name="android:datePickerMode">spinner</item>
     </style>
 </resources>