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
index 2fc475b37b767..9c5147efc9665 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png 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
index 5adecf100027a..9c5147efc9665 100644
Binary files a/core/res/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png 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 457fa847ce9ef..a257e26ddb5c9 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 c3cfc29993327..a257e26ddb5c9 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 d0e18061fba94..dd999d6de8993 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 c30506db3623b..dd999d6de8993 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 9106687c4eeb2..ea54380fc4ce9 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 2bdda56244411..ea54380fc4ce9 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_thumb_activated_holo_dark.9.png b/core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png
index 0787d1647f558..3d7c236abb742 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png 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
index 0157e68ba1aea..3d7c236abb742 100644
Binary files a/core/res/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png 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 51b14d0a57497..82f05d623bdad 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 d68568af5af57..82f05d623bdad 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 6bf153afaad06..9bc7a68e9e865 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 0d98983e6112a..9bc7a68e9e865 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 3cee7b813f1b6..670dc2e99a1b7 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 43a7c4cf69d33..670dc2e99a1b7 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_thumb_activated_holo_dark.9.png b/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
index a0e6b20031c48..ca48bd866c2de 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png 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
index 88235fea32c1a..ca48bd866c2de 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png 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
index 04fb9a173cd68..c3d80f0eb33fc 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png 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
index 06a14f38394ed..c3d80f0eb33fc 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png 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
index af7d63163c1a1..df236df829284 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_holo_dark.9.png 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
index d6ab3eacc8641..df236df829284 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_holo_light.9.png 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
index 5a8e807c93f21..4acb32b193396 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png 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
index 392f3dce33114..4acb32b193396 100644
Binary files a/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png and b/core/res/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png differ
diff --git a/core/res/res/drawable/switch_track_holo_dark.xml b/core/res/res/drawable/switch_track_holo_dark.xml
index c9a940df3b3ac..5f796c17752ea 100644
--- a/core/res/res/drawable/switch_track_holo_dark.xml
+++ b/core/res/res/drawable/switch_track_holo_dark.xml
@@ -15,7 +15,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:drawable="@drawable/switch_bg_disabled_holo_dark" />
     <item android:state_focused="true"  android:drawable="@drawable/switch_bg_focused_holo_dark" />
     <item                               android:drawable="@drawable/switch_bg_holo_dark" />
 </selector>
diff --git a/core/res/res/drawable/switch_track_holo_light.xml b/core/res/res/drawable/switch_track_holo_light.xml
index 98e53b53468cf..39bee375bca98 100644
--- a/core/res/res/drawable/switch_track_holo_light.xml
+++ b/core/res/res/drawable/switch_track_holo_light.xml
@@ -15,7 +15,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:drawable="@drawable/switch_bg_disabled_holo_light" />
     <item android:state_focused="true"  android:drawable="@drawable/switch_bg_focused_holo_light" />
     <item                               android:drawable="@drawable/switch_bg_holo_light" />
 </selector>