diff --git a/core/res/res/drawable-ldpi/stat_notify_call_mute.png b/core/res/res/drawable-ldpi/stat_notify_call_mute.png
index d1600097bd964..353ecf2c04b4f 100644
Binary files a/core/res/res/drawable-ldpi/stat_notify_call_mute.png and b/core/res/res/drawable-ldpi/stat_notify_call_mute.png differ
diff --git a/core/res/res/drawable-ldpi/stat_sys_speakerphone.png b/core/res/res/drawable-ldpi/stat_sys_speakerphone.png
index 7fc67a043bb11..22ecd3043f81c 100644
Binary files a/core/res/res/drawable-ldpi/stat_sys_speakerphone.png and b/core/res/res/drawable-ldpi/stat_sys_speakerphone.png differ
diff --git a/core/res/res/drawable-sw600dp-hdpi/stat_notify_call_mute.png b/core/res/res/drawable-sw600dp-hdpi/stat_notify_call_mute.png
index 5d4ad05378c40..996aadc08be8c 100644
Binary files a/core/res/res/drawable-sw600dp-hdpi/stat_notify_call_mute.png and b/core/res/res/drawable-sw600dp-hdpi/stat_notify_call_mute.png differ
diff --git a/core/res/res/drawable-sw600dp-hdpi/stat_sys_speakerphone.png b/core/res/res/drawable-sw600dp-hdpi/stat_sys_speakerphone.png
index 66895fae11303..e44080517da69 100644
Binary files a/core/res/res/drawable-sw600dp-hdpi/stat_sys_speakerphone.png and b/core/res/res/drawable-sw600dp-hdpi/stat_sys_speakerphone.png differ
diff --git a/core/res/res/drawable-sw600dp-mdpi/stat_notify_call_mute.png b/core/res/res/drawable-sw600dp-mdpi/stat_notify_call_mute.png
index 08017acf0e8b5..5ebf23af1bb60 100644
Binary files a/core/res/res/drawable-sw600dp-mdpi/stat_notify_call_mute.png and b/core/res/res/drawable-sw600dp-mdpi/stat_notify_call_mute.png differ
diff --git a/core/res/res/drawable-sw600dp-mdpi/stat_sys_speakerphone.png b/core/res/res/drawable-sw600dp-mdpi/stat_sys_speakerphone.png
index 276dea1e9af7c..0228134460609 100644
Binary files a/core/res/res/drawable-sw600dp-mdpi/stat_sys_speakerphone.png and b/core/res/res/drawable-sw600dp-mdpi/stat_sys_speakerphone.png differ
diff --git a/core/res/res/drawable-sw600dp-xhdpi/stat_notify_call_mute.png b/core/res/res/drawable-sw600dp-xhdpi/stat_notify_call_mute.png
index cdef5d946d880..142080a15ae7f 100644
Binary files a/core/res/res/drawable-sw600dp-xhdpi/stat_notify_call_mute.png and b/core/res/res/drawable-sw600dp-xhdpi/stat_notify_call_mute.png differ
diff --git a/core/res/res/drawable-sw600dp-xhdpi/stat_sys_speakerphone.png b/core/res/res/drawable-sw600dp-xhdpi/stat_sys_speakerphone.png
index 262af383b71f7..f9563b280e09b 100644
Binary files a/core/res/res/drawable-sw600dp-xhdpi/stat_sys_speakerphone.png and b/core/res/res/drawable-sw600dp-xhdpi/stat_sys_speakerphone.png differ
diff --git a/core/res/res/drawable-sw600dp-xxhdpi/stat_notify_call_mute.png b/core/res/res/drawable-sw600dp-xxhdpi/stat_notify_call_mute.png
index 13ec34eb67236..dd1b5be08ee50 100644
Binary files a/core/res/res/drawable-sw600dp-xxhdpi/stat_notify_call_mute.png and b/core/res/res/drawable-sw600dp-xxhdpi/stat_notify_call_mute.png differ
diff --git a/core/res/res/drawable-sw600dp-xxhdpi/stat_sys_speakerphone.png b/core/res/res/drawable-sw600dp-xxhdpi/stat_sys_speakerphone.png
index 34a4c45ebfd39..df9bff1d68d99 100644
Binary files a/core/res/res/drawable-sw600dp-xxhdpi/stat_sys_speakerphone.png and b/core/res/res/drawable-sw600dp-xxhdpi/stat_sys_speakerphone.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_settings_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_settings_normal.png
index 3ed741854b692..2d8d074762222 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_notify_settings_normal.png and b/packages/SystemUI/res/drawable-hdpi/ic_notify_settings_normal.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_0.png
index df727e55e80fa..beb0e058d1880 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_0.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_15.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_15.png
index 228f59a0f26b7..603fff1daa7d3 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_15.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_15.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_15.png
index 3965162ffa692..0d01eb56a59a0 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_15.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_15.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png
index 933a6a31b221c..cbabd61f01129 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png
index 4497b2c8c49a6..12569d194bb90 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png
index ddba025bd8831..7d5f6d0cb9c68 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png
index 6fba6a939d695..2102263cc3ae1 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png
index 1fcf26a94466b..9dfde67d32f39 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_r.png
index 5f388219ac42a..4fea255c0c058 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_r.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_r.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png
index e4c17d15d6f15..fa905ccd02c51 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png
index 47578566ed47e..5b5b5d2ece19d 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png
index 452c8754f6902..5128c0de53971 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png
index 7c86303e25579..da77a35b3796b 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png
index 2e5dc3c3ea65e..1233fca180de2 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png and b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png
index a8f4daa8c287e..6768c1f153afe 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png and b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/search_light.png b/packages/SystemUI/res/drawable-hdpi/search_light.png
index c8b5a2ec9295e..9a8f771c1857a 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/search_light.png and b/packages/SystemUI/res/drawable-hdpi/search_light.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 073f285ea3c4d..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 83759be7f8eff..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index bec5e3be1a5d6..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index cbf2cc7dced45..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 90cb8c39b19a3..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 24d060609d9a7..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index 1b1ac75cce540..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 1e66cb93f666b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_roam.png
new file mode 100644
index 0000000000000..be38df80dd14b
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png
deleted file mode 100644
index 717711f9dddc6..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png
deleted file mode 100644
index cdf35b638a858..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png
deleted file mode 100644
index ce90eb426021b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png
deleted file mode 100644
index 39a109c54f60e..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 22f18a04b1eae..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index f7f0159246e18..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index 86b250c980654..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index f70634355e84a..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1.png
index 77a19d374ecda..b6388e1f40098 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1x.png
index 22c5c2857de01..969bff48202a0 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_2.png
index a326de506fc22..610a018fe5a83 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_2.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3.png
index 38f9800d04d17..badebf543e6b2 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3g.png
index 53bb5d9e21ad1..ff96e40cb47cc 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4.png
index 12a803acb2436..52c9a74ae1e9d 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4g.png
index f9ade7dc004e0..312a3849825e4 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_e.png
index f1c5a3915653f..1211e0da917a8 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_g.png
index cba3eb67b5e73..b65abc6156bc2 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_h.png
index e850f9e194b41..08e21d24d090c 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_in.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_in.png
deleted file mode 100644
index e6a2f17b5b8bb..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_inout.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_inout.png
deleted file mode 100644
index fd40015de3684..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png
index 8d17c77ae368a..464ebbc55683b 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_out.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_out.png
deleted file mode 100644
index 0a6d20acc26b2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_r.png
index 79e1bdf59ad26..37da1f437da08 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 60a734173b37c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 23b47b63a6dfc..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 6601913e4b2b1..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index 2334bfce1db15..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index b410ee1c47ef2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 91810f849f159..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index 6a7eb08028e7a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 1c69293b92cd0..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_roam.png
new file mode 100644
index 0000000000000..ffb58ca650acc
Binary files /dev/null and b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_1.png
deleted file mode 100644
index 79d314583f062..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_2.png
deleted file mode 100644
index d83696f40209e..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_3.png
deleted file mode 100644
index b6b84a1eb91c7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_4.png
deleted file mode 100644
index 35de22dc2e254..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1.png
index dcb188375f9fc..7116084cfda90 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1x.png
index a28924b81a917..8596aa6e3c55e 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_2.png
index c5c57eaa18cc5..1b81c427bb79b 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_2.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3.png
index 31c8d23f38505..03591c2a445d0 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3g.png
index 72329b9de19ad..ee7296738b6ea 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4.png
index a39bdd2af6023..162315c4b1182 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4g.png
index 3639c5a900bee..c472f2b336969 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_e.png
index 4faaadb6bf59e..e4bf4e2441f4b 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_g.png
index 345f84dcf2279..98b0104fbf478 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_h.png
index ac51151802f0d..fc19c7af5dbfa 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_in.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_in.png
deleted file mode 100644
index 9c8f3e7c7cd18..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_inout.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_inout.png
deleted file mode 100644
index 7e773f026652a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png
index e176db4a0cfbd..225028242a9d5 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_out.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_out.png
deleted file mode 100644
index 2ecfd0b89f6dc..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_r.png
index e69d5c249a8f1..8290e1b999f2f 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 7f0e705b2e4ab..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index b4ee3ff249f21..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 38e009f3652ad..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index 8cb3f6a995315..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index bc68ae60151b8..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 65bc67250ac6d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index a3c5aca34dfaf..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 7234f40b82486..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_roam.png
new file mode 100644
index 0000000000000..c54ceba9bb0e7
Binary files /dev/null and b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_1.png
deleted file mode 100644
index e432210f79be1..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_2.png
deleted file mode 100644
index fc4dbb0192692..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_3.png
deleted file mode 100644
index 410e8f3a53b2e..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_4.png
deleted file mode 100644
index e222ffd340b00..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1.png
index 132578d5536a4..a5d68e1b0c2c6 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1x.png
index 2120f888ba941..69d046121a687 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_2.png
index 0b2ea16b7468b..df0948b588ef2 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_2.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3.png
index d25059d4922ce..4409267bb391d 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3g.png
index 31a0e351a4ad2..de0181ba03ce9 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4.png
index f8928550be73d..c3e418128edde 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4g.png
index bb34c4929c6a2..69a950d81d5c3 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_e.png
index 116113cf60719..04948ae511d56 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_g.png
index b8d8b57dcc2e4..a6b03939ecf45 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_h.png
index e2bbd8fc31238..ede64f1617cb8 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_in.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_in.png
deleted file mode 100644
index f3245a0956b76..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_inout.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_inout.png
deleted file mode 100644
index 9f02b9d60d3f0..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png
index 7711b1892891c..e82ba13b2b62a 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_out.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_out.png
deleted file mode 100644
index 8452087f38537..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_r.png
index fcec4f1db542b..83e7206ff73dc 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index fe0bb54d3c034..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index d9f6f33c8c307..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 75bb86a53b8fe..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index 0318f1a673d80..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index ef2f061590201..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 6fbcc0e1d7dce..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index 1b6f7f5e2624d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 2ccb68133d574..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_roam.png
new file mode 100644
index 0000000000000..d8db235a454ff
Binary files /dev/null and b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_1.png
deleted file mode 100644
index 584a73a262ac3..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_2.png
deleted file mode 100644
index b90b421a2d20d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_3.png
deleted file mode 100644
index 5fdf834867b94..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_4.png
deleted file mode 100644
index ada740a119437..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1.png
index 1ff23afb0680a..19809c214205d 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1x.png
index d882f50e66ac7..cd34141b2ed8f 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_2.png
index 4e385f3beb37c..5691f9630fd0a 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_2.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3.png
index bbcaebb29a65c..56768dd69663a 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3g.png
index dce2662737d26..094d4caf7c2b9 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4.png
index c00d65cfac048..55ec5b883c9e8 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4g.png
index 3aba174bc1cc2..f92aac21349a4 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_e.png
index e38507a600fa9..4329b671bb1b9 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_g.png
index 21fbc0b65531c..3577fbb0e09a7 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_h.png
index d9d395f1e2af3..0aae48bc5592d 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_in.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_in.png
deleted file mode 100644
index 61b0df9372d55..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_inout.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_inout.png
deleted file mode 100644
index e450506ab37b3..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_lte.png
index 5b428a0d86727..2d2b106687451 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_out.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_out.png
deleted file mode 100644
index f8b63cbadfb63..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_r.png
index f29a47804d71a..a2003fcff6f95 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 6ba908bd7d12c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index c4de9e55af017..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index c5b5ec3390fb2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 03377e2c1a7ab..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index 9d3346fb9840c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index dd0d6b5d1cb5c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_roam.png
similarity index 53%
rename from packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_e.png
rename to packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_roam.png
index 80d8b40a7bd42..cc6155f74d047 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_e.png and b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_1.png
deleted file mode 100644
index 8103f4d302997..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_2.png
deleted file mode 100644
index 22d7a1c8b6769..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_3.png
deleted file mode 100644
index 29d3ab06fc106..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_4.png
deleted file mode 100644
index 6aa4854a13b55..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_settings_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_settings_normal.png
index 44cfc5bc49d3f..399db009a67db 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_notify_settings_normal.png and b/packages/SystemUI/res/drawable-mdpi/ic_notify_settings_normal.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_0.png
index b6bfbdba8bce3..8dd3d4db68cb0 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_0.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_15.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_15.png
index 2a1637c0dcb90..f59ba484d73bf 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_15.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_15.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_15.png
index cee2a4473cda4..86d11588478ec 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_15.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_15.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png
index 172c2dc07df7f..a89191ff56278 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png
index 645652ac086fd..8a8e32362516e 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png
index a8714587f7394..c1063a992bf9a 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png
index e9ae1f13b7cd9..f1454104aa582 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png
index 7d156fece46e0..da8ebce6daa22 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_r.png
index 739fe7cc1b621..776210b77cbf4 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_r.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_r.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png
index d0fedcc9866ad..a5de26feac4d7 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png
index f717dc80244ef..b3d452477a034 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png
index 3e8637b17b989..0555eedf26757 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png
index 17a9ddb151865..f1753d66ea1a7 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png
index 45183b0551785..4d9c21c14ec11 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png and b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png
index 8169fba9911ae..9f0570af922f0 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png and b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/search_light.png b/packages/SystemUI/res/drawable-mdpi/search_light.png
index 4b5b2a495a144..c355b6a613130 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/search_light.png and b/packages/SystemUI/res/drawable-mdpi/search_light.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index a4c7ed0eff5f4..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 11e4762fe35dc..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 503e1557b4df5..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index 2be8a4fd92b4f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 8efc4eda3988b..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index e69178081e9f3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index df014450a2900..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 0bc6e3133948f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_roam.png
new file mode 100644
index 0000000000000..fb2a6b6272fcc
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png
deleted file mode 100644
index f3232a2923131..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png
deleted file mode 100644
index 8dbee4bfef991..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png
deleted file mode 100644
index bef1f187e35e3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png
deleted file mode 100644
index 163c740ab246b..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 33ee9a63e6edf..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index 0b7cbdeb5ca9f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index a2aa04588eef9..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index de79d19d0f9f4..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png
index 202c8bcc339b7..8014b70748984 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png
index 31bc09c2a2746..41a34e26f9d5f 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png
index 5e8e7f6f664f2..11e3b65541c41 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png
index 3529974ca3009..afcc48729a17c 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png
index bef6de3b7d1c5..9c623e5fb266a 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png
index 406eeab9eb347..a011aa1beb9b2 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png
index 1849a53a23039..244423436f59e 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png
index c5fe4df27d3ef..a3e32f4c0e8cf 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png
index 75b5fbb99eff6..61a36e3a81443 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png
index a7a4ce3ca5059..52bf290a1325b 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png
index f079b85b19f32..298b62fac0e08 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png
index fa5f00129b5fd..41f4b42eb4a3e 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight.png
new file mode 100644
index 0000000000000..e5d4273467b03
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight_land.png
new file mode 100644
index 0000000000000..1cc5009709353
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight_land.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png
new file mode 100644
index 0000000000000..5ef7798d77418
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_small.png
new file mode 100644
index 0000000000000..4a98e3157349b
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_settings_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_settings_normal.png
index 80fdb790891ec..c0032e23f1700 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_notify_settings_normal.png and b/packages/SystemUI/res/drawable-xhdpi/ic_notify_settings_normal.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_0.png
index b6e7a3f140f90..ff3bdf0d13564 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_0.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_15.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_15.png
index 9895f71d74d77..39fccc88febd1 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_15.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_15.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_15.png
index e3c69205b54cd..1a595edc2be24 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_15.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_15.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png
index 91bbde6740766..f88e3a4af69e8 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png
index 7443e634d2233..9aff8aaf3f4b8 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png
index 747fa74c35135..2e0030339ff52 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png
index 823fe8aabaf06..33ae551509c6b 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png
index 41c15777979e6..4212e49c16197 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_r.png
index 2baa0f3e90df7..2176a88043a11 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_r.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_r.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png
index f38a0a98561c0..fb09a26ff7c19 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png
index 5c2bc16e34ad5..b52aec7d1a3ed 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png
index f6359fc937e44..9942e7aed35b9 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png
index cc426bb942b43..1efdebff576c4 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png
index ee5eed895250b..e62decea2d2ea 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png and b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png
index b434fc47e7e5e..958b2fe0efad3 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png and b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/search_light.png b/packages/SystemUI/res/drawable-xhdpi/search_light.png
index 3aa890fdfa8b0..68b70eb8beb26 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/search_light.png and b/packages/SystemUI/res/drawable-xhdpi/search_light.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 33c2b82ef1bf3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 7a1d8d624002c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 554953a93bf1f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index b9e3b88a5d8aa..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 137f76e4bfa03..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index e8b6d40fd324a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index 227a105cc660f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index bdaafc9d55719..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_roam.png
new file mode 100644
index 0000000000000..5228c29618a77
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png
deleted file mode 100644
index ac18139f8b8c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png
deleted file mode 100644
index 587d93c213b4e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png
deleted file mode 100644
index 656d6d004596a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png
deleted file mode 100644
index e8033c8316c88..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 1253a41460e3f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index bcb20af6dec9c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index ca70a29ebaf5a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index 8ce2ae931014c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_notify_settings_normal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_settings_normal.png
new file mode 100644
index 0000000000000..a3cc08de1f87e
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_notify_settings_normal.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_0.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_0.png
index ef177a6efa7c9..6ddf734beb5ec 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_0.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_15.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_15.png
index 0a46dde41bb9d..e1e1b2e2f92e6 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_15.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_charge_15.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_charge_15.png
index 96d39dbb705c9..3b36bb9708289 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_charge_15.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_battery_charge_15.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1x.png
index ad829808bb3fa..6706ae2194e74 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1x.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3g.png
index 61ebf83081365..4d1dc751ff46f 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3g.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4g.png
index b7e29a9fb2e3b..aab9d27d7c07a 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4g.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_e.png
index b7c1c01d1c120..cd92c5f806fef 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_lte.png
index 058fca8b496e0..0dc66b4e30e5c 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_lte.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_lte.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_r.png
index 0d616838b841d..b60cda61cb298 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_r.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_r.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_g.png
index dfeafd5f40f1f..b68637633c0b6 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_g.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_h.png
index 031dd8660e725..bfe2271f7ebce 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_h.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_lte.png
index 468c8ee5957ce..b5def3e053798 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_lte.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_lte.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_r.png
index bf459e84a5c90..60e2bd3ceb317 100644
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png
new file mode 100644
index 0000000000000..55a266fc2c40e
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png
new file mode 100644
index 0000000000000..97d1fbc34e945
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg.9.png b/packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg.9.png
new file mode 100644
index 0000000000000..a4464489425ec
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg.9.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/search_light.png b/packages/SystemUI/res/drawable-xxhdpi/search_light.png
new file mode 100644
index 0000000000000..faa97f82cdc5b
Binary files /dev/null and b/packages/SystemUI/res/drawable-xxhdpi/search_light.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 9baa623eafb12..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index af3a0d9eacaff..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 717895bbecfd0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index 989b2363c8ee7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 49cce0db69e78..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index caa5552e216f2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_lte.png
deleted file mode 100644
index a0beb07dd8260..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 9cc31843893c9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_roam.png
similarity index 52%
rename from packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_h.png
rename to packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_roam.png
index 4dca8f21666d9..1f8549ef9b1ab 100644
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_connected_h.png and b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_1.png
deleted file mode 100644
index ee2013032f328..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_2.png
deleted file mode 100644
index 362d06da02d6d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_3.png
deleted file mode 100644
index b1fd4135d96c7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_4.png
deleted file mode 100644
index 1a1862a0ae291..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 57a422810fd03..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index c536e7ba03f8c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index 01ff1b9faf917..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index f8280686a421c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml
index 69f4b4fbef053..b2c8aee4aaf65 100644
--- a/packages/SystemUI/res/values/arrays.xml
+++ b/packages/SystemUI/res/values/arrays.xml
@@ -47,8 +47,8 @@
         <item>100</item>
     </array>
     <array name="batterymeter_color_values">
