diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml
index 7afd6272c..a6466865c 100644
--- a/app/src/main/res/layout/edit_habit.xml
+++ b/app/src/main/res/layout/edit_habit.xml
@@ -61,11 +61,12 @@
                 style="@style/dialogFormLabel"
                 android:text="@string/repeat"/>
 
-            <Spinner
+            <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/sFrequency"
-                style="?dialogFormSpinnerTheme"
+                android:theme="@style/dialogFormText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:minWidth="400dp"
                 android:entries="@array/frequencyQuickSelect"
                 android:visibility="gone"/>
 
@@ -111,7 +112,7 @@
 
             <TextView
                 android:id="@+id/inputReminderTime"
-                style="?dialogFormSpinnerTheme"/>
+                style="@style/dialogFormSpinner"/>
         </LinearLayout>
 
         <LinearLayout
@@ -125,7 +126,7 @@
 
             <TextView
                 android:id="@+id/inputReminderDays"
-                style="?dialogFormSpinnerTheme"/>
+                style="@style/dialogFormSpinner"/>
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 620b76e1a..249de4601 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -42,7 +42,6 @@
     <attr name="iconUnarchive" format="reference"/>
     <attr name="dialogIconChangeColor" format="reference"/>
 
-    <attr name="dialogFormSpinnerTheme" format="reference"/>
     <attr name="toolbarPopupTheme" format="reference"/>
 
     <!-- Pre-Lollipop -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 92f4d3c8c..597b61945 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -21,9 +21,8 @@
     <style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:dialogTheme">@style/MyDialogStyle</item>
-        <item name="android:alertDialogTheme">@style/MyDialogStyle</item>
-        <item name="android:spinnerItemStyle">@style/dialogFormSmallText</item>
+        <item name="android:dialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
+        <item name="android:alertDialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
 
         <item name="selectedBackground">@drawable/selected_box_light</item>
         <item name="headerBackground">@drawable/habits_list_header_light_background</item>
@@ -54,8 +53,7 @@
         <item name="iconEdit">@drawable/ic_action_edit_dark</item>
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
-        <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
-        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
         <item name="aboutScreenColor">@color/blue_800</item>
@@ -64,8 +62,8 @@
     <style name="AppBaseThemeDark" parent="@style/Theme.AppCompat.NoActionBar">
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:dialogTheme">@style/MyDialogStyleDark</item>
-        <item name="android:alertDialogTheme">@style/MyDialogStyleDark</item>
+        <item name="android:dialogTheme">@style/Theme.AppCompat.Dialog</item>
+        <item name="android:alertDialogTheme">@style/Theme.AppCompat.Dialog</item>
 
         <item name="selectedBackground">@drawable/selected_box_dark</item>
         <item name="headerBackground">@drawable/habits_list_header_dark_background</item>
@@ -96,7 +94,6 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
-        <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerDark</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
         <item name="palette">@array/darkPalette</item>
@@ -209,16 +206,6 @@
         <item name="android:layout_alignParentTop">true</item>
     </style>
 
-    <style name="MyDialogStyle" parent="@style/Theme.AppCompat.Light.Dialog">
-        <item name="android:spinnerItemStyle">@style/dialogFormText</item>
-        <item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
-    </style>
-
-    <style name="MyDialogStyleDark" parent="@style/Theme.AppCompat.Dialog">
-        <item name="android:spinnerItemStyle">@style/dialogFormText</item>
-        <item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
-    </style>
-
     <style name="Preference.Category.Material">
         <item name="android:layout">@layout/preference_category_custom</item>
     </style>
diff --git a/app/src/main/res/values/styles_dialog.xml b/app/src/main/res/values/styles_dialog.xml
index a5a336f90..91f07fe20 100644
--- a/app/src/main/res/values/styles_dialog.xml
+++ b/app/src/main/res/values/styles_dialog.xml
@@ -71,28 +71,19 @@
     <style name="dialogFormLabel" parent="dialogFormText">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:minWidth">100dp</item>
+        <item name="android:minWidth">90dp</item>
         <item name="android:gravity">left</item>
         <item name="android:paddingLeft">6dp</item>
         <item name="android:textColor">?mediumContrastTextColor</item>
     </style>
 
-    <style name="dialogFormSpinnerDark" parent="android:Widget.DeviceDefault.Spinner">
+    <style name="dialogFormSpinner" parent="@style/Widget.AppCompat.Spinner">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">12dp</item>
-        <item name="android:textSize">@dimen/regularTextSize</item>
-        <item name="android:minWidth">400dp</item>
-        <item name="android:textColor">?highContrastTextColor</item>
-    </style>
-
-    <style name="dialogFormSpinnerLight" parent="android:Widget.DeviceDefault.Light.Spinner">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">12dp</item>
         <item name="android:textSize">@dimen/regularTextSize</item>
         <item name="android:minWidth">400dp</item>
         <item name="android:textColor">?highContrastTextColor</item>
+        <item name="android:paddingLeft">8dp</item>
     </style>
 
     <style name="dialogFormRow">