diff --git a/core/res/res/drawable-hdpi/day_picker_week_view_dayline_holo_dark.9.png b/core/res/res/drawable-hdpi/day_picker_week_view_dayline_holo.9.png
similarity index 100%
rename from core/res/res/drawable-hdpi/day_picker_week_view_dayline_holo_dark.9.png
rename to core/res/res/drawable-hdpi/day_picker_week_view_dayline_holo.9.png
diff --git a/core/res/res/drawable-hdpi/day_picker_week_view_dayline_holo_light.9.png b/core/res/res/drawable-hdpi/day_picker_week_view_dayline_holo_light.9.png
deleted file mode 100644
index 2edae8ff8382f..0000000000000
Binary files a/core/res/res/drawable-hdpi/day_picker_week_view_dayline_holo_light.9.png and /dev/null differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_dark.png
index 6fbd7d2546477..f43f9ad3fb888 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_light.png b/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_light.png
index 3a4cdec645c54..2ada3ef0ba482 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_down_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_dark.png
index b1c39919433d1..5ed7040f3d0c0 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_light.png b/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_light.png
index 6fbce8ceb9fab..d4a01cf085f26 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_down_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_focused_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_down_focused_holo_dark.png
index 3bb4c29c3f1fc..ada6251862bec 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_focused_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_down_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_focused_holo_light.png b/core/res/res/drawable-hdpi/timepicker_down_focused_holo_light.png
index 8f02162979d04..1247c7a5be391 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_focused_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_down_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_dark.png
index 8f57d2cc7e338..3d13454859099 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_light.png b/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_light.png
index df6f76b696d58..4898244e0bd27 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_down_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_normal_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_down_normal_holo_dark.png
index a47bf31e70b48..bb1074c60a8f9 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_normal_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_down_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_normal_holo_light.png b/core/res/res/drawable-hdpi/timepicker_down_normal_holo_light.png
index 04046aa33a243..e6e5a0f05134f 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_normal_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_down_normal_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_dark.png
index b6021e0f2ea87..b54e603e5b4fe 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_light.png b/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_light.png
index 0f38d6b8f569b..70ee54ce091e1 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_down_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_dark.png
index 14a4e3192527f..a55c96ababee5 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_light.png b/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_light.png
index 21a2ac11878e1..4e31c723f5311 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_up_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_dark.png
index 1a1da570c5f4b..815859650cd70 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_light.png b/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_light.png
index a242c80ea5f0c..37e5c0d3845b4 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_up_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_focused_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_up_focused_holo_dark.png
index 50045e4958a28..7ec94e658ceb4 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_focused_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_up_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_focused_holo_light.png b/core/res/res/drawable-hdpi/timepicker_up_focused_holo_light.png
index 659b3c7cffcc5..780fff132dcfb 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_focused_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_up_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_dark.png
index 911253040ce4c..73c8dd964efd0 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_light.png b/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_light.png
index 21aa7f7786522..3b964806b7781 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_up_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_normal_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_up_normal_holo_dark.png
index d145975fda179..21f0871f94660 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_normal_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_up_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_normal_holo_light.png b/core/res/res/drawable-hdpi/timepicker_up_normal_holo_light.png
index 167bab747921d..49e3c153eabef 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_normal_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_up_normal_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_dark.png b/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_dark.png
index 2844c3ffc51a3..a15a5f5127162 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_dark.png and b/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_light.png b/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_light.png
index 9d83038508ea6..7441361fd5a49 100644
Binary files a/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_light.png and b/core/res/res/drawable-hdpi/timepicker_up_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/day_picker_week_view_dayline_holo_dark.9.png b/core/res/res/drawable-mdpi/day_picker_week_view_dayline_holo.9.png
similarity index 100%
rename from core/res/res/drawable-mdpi/day_picker_week_view_dayline_holo_dark.9.png
rename to core/res/res/drawable-mdpi/day_picker_week_view_dayline_holo.9.png
diff --git a/core/res/res/drawable-mdpi/day_picker_week_view_dayline_holo_light.9.png b/core/res/res/drawable-mdpi/day_picker_week_view_dayline_holo_light.9.png
deleted file mode 100644
index a8cfd773cb34d..0000000000000
Binary files a/core/res/res/drawable-mdpi/day_picker_week_view_dayline_holo_light.9.png and /dev/null differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_dark.png
index d86534c465714..113b369d9012e 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_light.png b/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_light.png
index 6ae5d4b735da6..e3c416e2d4d57 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_down_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_dark.png
index fd578b66ac209..e123db9340892 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_light.png b/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_light.png
index a0caaa9d0b866..f93d0823fe2df 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_down_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_focused_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_down_focused_holo_dark.png
index f6f4ed2291675..d8bd34f87213e 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_focused_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_down_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_focused_holo_light.png b/core/res/res/drawable-mdpi/timepicker_down_focused_holo_light.png
index 2591adb34f8db..0747f828a0f6e 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_focused_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_down_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_dark.png
index efee09912546e..1c7abf8abaef5 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_light.png b/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_light.png
index f7b09def5cc33..ec9d1f206339e 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_down_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_normal_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_down_normal_holo_dark.png
index 76f13a6d7918d..d6259e2bc0f18 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_normal_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_down_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_normal_holo_light.png b/core/res/res/drawable-mdpi/timepicker_down_normal_holo_light.png
index cb8e764dafb22..aac5f3141e8dc 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_normal_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_down_normal_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_dark.png
index 7c0d0bc8b15e4..fd8076f487a81 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_light.png b/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_light.png
index 9d7ff6bcb7bcb..c06ff40685afd 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_down_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_dark.png
index cfdfd17434844..d69615dbc05ed 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_light.png b/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_light.png
index 43bdf1d8107bf..eb7a283fa1a39 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_up_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_dark.png
index 2ffe46b9ba6f2..1ee55103b4601 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_light.png b/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_light.png
index 51bb2d052a00e..226957704a8b0 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_up_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_focused_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_up_focused_holo_dark.png
index dece1570121b0..9954130d812c3 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_focused_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_up_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_focused_holo_light.png b/core/res/res/drawable-mdpi/timepicker_up_focused_holo_light.png
index 384cb32c1743a..8553d1ccda578 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_focused_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_up_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_dark.png
index 84ec4f78dd53b..b4ed2c59f9bab 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_light.png b/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_light.png
index 318befc365393..2496fb80c5f70 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_up_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_normal_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_up_normal_holo_dark.png
index d97a8327d3689..3bcdd71868cd1 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_normal_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_up_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_normal_holo_light.png b/core/res/res/drawable-mdpi/timepicker_up_normal_holo_light.png
index 19d75e5b6d20c..1113de79fa40c 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_normal_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_up_normal_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_dark.png b/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_dark.png
index 1189e5cc00407..7303a191d255a 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_dark.png and b/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_light.png b/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_light.png
index 9f283abb77c1d..7abdbfca76827 100644
Binary files a/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_light.png and b/core/res/res/drawable-mdpi/timepicker_up_pressed_holo_light.png differ
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 3e75261834f2d..920a59ef50495 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -488,7 +488,7 @@
- #66FFFFFF
- #33FFFFFF
- #19FFFFFF
- - @android:drawable/day_picker_week_view_dayline_holo_dark
+ - @android:drawable/day_picker_week_view_dayline_holo
@@ -1450,7 +1450,7 @@
- #66FFFFFF
- #33FFFFFF
- #19FFFFFF
- - @android:drawable/day_picker_week_view_dayline_holo_dark
+ - @android:drawable/day_picker_week_view_dayline_holo