diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png
index 9076900d0873b..c31194eeb2caf 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png
index 3c72bf80aa8ee..52ed6b2bcaa24 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png
index d31e113e379c8..7b7cde586c611 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png
index d0c693e5dd09f..859642a5fd613 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png
index dfa19b46eb13b..5b71dda380aa7 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png
index 151f205f87af1..378d82daaff34 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png
index ad3ee2cfecb9a..43c995a09a1f4 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png
index 43d66d753a92b..c937837da1b18 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png
index 13e4f8b963b86..a60a1277efd4f 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png
index a09b6b23e4974..db0bf2d63e64b 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png
index be02e531e6807..4a6adbe389582 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png
index 655d3873bea68..98983ef6cb6cf 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_off_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png
index e870a0ace268c..8e7b62f046b6c 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png
index 1d8f805be8361..479a26e64ed80 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png
index d3488710db435..77d3130206e59 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png
index 941e91e6603c3..cfe684fbd4c23 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png
index adee78d84bd59..4a64a367351ee 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png
index e6b4ca3546ac0..29591fff34d47 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png
index 6c2bc0d610f89..cf7cf49320c24 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png
index 763833c9b312d..2a2a9afb87224 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png
index 9a87fbc5a0873..1f7fe5f3cfd25 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png
index 6ccf70bd5e917..f5d70939cd381 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png
index d1c14a5a64fc5..3878386b44c3b 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png
index c2290f0567aa9..adcb9e96c6881 100644
Binary files a/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png and b/core/res/res/drawable-hdpi/btn_switch_to_on_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png
index 0238898013723..36ed9543cfde6 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png
index ada1be913dcd3..863eee1b0655e 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png
index 82aec64eae4dd..63e93a89a4076 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png
index 1c6ea9fcfdbee..85c851d0294db 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png
index ac11400021c7b..8637636ca43f7 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png
index 20259720ce69f..2945c29ace979 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png
index 7420fd87b99f4..678a6c8e07f1c 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png
index 1f40832b588cf..238a6f181ebfc 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png
index cf58e44f37f08..4a342a6ae41cf 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png
index 930a280b54e39..5842b192eae7c 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png
index ed9bc372d9ed0..3e1bd2d84baf7 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png
index cddb5b0ae6720..73ed10bc9dce3 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_off_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png
index bc1f9792a118d..03d3dfb5cdebf 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png
index e6fdbcc86742f..25085ceaa190c 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png
index 3d60b439074cc..9e4d2f38b0400 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png
index b9afdc2595cd4..ab5bd1eceb6d5 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png
index c3c8bf2ca01f7..f5297cecf0b84 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png
index 1c7e5e102e60f..1ad56e949e4ce 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png
index 6329b73a539a5..4bad05555f30b 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png
index 424202cade046..d90803480997e 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png
index 313becaa31efe..8ed4fb41eeab1 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png
index f18d86a1393e2..61d3ced159465 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png
index 8ab48c0ef128d..dec2a8269927a 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png
index fbc2c16640676..66358308d9aa7 100644
Binary files a/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png and b/core/res/res/drawable-mdpi/btn_switch_to_on_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png
index 265aeb776de7c..df73ef7b51797 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png
index 2f036ade35a54..baf52edc1cf11 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png
index bb264402df16f..c8f3b1cc96836 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png
index 1b7004701ca91..fe715cfdedd96 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png
index b544b98dcfc14..8e66e11df1cc6 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png
index c461f3defc483..537496e06fd74 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png
index f57da14e323c8..2722a9897e63b 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png
index 22c6fbc1eb38f..81fad097366b5 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png
index cd21ac92b890c..cda20c80c1e37 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png
index a38dc87f29e45..a61ad4bb6132a 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png
index d84a34203fd95..d6e8e4cf2e2d4 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png
index b82a2ebf0c368..785168e12fc1c 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_off_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png
index 6a33ebfeaf691..8a648b8ba4ebe 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png
index dafc250872fda..03063d49da549 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png
index 27df6ffdab0d8..6159dec602997 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png
index cb4121ca3d649..6f1c96c622544 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png
index c5cbb750eceee..2eaff46d0b932 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png
index c69ef4165b8aa..c4d9db8777e25 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png
index aff03d18426d9..f276f1606bcc7 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png
index fb56ae6a82b77..cf9133e3de679 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png
index 88b9d28d839b6..8f1a6a8084ada 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png
index 84519583bb48e..5080c469bc46b 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png
index 6f57654b9d549..5e39408331505 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png
index 21bfc28402013..435ce2150d54a 100644
Binary files a/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png and b/core/res/res/drawable-xhdpi/btn_switch_to_on_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png
index c30cb5a2072a6..1eca9a9843f8f 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png
index eaba5583a1dd7..54272112e8f2f 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png
index 17c18c98afcf8..43c06ab3852c0 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png
index 0fce07a5c15e8..6db3f1e2bd272 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png
index c29b837f6485c..53b3a624a4417 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png
index ae56a41198f3f..7add5202f53a9 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png
index 85290acab0b4a..a4d57de5ae4f3 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png
index 1e8513b953d22..4b3a023ab4b2e 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png
index 8810a12730f6d..a4caa650b6b15 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png
index 717207f65a3a7..2ab46c05203f2 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png
index db046f30a4645..5c06e444d2c70 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png
index c5c07a4f2356d..60d8c1139aeb4 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_off_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png
index c9bdf1f4c7ffb..b149e47588206 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png
index 6bfd9438eec4a..6a12a1f3aa116 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png
index a1d3fbb6a25c8..2803c7cc4756e 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png
index 40c3a5ba403d2..032f6eac92f49 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png
index 26b8736aa4d18..ea83c35468318 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png
index 88c027ee25e54..2801f29547e26 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png
index 02567c6c4a1fc..66b89b3725ff4 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png
index 037d3bf1c537f..1f8770cc118e3 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png
index 0252769caa04c..0d6a95b50d941 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png
index 3ae501d31060f..8e602db2b93ce 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png
index ecf2831a46931..3143c1f37cdaa 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png
index 0877749d85edc..00fb83ec9f0a5 100644
Binary files a/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png and b/core/res/res/drawable-xxhdpi/btn_switch_to_on_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png
index bc21279e1d959..786f493cf00ab 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png
index b57b5924b27f3..c6e1ac1f245d5 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png
index 0fb927704a90a..2a65baa390c58 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png
index 340722db0fa81..efce521e0d68e 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png
index 8554a7694264b..5566524b65b69 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png
index a05e335577986..ee676a6536255 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png
index a5ded14672961..e0bb17536c55f 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png
index 0300a49de501f..de9eadaebfb3a 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png
index 37dd7ced4ed55..3c59ad87b2c63 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png
index 6bc549a69e78a..d524098df421d 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png
index b026d5d92fa87..7c08d71181ec1 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png
index 89238dc007329..017c2e1cee57f 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_off_mtrl_00012.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png
index 1d309feda1d33..d3f2a9a4d87f5 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00001.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png
index 2e58fa911b7e9..cb75295ac0664 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00002.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png
index 2ebe7a72a1ef0..445644e91e788 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00003.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png
index 04bab76c3d314..5819f905b22be 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00004.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png
index 3497e48a471d4..91cb90f88fea8 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00005.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png
index 42333b4beba6e..cf6147c840fb3 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00006.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png
index 732e175d4696d..75fca7c2f312f 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00007.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png
index 12eddd886b13d..b71a0b481e1d8 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00008.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png
index 95cbc61ba223e..edb7671a4068b 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00009.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png
index 105ec07cadb91..5e0be17ff8218 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00010.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png
index fac253ad50840..b727edaafbca1 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00011.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png
index 1b8d11ce0cb78..a3caefb7f4b26 100644
Binary files a/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png and b/core/res/res/drawable-xxxhdpi/btn_switch_to_on_mtrl_00012.9.png differ
diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index 0aa1b0d9c5d02..c185a9ee498a9 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -446,19 +446,8 @@ public class NinePatchDrawable extends Drawable {
                         ": <nine-patch> requires a valid 9-patch source image");
             }
 
