diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3be3d09db34..566748af44c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -326,5 +326,8 @@
     <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle">
     </style>
 
+    <style name="Widget.TimePicker" parent="@*android:style/Widget.Material.Light.TimePicker">
+        <item name="@android:numbersBackgroundColor">@android:color/white</item>
+    </style>
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index cc2a48085b8..ed743086fea 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -105,8 +105,7 @@
         <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
 
         <!-- For the TimePicker -->
-        <item name="@android:timePickerDialogTheme">@style/Theme.TimePicker</item>
-        <item name="@android:timePickerStyle">@style/Theme.TimePickerStyle</item>
+        <item name="@android:timePickerStyle">@style/Widget.TimePicker</item>
     </style>
 
     <style name="Theme.SubSettings" parent="Theme.Settings">
@@ -188,22 +187,6 @@
         <item name="preferenceBackgroundColor">@android:color/transparent</item>
     </style>
 
-    <style name="Theme.TimePicker" parent="@*android:style/Theme.Material.Light.Dialog.TimePicker">
-        <!-- Used by the ActionBar -->
-        <item name="android:colorPrimary">@color/theme_primary</item>
-        <!-- Used by the StatusBar -->
-        <item name="android:colorPrimaryDark">@color/theme_primary_dark</item>
-        <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. -->
-        <item name="android:colorAccent">@color/theme_accent</item>
-
-        <!-- Redefine the ActionBar style for contentInsetStart -->
-        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
-    </style>
-
-    <style name="Theme.TimePickerStyle" parent="@*android:style/Widget.Material.Light.TimePicker">
-        <item name="@android:numbersBackgroundColor">@android:color/white</item>
-    </style>
-
     <!-- Used to color the switch bar controls -->
     <style name="ThemeOverlay.SwitchBar" parent="@android:style/ThemeOverlay">
         <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. -->