diff --git a/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_dark.png
index f43f9ad3fb888..30b3a4d4dc6d8 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_light.png
index 2ada3ef0ba482..0e8ac15b284e1 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_down_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_dark.png
index 5ed7040f3d0c0..762e4b07be7fe 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_light.png
index d4a01cf085f26..4d3dc683e7fe9 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_down_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_dark.png
index ada6251862bec..fcf3565bee3b8 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_light.png
index 1247c7a5be391..12fb9701d9b75 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_down_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_dark.png
index 3d13454859099..a82fd17329657 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_light.png
index 4898244e0bd27..a82fd17329657 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_down_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_dark.png
index bb1074c60a8f9..32845065ab139 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_light.png
index e6e5a0f05134f..6afc2d09efd6d 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_down_normal_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_dark.png
index b54e603e5b4fe..e414e330c0042 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_light.png
index 70ee54ce091e1..e414e330c0042 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_down_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_selection_divider.9.png b/core/res/res/drawable-hdpi/numberpicker_selection_divider.9.png
index 7719df8a4e83f..fb5e54f5ca7e3 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_selection_divider.9.png and b/core/res/res/drawable-hdpi/numberpicker_selection_divider.9.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_dark.png
index a55c96ababee5..828c079622715 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_light.png
index 4e31c723f5311..e7e22c3862a74 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_up_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_dark.png
index 815859650cd70..a2a773b8a467c 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_light.png
index 37e5c0d3845b4..0b1b1893bf5f5 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_up_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_dark.png
index 7ec94e658ceb4..ca12894242cfb 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_light.png
index 780fff132dcfb..52f8b38d9c597 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_up_focused_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_dark.png
index 73c8dd964efd0..5f9411ab90390 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_light.png
index 3b964806b7781..5f9411ab90390 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_up_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_dark.png
index 21f0871f94660..cdc1775dfb65f 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_light.png
index 49e3c153eabef..b4981d45ddb5f 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_up_normal_holo_light.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_dark.png b/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_dark.png
index a15a5f5127162..e124a1868b558 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_dark.png and b/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_light.png b/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_light.png
index 7441361fd5a49..e124a1868b558 100644
Binary files a/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_light.png and b/core/res/res/drawable-hdpi/numberpicker_up_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_dark.png
index 113b369d9012e..0329d58558329 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_light.png
index e3c416e2d4d57..d17ca1c095b68 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_down_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_dark.png
index e123db9340892..c41e4b863b242 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_light.png
index f93d0823fe2df..846c2e8af7973 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_down_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_dark.png
index d8bd34f87213e..5543ac6979c18 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_light.png
index 0747f828a0f6e..65e7c87fe9eea 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_down_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_dark.png
index 1c7abf8abaef5..50a4167f48782 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_light.png
index ec9d1f206339e..50a4167f48782 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_down_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_dark.png
index d6259e2bc0f18..025b27e837fbd 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_light.png
index aac5f3141e8dc..7dd30e983fdec 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_down_normal_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_dark.png
index fd8076f487a81..25c22b6b6dafc 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_light.png
index c06ff40685afd..25c22b6b6dafc 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_down_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_selection_divider.9.png b/core/res/res/drawable-mdpi/numberpicker_selection_divider.9.png
index a933d9a6c9397..d49cf7a133ab2 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_selection_divider.9.png and b/core/res/res/drawable-mdpi/numberpicker_selection_divider.9.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_dark.png
index d69615dbc05ed..c32596ce33214 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_light.png
index eb7a283fa1a39..4b862657640ae 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_up_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_dark.png
index 1ee55103b4601..e47ff9c3c0912 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_light.png
index 226957704a8b0..b5e32d8e1107e 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_up_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_dark.png
index 9954130d812c3..543d3e3486b8b 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_light.png
index 8553d1ccda578..6b395ddc568d8 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_up_focused_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_dark.png
index b4ed2c59f9bab..f0cd69fb54ecc 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_light.png
index 2496fb80c5f70..f0cd69fb54ecc 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_up_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_dark.png
index 3bcdd71868cd1..bf8136c6950b0 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_light.png
index 1113de79fa40c..2c2bef35c03b1 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_up_normal_holo_light.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_dark.png b/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_dark.png
index 7303a191d255a..394f063a0272f 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_dark.png and b/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_light.png b/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_light.png
index 7abdbfca76827..394f063a0272f 100644
Binary files a/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_light.png and b/core/res/res/drawable-mdpi/numberpicker_up_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_disabled_focused_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_focused_holo_dark.png
new file mode 100644
index 0000000000000..beae86df3cfee
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_disabled_focused_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_focused_holo_light.png
new file mode 100644
index 0000000000000..1f5b745be6fd6
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_disabled_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_holo_dark.png
new file mode 100644
index 0000000000000..cee62f8d68730
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_disabled_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_holo_light.png
new file mode 100644
index 0000000000000..367dad4b66ba8
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_focused_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_down_focused_holo_dark.png
new file mode 100644
index 0000000000000..66b4807f338a5
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_focused_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_down_focused_holo_light.png
new file mode 100644
index 0000000000000..b99572cad02d3
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_focused_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_longpressed_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_down_longpressed_holo_dark.png
new file mode 100644
index 0000000000000..37cd3ce74d399
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_longpressed_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_down_longpressed_holo_light.png
new file mode 100644
index 0000000000000..37cd3ce74d399
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_normal_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_down_normal_holo_dark.png
new file mode 100644
index 0000000000000..18e7c8e187099
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_normal_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_down_normal_holo_light.png
new file mode 100644
index 0000000000000..5ddece8f96338
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_normal_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_pressed_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_down_pressed_holo_dark.png
new file mode 100644
index 0000000000000..7459f478fa5ba
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_down_pressed_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_down_pressed_holo_light.png
new file mode 100644
index 0000000000000..7459f478fa5ba
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_down_pressed_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_selection_divider.9.png b/core/res/res/drawable-xhdpi/numberpicker_selection_divider.9.png
new file mode 100644
index 0000000000000..200e5815ba995
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_selection_divider.9.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_disabled_focused_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_focused_holo_dark.png
new file mode 100644
index 0000000000000..b13f8e8d07159
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_disabled_focused_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_focused_holo_light.png
new file mode 100644
index 0000000000000..b71cc03081acd
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_focused_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_disabled_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_holo_dark.png
new file mode 100644
index 0000000000000..982f6255d87aa
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_disabled_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_holo_light.png
new file mode 100644
index 0000000000000..fd3fa74afa1ad
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_disabled_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_focused_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_up_focused_holo_dark.png
new file mode 100644
index 0000000000000..57dcf2785a6bd
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_focused_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_focused_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_up_focused_holo_light.png
new file mode 100644
index 0000000000000..eff8c2204b73e
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_focused_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_longpressed_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_up_longpressed_holo_dark.png
new file mode 100644
index 0000000000000..15bed2c60f7b5
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_longpressed_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_longpressed_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_up_longpressed_holo_light.png
new file mode 100644
index 0000000000000..15bed2c60f7b5
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_longpressed_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_normal_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_up_normal_holo_dark.png
new file mode 100644
index 0000000000000..74bc6dfbda75e
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_normal_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_normal_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_up_normal_holo_light.png
new file mode 100644
index 0000000000000..8fe215974c859
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_normal_holo_light.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_pressed_holo_dark.png b/core/res/res/drawable-xhdpi/numberpicker_up_pressed_holo_dark.png
new file mode 100644
index 0000000000000..97cdcb13f115b
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_pressed_holo_dark.png differ
diff --git a/core/res/res/drawable-xhdpi/numberpicker_up_pressed_holo_light.png b/core/res/res/drawable-xhdpi/numberpicker_up_pressed_holo_light.png
new file mode 100644
index 0000000000000..97cdcb13f115b
Binary files /dev/null and b/core/res/res/drawable-xhdpi/numberpicker_up_pressed_holo_light.png differ