-            // Hey, now might be a good time to actually load optical bounds!
             bitmap.getOpticalInsets(opticalInsets);
 
-            // Sanity check for valid padding when we have optical insets.
-            if (padding.left < opticalInsets.left) {
-                padding.left = opticalInsets.left;
-                padding.right = opticalInsets.right;
-            }
-            if (padding.top < opticalInsets.top) {
-                padding.top = opticalInsets.top;
-                padding.bottom = opticalInsets.bottom;
-            }
-
             state.mNinePatch = new NinePatch(bitmap, bitmap.getNinePatchChunk());
             state.mPadding = padding;
             state.mOpticalInsets = Insets.of(opticalInsets);
@@ -626,21 +615,6 @@ public class NinePatchDrawable extends Drawable {
             mOpticalInsets = Insets.of(opticalInsets);
             mDither = dither;
             mAutoMirrored = autoMirror;
-
-            // Sanity check for valid padding when we have optical insets.
-            if (opticalInsets != null && !opticalInsets.isEmpty()) {
-                if (mPadding == null) {
-                    mPadding = new Rect();
-                }
-                if (mPadding.left < opticalInsets.left) {
-                    mPadding.left = opticalInsets.left;
-                    mPadding.right = opticalInsets.right;
-                }
-                if (mPadding.top < opticalInsets.top) {
-                    mPadding.top = opticalInsets.top;
-                    mPadding.bottom = opticalInsets.bottom;
-                }
-            }
         }
 
         // Copy constructor