-        <item>#FFF75D00</item>
-        <item>#FFF75D00</item>
+        <item>#FFFF3300</item>
+        <item>#FFFF3300</item>
         <item>#FFFFFFFF</item>
     </array>
     <array name="batterymeter_bolt_points">
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
index 159bc62cfb8bf..8957a7738064f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
@@ -66,20 +66,6 @@ public class PhoneStatusBarPolicy {
     // bluetooth device status
     private boolean mBluetoothEnabled = false;
 
-    // wifi
-    private static final int[][] sWifiSignalImages = {
-            { R.drawable.stat_sys_wifi_signal_1,
-              R.drawable.stat_sys_wifi_signal_2,
-              R.drawable.stat_sys_wifi_signal_3,
-              R.drawable.stat_sys_wifi_signal_4 },
-            { R.drawable.stat_sys_wifi_signal_1_fully,
-              R.drawable.stat_sys_wifi_signal_2_fully,
-              R.drawable.stat_sys_wifi_signal_3_fully,
-              R.drawable.stat_sys_wifi_signal_4_fully }
-        };
-    private static final int sWifiTemporarilyNotConnectedImage =
-            R.drawable.stat_sys_wifi_signal_0;
-
     private int mLastWifiSignalLevel = -1;
     private boolean mIsWifiConnected = false;
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index a7154503697fb..09f1695aa30af 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -565,8 +565,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
         if (mIsWimaxEnabled && mWimaxConnected) {
             // wimax is a special 4g network not handled by telephony
             mDataIconList = TelephonyIcons.DATA_4G[mInetCondition];
-            mDataTypeIconId = R.drawable.stat_sys_data_connected_4g;
-            mQSDataTypeIconId = R.drawable.ic_qs_signal_4g;
+            mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_4g;
+            mQSDataTypeIconId = TelephonyIcons.QS_DATA_4G[mInetCondition];
             mContentDescriptionDataType = mContext.getString(
                     R.string.accessibility_data_connection_4g);
         } else {
@@ -585,8 +585,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                 case TelephonyManager.NETWORK_TYPE_EDGE:
                     if (!mShowAtLeastThreeGees) {
                         mDataIconList = TelephonyIcons.DATA_E[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_e;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_e;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_e;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_E[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_edge);
                         break;
@@ -595,8 +595,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                     }
                 case TelephonyManager.NETWORK_TYPE_UMTS:
                     mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
-                    mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
-                    mQSDataTypeIconId = R.drawable.ic_qs_signal_3g;
+                    mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_3g;
+                    mQSDataTypeIconId = TelephonyIcons.QS_DATA_3G[mInetCondition];
                     mContentDescriptionDataType = mContext.getString(
                             R.string.accessibility_data_connection_3g);
                     break;
@@ -606,14 +606,14 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                 case TelephonyManager.NETWORK_TYPE_HSPAP:
                     if (mHspaDataDistinguishable) {
                         mDataIconList = TelephonyIcons.DATA_H[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_h;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_h;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_h;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_H[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_3_5g);
                     } else {
                         mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_3g;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_3g;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_3G[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_3g);
                     }
@@ -622,8 +622,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                     if (!mShowAtLeastThreeGees) {
                         // display 1xRTT for IS95A/B
                         mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_1x;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_1x;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_1X[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_cdma);
                         break;
@@ -633,8 +633,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                 case TelephonyManager.NETWORK_TYPE_1xRTT:
                     if (!mShowAtLeastThreeGees) {
                         mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_1x;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_1x;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_1X[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_cdma);
                         break;
@@ -646,8 +646,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                 case TelephonyManager.NETWORK_TYPE_EVDO_B:
                 case TelephonyManager.NETWORK_TYPE_EHRPD:
                     mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
-                    mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
-                    mQSDataTypeIconId = R.drawable.ic_qs_signal_3g;
+                    mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_3g;
+                    mQSDataTypeIconId = TelephonyIcons.QS_DATA_3G[mInetCondition];
                     mContentDescriptionDataType = mContext.getString(
                             R.string.accessibility_data_connection_3g);
                     break;
@@ -655,14 +655,14 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                     boolean show4GforLTE = mContext.getResources().getBoolean(R.bool.config_show4GForLTE);
                     if (show4GforLTE) {
                         mDataIconList = TelephonyIcons.DATA_4G[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_4g;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_4g;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_4g;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_4G[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_4g);
                     } else {
                         mDataIconList = TelephonyIcons.DATA_LTE[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_lte;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_lte;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_lte;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_LTE[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_lte);
                     }
@@ -670,14 +670,14 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                 default:
                     if (!mShowAtLeastThreeGees) {
                         mDataIconList = TelephonyIcons.DATA_G[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_g;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_g;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_g;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_G[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_gprs);
                     } else {
                         mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
-                        mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
-                        mQSDataTypeIconId = R.drawable.ic_qs_signal_3g;
+                        mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_3g;
+                        mQSDataTypeIconId = TelephonyIcons.QS_DATA_3G[mInetCondition];
                         mContentDescriptionDataType = mContext.getString(
                                 R.string.accessibility_data_connection_3g);
                     }
@@ -687,12 +687,12 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
 
         if (isCdma()) {
             if (isCdmaEri()) {
-                mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
-                mQSDataTypeIconId = R.drawable.ic_qs_signal_r;
+                mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_roam;
+                mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
             }
         } else if (mPhone.isNetworkRoaming()) {
-                mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
-                mQSDataTypeIconId = R.drawable.ic_qs_signal_r;
+                mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_roam;
+                mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
         }
     }
 
@@ -1103,12 +1103,12 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
             mQSDataTypeIconId = 0;
             if (isCdma()) {
                 if (isCdmaEri()) {
-                    mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
-                    mQSDataTypeIconId = R.drawable.ic_qs_signal_r;
+                    mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_roam;
+                    mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
                 }
             } else if (mPhone.isNetworkRoaming()) {
-                mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
-                mQSDataTypeIconId = R.drawable.ic_qs_signal_r;
+                mDataTypeIconId = R.drawable.stat_sys_data_fully_connected_roam;
+                mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
             }
         }
 
@@ -1433,14 +1433,15 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
                 String datatype = args.getString("datatype");
                 if (datatype != null) {
                     mDemoDataTypeIconId =
-                            datatype.equals("1x") ? R.drawable.stat_sys_data_connected_1x :
-                            datatype.equals("3g") ? R.drawable.stat_sys_data_connected_3g :
-                            datatype.equals("4g") ? R.drawable.stat_sys_data_connected_4g :
-                            datatype.equals("e") ? R.drawable.stat_sys_data_connected_e :
-                            datatype.equals("g") ? R.drawable.stat_sys_data_connected_g :
-                            datatype.equals("h") ? R.drawable.stat_sys_data_connected_h :
-                            datatype.equals("lte") ? R.drawable.stat_sys_data_connected_lte :
-                            datatype.equals("roam") ? R.drawable.stat_sys_data_connected_roam :
+                            datatype.equals("1x") ? R.drawable.stat_sys_data_fully_connected_1x :
+                            datatype.equals("3g") ? R.drawable.stat_sys_data_fully_connected_3g :
+                            datatype.equals("4g") ? R.drawable.stat_sys_data_fully_connected_4g :
+                            datatype.equals("e") ? R.drawable.stat_sys_data_fully_connected_e :
+                            datatype.equals("g") ? R.drawable.stat_sys_data_fully_connected_g :
+                            datatype.equals("h") ? R.drawable.stat_sys_data_fully_connected_h :
+                            datatype.equals("lte") ? R.drawable.stat_sys_data_fully_connected_lte :
+                            datatype.equals("roam")
+                                    ? R.drawable.stat_sys_data_fully_connected_roam :
                             0;
                 }
                 int[][] icons = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
index 4b2c65e67bc6c..67ba879be1452 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
@@ -23,11 +23,11 @@ class TelephonyIcons {
 
     //GSM/UMTS
     static final int[][] TELEPHONY_SIGNAL_STRENGTH = {
-        { R.drawable.stat_sys_signal_0,
-          R.drawable.stat_sys_signal_1,
-          R.drawable.stat_sys_signal_2,
-          R.drawable.stat_sys_signal_3,
-          R.drawable.stat_sys_signal_4 },
+        { R.drawable.stat_sys_signal_0_fully,
+          R.drawable.stat_sys_signal_1_fully,
+          R.drawable.stat_sys_signal_2_fully,
+          R.drawable.stat_sys_signal_3_fully,
+          R.drawable.stat_sys_signal_4_fully },
         { R.drawable.stat_sys_signal_0_fully,
           R.drawable.stat_sys_signal_1_fully,
           R.drawable.stat_sys_signal_2_fully,
@@ -49,11 +49,11 @@ class TelephonyIcons {
     };
 
     static final int[][] TELEPHONY_SIGNAL_STRENGTH_ROAMING = {
-        { R.drawable.stat_sys_signal_0,
-          R.drawable.stat_sys_signal_1,
-          R.drawable.stat_sys_signal_2,
-          R.drawable.stat_sys_signal_3,
-          R.drawable.stat_sys_signal_4 },
+        { R.drawable.stat_sys_signal_0_fully,
+          R.drawable.stat_sys_signal_1_fully,
+          R.drawable.stat_sys_signal_2_fully,
+          R.drawable.stat_sys_signal_3_fully,
+          R.drawable.stat_sys_signal_4_fully },
         { R.drawable.stat_sys_signal_0_fully,
           R.drawable.stat_sys_signal_1_fully,
           R.drawable.stat_sys_signal_2_fully,
@@ -61,92 +61,132 @@ class TelephonyIcons {
           R.drawable.stat_sys_signal_4_fully }
     };
 
+    static final int[] QS_DATA_R = {
+        R.drawable.ic_qs_signal_r,
+        R.drawable.ic_qs_signal_full_r
+    };
+
     static final int[][] DATA_SIGNAL_STRENGTH = TELEPHONY_SIGNAL_STRENGTH;
 
     //***** Data connection icons
 
     //GSM/UMTS
     static final int[][] DATA_G = {
-            { R.drawable.stat_sys_data_connected_g,
-              R.drawable.stat_sys_data_connected_g,
-              R.drawable.stat_sys_data_connected_g,
-              R.drawable.stat_sys_data_connected_g },
+            { R.drawable.stat_sys_data_fully_connected_g,
+              R.drawable.stat_sys_data_fully_connected_g,
+              R.drawable.stat_sys_data_fully_connected_g,
+              R.drawable.stat_sys_data_fully_connected_g },
             { R.drawable.stat_sys_data_fully_connected_g,
               R.drawable.stat_sys_data_fully_connected_g,
               R.drawable.stat_sys_data_fully_connected_g,
               R.drawable.stat_sys_data_fully_connected_g }
         };
 
+    static final int[] QS_DATA_G = {
+        R.drawable.ic_qs_signal_g,
+        R.drawable.ic_qs_signal_full_g
+    };
+
     static final int[][] DATA_3G = {
-            { R.drawable.stat_sys_data_connected_3g,
-              R.drawable.stat_sys_data_connected_3g,
-              R.drawable.stat_sys_data_connected_3g,
-              R.drawable.stat_sys_data_connected_3g },
+            { R.drawable.stat_sys_data_fully_connected_3g,
+              R.drawable.stat_sys_data_fully_connected_3g,
+              R.drawable.stat_sys_data_fully_connected_3g,
+              R.drawable.stat_sys_data_fully_connected_3g },
             { R.drawable.stat_sys_data_fully_connected_3g,
               R.drawable.stat_sys_data_fully_connected_3g,
               R.drawable.stat_sys_data_fully_connected_3g,
               R.drawable.stat_sys_data_fully_connected_3g }
         };
 
+    static final int[] QS_DATA_3G = {
+        R.drawable.ic_qs_signal_3g,
+        R.drawable.ic_qs_signal_full_3g
+    };
+
     static final int[][] DATA_E = {
-            { R.drawable.stat_sys_data_connected_e,
-              R.drawable.stat_sys_data_connected_e,
-              R.drawable.stat_sys_data_connected_e,
-              R.drawable.stat_sys_data_connected_e },
+            { R.drawable.stat_sys_data_fully_connected_e,
+              R.drawable.stat_sys_data_fully_connected_e,
+              R.drawable.stat_sys_data_fully_connected_e,
+              R.drawable.stat_sys_data_fully_connected_e },
             { R.drawable.stat_sys_data_fully_connected_e,
               R.drawable.stat_sys_data_fully_connected_e,
               R.drawable.stat_sys_data_fully_connected_e,
               R.drawable.stat_sys_data_fully_connected_e }
         };
 
+    static final int[] QS_DATA_E = {
+        R.drawable.ic_qs_signal_e,
+        R.drawable.ic_qs_signal_full_e
+    };
+
     //3.5G
     static final int[][] DATA_H = {
-            { R.drawable.stat_sys_data_connected_h,
-              R.drawable.stat_sys_data_connected_h,
-              R.drawable.stat_sys_data_connected_h,
-              R.drawable.stat_sys_data_connected_h },
+            { R.drawable.stat_sys_data_fully_connected_h,
+              R.drawable.stat_sys_data_fully_connected_h,
+              R.drawable.stat_sys_data_fully_connected_h,
+              R.drawable.stat_sys_data_fully_connected_h },
             { R.drawable.stat_sys_data_fully_connected_h,
               R.drawable.stat_sys_data_fully_connected_h,
               R.drawable.stat_sys_data_fully_connected_h,
               R.drawable.stat_sys_data_fully_connected_h }
     };
 
+    static final int[] QS_DATA_H = {
+                R.drawable.ic_qs_signal_h,
+                R.drawable.ic_qs_signal_full_h
+    };
+
     //CDMA
     // Use 3G icons for EVDO data and 1x icons for 1XRTT data
     static final int[][] DATA_1X = {
-            { R.drawable.stat_sys_data_connected_1x,
-              R.drawable.stat_sys_data_connected_1x,
-              R.drawable.stat_sys_data_connected_1x,
-              R.drawable.stat_sys_data_connected_1x },
+            { R.drawable.stat_sys_data_fully_connected_1x,
+              R.drawable.stat_sys_data_fully_connected_1x,
+              R.drawable.stat_sys_data_fully_connected_1x,
+              R.drawable.stat_sys_data_fully_connected_1x },
             { R.drawable.stat_sys_data_fully_connected_1x,
               R.drawable.stat_sys_data_fully_connected_1x,
               R.drawable.stat_sys_data_fully_connected_1x,
               R.drawable.stat_sys_data_fully_connected_1x }
             };
 
+    static final int[] QS_DATA_1X = {
+        R.drawable.ic_qs_signal_1x,
+        R.drawable.ic_qs_signal_full_1x
+    };
+
     // LTE and eHRPD
     static final int[][] DATA_4G = {
-            { R.drawable.stat_sys_data_connected_4g,
-              R.drawable.stat_sys_data_connected_4g,
-              R.drawable.stat_sys_data_connected_4g,
-              R.drawable.stat_sys_data_connected_4g },
+            { R.drawable.stat_sys_data_fully_connected_4g,
+              R.drawable.stat_sys_data_fully_connected_4g,
+              R.drawable.stat_sys_data_fully_connected_4g,
+              R.drawable.stat_sys_data_fully_connected_4g },
             { R.drawable.stat_sys_data_fully_connected_4g,
               R.drawable.stat_sys_data_fully_connected_4g,
               R.drawable.stat_sys_data_fully_connected_4g,
               R.drawable.stat_sys_data_fully_connected_4g }
         };
 
+    static final int[] QS_DATA_4G = {
+        R.drawable.ic_qs_signal_4g,
+        R.drawable.ic_qs_signal_full_4g
+    };
+
     // LTE branded "LTE"
     static final int[][] DATA_LTE = {
-            { R.drawable.stat_sys_data_connected_lte,
-                    R.drawable.stat_sys_data_connected_lte,
-                    R.drawable.stat_sys_data_connected_lte,
-                    R.drawable.stat_sys_data_connected_lte },
+            { R.drawable.stat_sys_data_fully_connected_lte,
+                    R.drawable.stat_sys_data_fully_connected_lte,
+                    R.drawable.stat_sys_data_fully_connected_lte,
+                    R.drawable.stat_sys_data_fully_connected_lte },
             { R.drawable.stat_sys_data_fully_connected_lte,
                     R.drawable.stat_sys_data_fully_connected_lte,
                     R.drawable.stat_sys_data_fully_connected_lte,
                     R.drawable.stat_sys_data_fully_connected_lte }
     };
 
+    static final int[] QS_DATA_LTE = {
+        R.drawable.ic_qs_signal_lte,
+        R.drawable.ic_qs_signal_full_lte
+    };
+
 }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java
index 8cc0338a541d8..57ddf7aea32ce 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java
@@ -21,10 +21,10 @@ import com.android.systemui.R;
 class WifiIcons {
     static final int[][] WIFI_SIGNAL_STRENGTH = {
             { R.drawable.stat_sys_wifi_signal_0,
-              R.drawable.stat_sys_wifi_signal_1,
-              R.drawable.stat_sys_wifi_signal_2,
-              R.drawable.stat_sys_wifi_signal_3,
-              R.drawable.stat_sys_wifi_signal_4 },
+              R.drawable.stat_sys_wifi_signal_1_fully,
+              R.drawable.stat_sys_wifi_signal_2_fully,
+              R.drawable.stat_sys_wifi_signal_3_fully,
+              R.drawable.stat_sys_wifi_signal_4_fully },
             { R.drawable.stat_sys_wifi_signal_0,
               R.drawable.stat_sys_wifi_signal_1_fully,
               R.drawable.stat_sys_wifi_signal_2_fully,