diff --git a/core/res/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png
index df435e4565270..ed3656cdb952f 100644
Binary files a/core/res/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png and b/core/res/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_bg_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/switch_bg_disabled_holo_light.9.png
index 4c8cc86d90383..7f48396648687 100644
Binary files a/core/res/res/drawable-hdpi/switch_bg_disabled_holo_light.9.png and b/core/res/res/drawable-hdpi/switch_bg_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png
index a4ec766708a3b..fb7cfb02c43be 100644
Binary files a/core/res/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png and b/core/res/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_bg_focused_holo_light.9.png b/core/res/res/drawable-hdpi/switch_bg_focused_holo_light.9.png
index a571aa83093d8..ff748602ff3e4 100644
Binary files a/core/res/res/drawable-hdpi/switch_bg_focused_holo_light.9.png and b/core/res/res/drawable-hdpi/switch_bg_focused_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_bg_holo_dark.9.png b/core/res/res/drawable-hdpi/switch_bg_holo_dark.9.png
index f86e7e4991cfb..941b13147c079 100644
Binary files a/core/res/res/drawable-hdpi/switch_bg_holo_dark.9.png and b/core/res/res/drawable-hdpi/switch_bg_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_bg_holo_light.9.png b/core/res/res/drawable-hdpi/switch_bg_holo_light.9.png
index b4584a7ddae7f..a776df9ad7e82 100644
Binary files a/core/res/res/drawable-hdpi/switch_bg_holo_light.9.png and b/core/res/res/drawable-hdpi/switch_bg_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png b/core/res/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png
new file mode 100644
index 0000000000000..268e3950f570a
Binary files /dev/null and b/core/res/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png b/core/res/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png
new file mode 100644
index 0000000000000..f842ca5bae175
Binary files /dev/null and b/core/res/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png
index c01ad87fb898e..29e6f242dc810 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png and b/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png
index b3e428db6522a..08af1f7f7890c 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png and b/core/res/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_holo_dark.9.png b/core/res/res/drawable-hdpi/switch_thumb_holo_dark.9.png
index 4d3d5b7ade192..797e9fb7fd314 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_holo_dark.9.png and b/core/res/res/drawable-hdpi/switch_thumb_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_holo_light.9.png b/core/res/res/drawable-hdpi/switch_thumb_holo_light.9.png
index 16e11b60dff82..370faf287f59c 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_holo_light.9.png and b/core/res/res/drawable-hdpi/switch_thumb_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png
index 39009978f5507..200a24348389f 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png and b/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png
index ab4fd8d3c6d7f..4e537c9d0721c 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png and b/core/res/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png
index c75612cb782b1..35ff94879702d 100644
Binary files a/core/res/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png and b/core/res/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png
index 67adadc8e57a0..ceb1869c4b88f 100644
Binary files a/core/res/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png and b/core/res/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png
index 9a05f8432c6e7..4753a930fc163 100644
Binary files a/core/res/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png and b/core/res/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_bg_focused_holo_light.9.png b/core/res/res/drawable-mdpi/switch_bg_focused_holo_light.9.png
index 58d65adba387d..446950144c4ba 100644
Binary files a/core/res/res/drawable-mdpi/switch_bg_focused_holo_light.9.png and b/core/res/res/drawable-mdpi/switch_bg_focused_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_bg_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_bg_holo_dark.9.png
index 172030d1e52b2..ac00325511732 100644
Binary files a/core/res/res/drawable-mdpi/switch_bg_holo_dark.9.png and b/core/res/res/drawable-mdpi/switch_bg_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_bg_holo_light.9.png b/core/res/res/drawable-mdpi/switch_bg_holo_light.9.png
index 4ae089ba69165..f48f9602e7937 100644
Binary files a/core/res/res/drawable-mdpi/switch_bg_holo_light.9.png and b/core/res/res/drawable-mdpi/switch_bg_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png
new file mode 100644
index 0000000000000..c70261f06e9ce
Binary files /dev/null and b/core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png b/core/res/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png
new file mode 100644
index 0000000000000..c17d9bf4d6948
Binary files /dev/null and b/core/res/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png
index 7e205acf5d4da..744128d51799d 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png and b/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png
index b4e7cf5bfce10..e89439d399c6d 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png and b/core/res/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_thumb_holo_dark.9.png
index 7003318a80ee9..51b6b2bcdff02 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_holo_dark.9.png and b/core/res/res/drawable-mdpi/switch_thumb_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_holo_light.9.png b/core/res/res/drawable-mdpi/switch_thumb_holo_light.9.png
index 97afcbf9b9e79..f418398b56b6d 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_holo_light.9.png and b/core/res/res/drawable-mdpi/switch_thumb_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png
index 1adc9ee345437..699ade97315ce 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png and b/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png
index 29c6328745d67..7f674c6bde936 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png and b/core/res/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000..911acd74fb7d9
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png b/core/res/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png
new file mode 100644
index 0000000000000..8ba0f75bdb842
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png
new file mode 100644
index 0000000000000..e30e34d6e4177
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png b/core/res/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png
new file mode 100644
index 0000000000000..b1f5b24478325
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_bg_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_bg_holo_dark.9.png
new file mode 100644
index 0000000000000..732481e5997ed
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_bg_holo_dark.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_bg_holo_light.9.png b/core/res/res/drawable-xhdpi/switch_bg_holo_light.9.png
new file mode 100644
index 0000000000000..aec616eaf9229
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_bg_holo_light.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
new file mode 100644
index 0000000000000..cf10fb92da830
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png b/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png
new file mode 100644
index 0000000000000..fe7a441e83fe3
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000..54ae97993197b
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png b/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png
new file mode 100644
index 0000000000000..305cc356a23cc
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_thumb_holo_dark.9.png
new file mode 100644
index 0000000000000..05dfedeaec586
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_holo_dark.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_holo_light.9.png b/core/res/res/drawable-xhdpi/switch_thumb_holo_light.9.png
new file mode 100644
index 0000000000000..63bbc4166e8b8
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_holo_light.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000..d830a99af5381
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png differ
diff --git a/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png b/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png
new file mode 100644
index 0000000000000..17802601e8dee
Binary files /dev/null and b/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png differ