diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_0.png
deleted file mode 100644
index a14b8d83ca9dd..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1.png
deleted file mode 100644
index b226694e86233..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index cbabd61f01129..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_2.png
deleted file mode 100644
index 1e9fbfde41050..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3.png
deleted file mode 100644
index 0676919f7db47..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index 12569d194bb90..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4.png
deleted file mode 100644
index 3ad9e76725f24..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index 7d5f6d0cb9c68..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index 2102263cc3ae1..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index c288137301389..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index 2e3e4861ebff9..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index c24cd4dd42fa7..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index 04e8220681a12..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index f8ed8f0186339..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index 4f76f66ca2555..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index 9570daec9a710..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index b23a043ce74b6..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index 75de8cdf38bdf..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index c0ae67cb3c83e..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index 858afc8abb5bb..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_h.png and /dev/null 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
deleted file mode 100644
index 9dfde67d32f39..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png and /dev/null 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
deleted file mode 100644
index 4fea255c0c058..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index fa905ccd02c51..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index 5b5b5d2ece19d..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png and /dev/null 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
deleted file mode 100644
index 5128c0de53971..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index 05bb0a09d0080..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index dd8ba8f342404..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png and /dev/null 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
deleted file mode 100644
index da77a35b3796b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_0.png
deleted file mode 100644
index c416fc3fd423c..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png
deleted file mode 100644
index c50069186a652..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png
deleted file mode 100644
index ae878961cfd2b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png
deleted file mode 100644
index e47ef7afd381b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png
deleted file mode 100644
index 9fd1ae678c43c..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_1.png
deleted file mode 100644
index 93b45b4ddac17..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_2.png
deleted file mode 100644
index 21b2c61706007..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_3.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_3.png
deleted file mode 100644
index cd96ae0583fa0..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_4.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_4.png
deleted file mode 100644
index 43bfe3a3858c9..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_no_network.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_no_network.png
deleted file mode 100644
index 45bc3763d22f6..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_not_connected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_not_connected.png
deleted file mode 100644
index c416fc3fd423c..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_not_connected.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 804d1ac2a5271..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 1d863e9273758..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index 62970fe91f27f..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 6c3fbdc3ae1d0..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index a5effe0d43f9a..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index b7071b9bec44f..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index bd145fa741ce8..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_lte.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
deleted file mode 100644
index be38df80dd14b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png
deleted file mode 100644
index da941c8e08255..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 0fd09d745daa9..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index cfe43dd42c3b3..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index 92a5b1c1e66e1..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index 9454cd8ab61a3..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index 6cb18c74eb4eb..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png
deleted file mode 100644
index 45ed7ca9f34b2..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index 0060eba9899a6..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index faf4153b0883b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index 6a257051c834b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index c6098479312ca..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 6248cfd7b09b1..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png
deleted file mode 100644
index 8c3e896fb37c9..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_0.png
deleted file mode 100644
index 49f9d8d1c2216..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_0.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
deleted file mode 100644
index b6388e1f40098..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index 969bff48202a0..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_1x.png and /dev/null 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
deleted file mode 100644
index 610a018fe5a83..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_2.png and /dev/null 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
deleted file mode 100644
index badebf543e6b2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index ff96e40cb47cc..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_3g.png and /dev/null 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
deleted file mode 100644
index 52c9a74ae1e9d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index 312a3849825e4..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index 1211e0da917a8..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index 49f9d8d1c2216..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index ce85449d95ce9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index 3226db671b5ed..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index 050dde53a968a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index 149819849daa2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index 99484b113a123..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index 656f9effb054a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index f4f0035627a5e..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index 935a74361ff58..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index 5510f6bffc5f1..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index c21352cab1f01..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_lte.png
deleted file mode 100644
index 9298dae3adda9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_r.png
deleted file mode 100644
index da4093e67f0a1..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index b65abc6156bc2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index 08e21d24d090c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_h.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
deleted file mode 100644
index 464ebbc55683b..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index c532510a67f47..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index f87944f9bfd89..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_no_signal.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
deleted file mode 100644
index 37da1f437da08..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 3d82daf4788c6..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index dfbf1a42c1566..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index 85721db449367..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 4a2421c0b940a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index acc98b7e56f46..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 64653ebcad526..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index f440755aad838..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_lte.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
deleted file mode 100644
index ffb58ca650acc..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_0.png
deleted file mode 100644
index b477332dbe97c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index b477332dbe97c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index 36cb7e54b763d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index cc30aa1973d25..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index 6f0b419846ed7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index 01d47c57793c5..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_null.png
deleted file mode 100644
index cd4056cdcc373..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_0.png
deleted file mode 100644
index ad699e2632356..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_0.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
deleted file mode 100644
index 7116084cfda90..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index 8596aa6e3c55e..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_1x.png and /dev/null 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
deleted file mode 100644
index 1b81c427bb79b..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_2.png and /dev/null 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
deleted file mode 100644
index 03591c2a445d0..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index ee7296738b6ea..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_3g.png and /dev/null 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
deleted file mode 100644
index 162315c4b1182..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index c472f2b336969..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index e4bf4e2441f4b..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index ad699e2632356..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index d45c0adcdebe8..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index e5e2c271f4306..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index 55e712527cc87..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index db913dd08269d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index e1760b43bfcaf..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index c098fd93c1219..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index d084a6b787ffc..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index 5c2e8e5994343..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index f69c1f7b72f85..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index 066efdd3ba574..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_lte.png
deleted file mode 100644
index d3b51c1f76a9a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_r.png
deleted file mode 100644
index 4fcc7bcc4157a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index 98b0104fbf478..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index fc19c7af5dbfa..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_h.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
deleted file mode 100644
index 225028242a9d5..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index 5ec4543b92f63..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index b8f137c583403..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_no_signal.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
deleted file mode 100644
index 8290e1b999f2f..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 0d97960aef7db..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index f8e06e1e193ce..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index 35be266951f55..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 64727d3918297..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 3b14d9868d2aa..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index c51c4b16f0273..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index 867a014f31f5c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_lte.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
deleted file mode 100644
index c54ceba9bb0e7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_0.png
deleted file mode 100644
index 6f457e0be5ec9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 6f457e0be5ec9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index 45d733e8aa03c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index 093387af55b37..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index 2f32c4cdd53a7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index 8e9ba9c55d34f..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_null.png
deleted file mode 100644
index c18d10317431c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_0.png
deleted file mode 100644
index e50be70be2a7a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_0.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
deleted file mode 100644
index a5d68e1b0c2c6..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index 69d046121a687..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_1x.png and /dev/null 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
deleted file mode 100644
index df0948b588ef2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_2.png and /dev/null 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
deleted file mode 100644
index 4409267bb391d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index de0181ba03ce9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_3g.png and /dev/null 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
deleted file mode 100644
index c3e418128edde..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index 69a950d81d5c3..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index 04948ae511d56..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index e50be70be2a7a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index 53bf4de74aaa9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index 5733b5dcf09d0..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index 5a69da2fcfac7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index 52df2f7eb0db7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index 503cc78028482..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index b5c176d271bdf..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index 4c169ecde1f39..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index 5d09b0429e850..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index 94f332e70b3d9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index 1d2594bb3f04b..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_lte.png
deleted file mode 100644
index 22eec00eb4344..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_r.png
deleted file mode 100644
index 99efc08ff3979..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index a6b03939ecf45..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index ede64f1617cb8..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_h.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
deleted file mode 100644
index e82ba13b2b62a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index 7097b26e84dd9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index 43fbaeb27d003..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_no_signal.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
deleted file mode 100644
index 83e7206ff73dc..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 8a72b0a3dadf1..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 4f1632d64e2f5..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index fd9eb8b4f6b7d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index aa0677e2e5110..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index cf1f099588b8d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 441e9dd850982..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index 2614d61c48d18..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_lte.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
deleted file mode 100644
index d8db235a454ff..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_0.png
deleted file mode 100644
index 60ede0a476877..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index a22fa28f10fe9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index 26a0543f07a3b..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index ec311628c36bb..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index 26cd26f7cfbb9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index 25ed6265c0b12..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_null.png
deleted file mode 100644
index 37da33399f416..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_0.png
deleted file mode 100644
index 5298d412d258c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_0.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
deleted file mode 100644
index 19809c214205d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index cd34141b2ed8f..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_1x.png and /dev/null 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
deleted file mode 100644
index 5691f9630fd0a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_2.png and /dev/null 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
deleted file mode 100644
index 56768dd69663a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index 094d4caf7c2b9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_3g.png and /dev/null 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
deleted file mode 100644
index 55ec5b883c9e8..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index f92aac21349a4..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index 4329b671bb1b9..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index a9c0849153354..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index 41c1f894a7db2..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index dea2bf2c95ead..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index 3a1678f31ee32..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index 2e84aa16c2a48..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index 79c97faa8e344..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index 742b5bb8360bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index 3b297af36ff9d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index c5a7b8cdf5f3b..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index 077b754f98574..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index 7907b027d653e..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_lte.png
deleted file mode 100644
index 190d3f4a8951d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_r.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_r.png
deleted file mode 100644
index 7c70da6e0af30..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index 3577fbb0e09a7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index 0aae48bc5592d..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_h.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
deleted file mode 100644
index 2d2b106687451..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index 330b96bbf70b4..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index 30fe7981b4a49..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_no_signal.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
deleted file mode 100644
index a2003fcff6f95..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index c4507c75116fb..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index bfef649a75a9c..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index c39658d75db76..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 0f2e79c81bbde..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index d37b292922226..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 96a146378a7ba..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index 9b5dbfa78de1a..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_roam.png
deleted file mode 100644
index cc6155f74d047..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_0.png
deleted file mode 100644
index 5950ef8ac36f7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index a930649fd8527..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index 9245462fb096b..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index b5b8884fc38e7..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index 11b58327a1d21..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index ff8246ef7abc0..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_null.png
deleted file mode 100644
index e0c54081b0ae5..0000000000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_0.png
deleted file mode 100644
index 3afbca44bd0bd..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1.png
deleted file mode 100644
index 2994632711d6d..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index a89191ff56278..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_2.png
deleted file mode 100644
index b11193956fd0e..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3.png
deleted file mode 100644
index 98c8e2539228d..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index 8a8e32362516e..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4.png
deleted file mode 100644
index 625dbd9289ed0..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index c1063a992bf9a..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index f1454104aa582..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index ea4ab189c57f8..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index 1d063d7e8fd53..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index 2f76529494ea6..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index b8551ac7b4301..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index 25e5586c063a2..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index 244280b0be846..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index f0bd70ebaeebb..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index befe94d7f0760..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index 01a81ab5004e6..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index abed2903ebfdc..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index e4b1fad28f249..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_h.png and /dev/null 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
deleted file mode 100644
index da8ebce6daa22..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png and /dev/null 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
deleted file mode 100644
index 776210b77cbf4..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index a5de26feac4d7..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index b3d452477a034..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png and /dev/null 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
deleted file mode 100644
index 0555eedf26757..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index b27479a07599e..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index 59221612826bb..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png and /dev/null 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
deleted file mode 100644
index f1753d66ea1a7..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_0.png
deleted file mode 100644
index b177999d8a3e3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png
deleted file mode 100644
index 60e38adad6b4f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png
deleted file mode 100644
index 89833802fb984..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png
deleted file mode 100644
index ff652df155b4c..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png
deleted file mode 100644
index 8dd9c43ee3ec4..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_1.png
deleted file mode 100644
index b3318bc97b8f3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_2.png
deleted file mode 100644
index 18f530773aa23..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_3.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_3.png
deleted file mode 100644
index 6d08001ce71d2..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_4.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_4.png
deleted file mode 100644
index ef3023ed1cc0d..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_no_network.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_no_network.png
deleted file mode 100644
index 535a4fdc3be61..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_not_connected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_not_connected.png
deleted file mode 100644
index b177999d8a3e3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_not_connected.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 36713aebde883..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 1c9e31377cf8e..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index 7b1b16f29ee07..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 02dc258c76f1b..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 27417d8f952de..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index f3a805c6813e0..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index 8a8c3d96afa4f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_lte.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
deleted file mode 100644
index fb2a6b6272fcc..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png
deleted file mode 100644
index ca02605733807..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 2dcbe28aaf0d6..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index fe7189308ed4f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index a6c61fff5df19..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index ba4a9d9b6c94c..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index 79c2ec16a29dd..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png
deleted file mode 100644
index 454861762cea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index 3cc96ee3b4470..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index 34ae3bf53884c..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index cb3623a68cbcf..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index 4f9a8b05cf145..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 441de0ce78f81..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png
deleted file mode 100644
index 34abc98e519d2..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_0.png
deleted file mode 100644
index e3030168c89b8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png
deleted file mode 100644
index abc9358843743..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index f88e3a4af69e8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png
deleted file mode 100644
index 0419144287aed..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png
deleted file mode 100644
index 515ffe7536c02..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index 9aff8aaf3f4b8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png
deleted file mode 100644
index 118de2dc3d81d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index 2e0030339ff52..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index 33ae551509c6b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index 2ef694e4ef525..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index d6af953d4902f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index 2866e4c949e28..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index a702239cf2706..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index 33e03109bb56b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index 922f7cae739c8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index a857c32297bca..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index 82ced1e958a73..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index 7ae8f90e2504a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index 050cbcb2d59ad..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index 7440bc0331896..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_h.png and /dev/null 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
deleted file mode 100644
index 4212e49c16197..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png and /dev/null 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
deleted file mode 100644
index 2176a88043a11..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index fb09a26ff7c19..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index b52aec7d1a3ed..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png and /dev/null 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
deleted file mode 100644
index 9942e7aed35b9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index f7571dbd571ad..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index 48650c71d3050..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png and /dev/null 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
deleted file mode 100644
index 1efdebff576c4..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_0.png
deleted file mode 100644
index 2afe50491261f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png
deleted file mode 100644
index 715e60a2195b5..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png
deleted file mode 100644
index ed7f5b9633373..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png
deleted file mode 100644
index 8f1464bd4feab..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png
deleted file mode 100644
index b32c676de4ca8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_1.png
deleted file mode 100644
index 6df8484810020..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_2.png
deleted file mode 100644
index d7915c60032ec..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_3.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_3.png
deleted file mode 100644
index c3773d24d2501..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_4.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_4.png
deleted file mode 100644
index 263d697d21f30..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_no_network.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_no_network.png
deleted file mode 100644
index b86f140ae22b2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_not_connected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_not_connected.png
deleted file mode 100644
index 2afe50491261f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_not_connected.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 22040933563d0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 9f5e4afd2af52..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index a95b9e171469b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 42ad245e0d9a9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index fde5323e61657..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index c6cca3e8aa829..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index 84f5cb19e9e5b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_lte.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
deleted file mode 100644
index 5228c29618a77..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0.png
deleted file mode 100644
index 659275f251dc5..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 17c0d9994a3ea..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index 8a5a476cc425d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index a6c12b2eb1db4..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index 3fdc60e7465bc..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index b09247e1aca5e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png
deleted file mode 100644
index 3b94b6b94c646..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index e402ff66322cf..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index 313ce4e812398..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index 546c7a8412e65..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index ec45d867cabe0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 459a1a2e83ce8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png
deleted file mode 100644
index d6f752afc76a5..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_0.png
deleted file mode 100644
index 76f39c04a926a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1.png
deleted file mode 100644
index 746b9ea9732bd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1.png and /dev/null 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
deleted file mode 100644
index 6706ae2194e74..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_2.png
deleted file mode 100644
index 55ba5abd6d763..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3.png
deleted file mode 100644
index 547f875b2f93d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3.png and /dev/null 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
deleted file mode 100644
index 4d1dc751ff46f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4.png
deleted file mode 100644
index 1f65ad52838cb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4.png and /dev/null 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
deleted file mode 100644
index aab9d27d7c07a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_4g.png and /dev/null 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
deleted file mode 100644
index cd92c5f806fef..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_0.png
deleted file mode 100644
index eb4b855be7574..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_1.png
deleted file mode 100644
index d8556b22c3970..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_1x.png
deleted file mode 100644
index ed1f7c58d0818..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_2.png
deleted file mode 100644
index b913f6e10a862..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_3.png
deleted file mode 100644
index 7a1de139a7b25..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_3g.png
deleted file mode 100644
index a4f4461b182e2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_4.png
deleted file mode 100644
index 7b3d06da6aa48..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_4g.png
deleted file mode 100644
index 7cdcdf41b1a01..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_e.png
deleted file mode 100644
index c9bed1a21ff35..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_g.png
deleted file mode 100644
index b9aca9a7c5f67..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_h.png
deleted file mode 100644
index 25edf976edb11..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_h.png and /dev/null 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
deleted file mode 100644
index 0dc66b4e30e5c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_lte.png and /dev/null 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
deleted file mode 100644
index b60cda61cb298..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_full_r.png and /dev/null 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
deleted file mode 100644
index b68637633c0b6..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_g.png and /dev/null 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
deleted file mode 100644
index bfe2271f7ebce..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_h.png and /dev/null 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
deleted file mode 100644
index b5def3e053798..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_no_network.png
deleted file mode 100644
index 78fe964485c98..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_no_signal.png
deleted file mode 100644
index 9755011d115e2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_no_signal.png and /dev/null 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
deleted file mode 100644
index 60e2bd3ceb317..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_signal_r.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_0.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_0.png
deleted file mode 100644
index 1951654c11d8d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_1.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_1.png
deleted file mode 100644
index 01274a6f552d4..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_2.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_2.png
deleted file mode 100644
index a02832dde1d80..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_3.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_3.png
deleted file mode 100644
index 7e55bbb8d9880..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_4.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_4.png
deleted file mode 100644
index eeb898998e8bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_1.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_1.png
deleted file mode 100644
index f60d8a57c18ee..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_2.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_2.png
deleted file mode 100644
index ac882397a96a9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_3.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_3.png
deleted file mode 100644
index 4a3c770c0e10b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_4.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_4.png
deleted file mode 100644
index b7e7d6fc0d33c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_full_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_no_network.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_no_network.png
deleted file mode 100644
index 9bbb359b182df..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_no_network.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_not_connected.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_not_connected.png
deleted file mode 100644
index 89c8fc1c53ae9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_not_connected.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index ba64922cb6f8a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 5b57c1eed295d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index 64b8b26e0055a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 02e74119cfe78..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 0a5dc61c8553e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 96a747cc7fdaa..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_lte.png
deleted file mode 100644
index 46584bc9bd890..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_lte.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_roam.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_roam.png
deleted file mode 100644
index 1f8549ef9b1ab..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_data_fully_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_0.png
deleted file mode 100644
index 3c9d3e6083dc0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 065f1dabbe289..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index da2da18dd3f0a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index 30c5abfb8fa61..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index e49fd0a05b107..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index c5114e7f1d663..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_null.png
deleted file mode 100644
index b388b8f5fc440..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index bc272edc09b44..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index d032db3656611..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index 562101b91b9aa..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index ceb4163809834..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 494b005326d8d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_null.png
deleted file mode 100644
index 3da56adb9dc9f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_wifi_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_0.xml b/packages/SystemUI/res/drawable/ic_qs_signal_0.xml
new file mode 100644
index 0000000000000..f63dfb12e203b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_0.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_1.xml b/packages/SystemUI/res/drawable/ic_qs_signal_1.xml
new file mode 100644
index 0000000000000..adbda4ae968d0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_1.xml
@@ -0,0 +1,34 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>
+    <path
+        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml
new file mode 100644
index 0000000000000..877526449710e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4.300000,11.000000L2.700000,11.000000L2.700000,4.400000L1.000000,5.100000L1.000000,3.700000l3.100000,-1.300000l0.200000,0.000000L4.300000,11.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9.500000,5.500000l1.200000,-3.000000l1.900000,0.000000l-2.100000,4.200000l2.200000,4.300000l-1.900000,0.000000L9.500000,7.900000L8.300000,11.000000L6.300000,11.000000l2.100000,-4.300000L6.400000,2.500000l1.900000,0.000000L9.500000,5.500000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_2.xml b/packages/SystemUI/res/drawable/ic_qs_signal_2.xml
new file mode 100644
index 0000000000000..3358d65b68e6e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_2.xml
@@ -0,0 +1,34 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.900000,10.000000l-11.900000,12.000000 11.900000,0.000000z"/>
+    <path
+        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_3.xml b/packages/SystemUI/res/drawable/ic_qs_signal_3.xml
new file mode 100644
index 0000000000000..63838a93c686d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_3.xml
@@ -0,0 +1,34 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,19.900000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,9.900000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.700001,7.200000l-14.700001,14.700000 14.700001,0.000000z"/>
+    <path
+        android:pathData="M17.700001,7.900000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml
new file mode 100644
index 0000000000000..4b4e2e538a91f
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_3g.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.600000,6.000000l0.800000,0.000000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000s0.200000,-0.500000 0.200000,-0.900000c0.000000,-0.300000 -0.100000,-0.600000 -0.200000,-0.800000S3.700000,3.700000 3.500000,3.700000C3.200000,3.700000 3.000000,3.800000 2.900000,4.000000S2.600000,4.400000 2.600000,4.700000L1.000000,4.700000C1.000000,4.000000 1.200000,3.400000 1.700000,3.000000s1.000000,-0.600000 1.700000,-0.600000c0.800000,0.000000 1.400000,0.200000 1.900000,0.600000S6.000000,4.000000 6.000000,4.800000c0.000000,0.400000 -0.100000,0.700000 -0.300000,1.100000S5.200000,6.500000 4.800000,6.600000c0.400000,0.200000 0.700000,0.400000 0.900000,0.800000s0.300000,0.700000 0.300000,1.200000c0.000000,0.800000 -0.200000,1.400000 -0.700000,1.800000s-1.100000,0.700000 -1.900000,0.700000c-0.700000,0.000000 -1.300000,-0.200000 -1.800000,-0.600000s-0.700000,-1.000000 -0.700000,-1.800000l1.700000,0.000000c0.000000,0.300000 0.100000,0.600000 0.300000,0.800000s0.400000,0.300000 0.600000,0.300000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000S4.400000,9.000000 4.400000,8.600000c0.000000,-0.500000 -0.100000,-0.800000 -0.300000,-1.000000S3.700000,7.300000 3.400000,7.300000L2.600000,7.300000L2.600000,6.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.100000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S7.300000,9.000000 7.300000,7.900000L7.300000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000S13.000000,4.200000 13.000000,5.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000s-0.500000,-0.300000 -0.900000,-0.300000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S8.900000,5.000000 8.900000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L11.299999,7.800000l-1.300000,0.000000L9.999999,6.600000l2.900000,0.000000L12.900000,9.900000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4.xml
new file mode 100644
index 0000000000000..76690cc2adce2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_4.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.000000,22.000000l15.700001,0.000000 0.000000,-14.000000 4.299999,0.000000 0.000000,-6.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml
new file mode 100644
index 0000000000000..920692fc11034
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5.700000,7.800000l0.700000,0.000000l0.000000,1.300000L5.700000,9.100000L5.700000,11.000000L4.000000,11.000000L4.000000,9.200000L1.200000,9.200000l-0.100000,-1.000000L4.000000,2.500000l1.700000,0.000000L5.700000,7.800000zM2.700000,7.800000L4.000000,7.800000l0.000000,-3.000000L4.000000,5.000000L2.700000,7.800000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S7.200000,9.000000 7.200000,7.900000L7.200000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000s-0.500000,-0.300000 -0.900000,-0.300000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S8.800000,5.000000 8.800000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L11.200000,7.800000l-1.300000,0.000000L9.900000,6.600000L13.000000,6.600000L13.000000,9.900000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml
new file mode 100644
index 0000000000000..737f2d8915575
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5.900000,7.300000L3.100000,7.300000l0.000000,2.400000l3.300000,0.000000L6.400000,11.000000L1.400000,11.000000L1.400000,2.500000l4.900000,0.000000l0.000000,1.300000L3.100000,3.800000l0.000000,2.100000l2.800000,0.000000L5.900000,7.300000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml
new file mode 100644
index 0000000000000..326373ddc9e81
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml
new file mode 100644
index 0000000000000..a71e33aa2eb52
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml
new file mode 100644
index 0000000000000..bf19a718e0fc9
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14.000000,10.000000l-12.000000,12.000000 12.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml
new file mode 100644
index 0000000000000..01839e8589ef0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.700001,7.300000l-14.700001,14.700000 14.700001,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml
new file mode 100644
index 0000000000000..48151ad78a6c2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml
new file mode 100644
index 0000000000000..b0f3c0f27706b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.500000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S1.700000,9.000000 1.700000,7.900000L1.700000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000L5.700000,5.200000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000S5.000000,3.700000 4.600000,3.700000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S3.300000,5.000000 3.300000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L5.700000,7.800000L4.500000,7.800000L4.500000,6.600000l2.900000,0.000000L7.400000,9.900000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml
new file mode 100644
index 0000000000000..8532b27580c4b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.700000,11.000000L6.000000,11.000000L6.000000,7.500000L3.400000,7.500000L3.400000,11.000000L1.700000,11.000000L1.700000,2.500000l1.700000,0.000000l0.000000,3.700000L6.000000,6.200000L6.000000,2.500000l1.600000,0.000000L7.600000,11.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml
new file mode 100644
index 0000000000000..ec273edaa56aa
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.000000,9.700000l2.000000,0.000000L4.000000,11.000000L0.300000,11.000000L0.300000,2.500000L2.000000,2.500000L2.000000,9.700000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M8.300000,3.800000L7.000000,3.800000L7.000000,11.000000L5.300000,11.000000L5.300000,3.800000L4.000000,3.800000L4.000000,2.500000l4.300000,0.000000L8.300000,3.800000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12.400000,7.300000l-1.700000,0.000000l0.000000,2.400000l2.100000,0.000000L12.799999,11.000000L9.000000,11.000000L9.000000,2.500000l3.700000,0.000000l0.000000,1.300000l-2.100000,0.000000l0.000000,2.100000l1.700000,0.000000L12.300000,7.300000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml b/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml
new file mode 100644
index 0000000000000..f7fd97c60667b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000L22.000000,2.000000L2.000000,22.000000zM20.000000,20.000000L6.800000,20.000000L20.000000,6.800000L20.000000,20.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_r.xml b/packages/SystemUI/res/drawable/ic_qs_signal_r.xml
new file mode 100644
index 0000000000000..bbf2761e0d25a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_r.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4.100000,7.900000l-1.000000,0.000000L3.100000,11.000000L1.400000,11.000000L1.400000,2.500000l2.700000,0.000000c0.900000,0.000000 1.500000,0.200000 2.000000,0.700000s0.700000,1.100000 0.700000,1.900000c0.000000,0.600000 -0.100000,1.100000 -0.300000,1.500000S6.000000,7.200000 5.600000,7.400000l1.500000,3.500000L7.100000,11.000000L5.400000,11.000000L4.100000,7.900000zM3.100000,6.500000l1.100000,0.000000c0.400000,0.000000 0.600000,-0.100000 0.800000,-0.400000s0.300000,-0.600000 0.300000,-1.000000c0.000000,-0.400000 -0.100000,-0.800000 -0.300000,-1.000000S4.600000,3.800000 4.200000,3.800000L3.100000,3.800000L3.100000,6.500000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_0.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_0.xml
new file mode 100644
index 0000000000000..50c427e24c9ba
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_0.xml
@@ -0,0 +1,30 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.200000,-1.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_1.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_1.xml
new file mode 100644
index 0000000000000..a2d11a09aab8f
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_1.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000l5.500000,-6.800000c-0.200000,-0.200000 -2.300000,-1.900000 -5.500000,-1.900000s-5.300000,1.800000 -5.500000,1.900000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml
new file mode 100644
index 0000000000000..f2043fc4bcaf6
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.000000,11.600000c-1.300000,-0.700000 -3.400000,-1.600000 -6.000000,-1.600000c-4.400000,0.000000 -7.300000,2.400000 -7.600000,2.700000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,11.600000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml
new file mode 100644
index 0000000000000..b7a4f4c81ec83
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.000000,8.600000c-1.600000,-0.700000 -3.600000,-1.300000 -6.000000,-1.300000c-5.300000,0.000000 -8.900000,3.000000 -9.200000,3.200000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.600000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml
new file mode 100644
index 0000000000000..35a9138b31d2d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml
@@ -0,0 +1,30 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_0.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_0.xml
new file mode 100644
index 0000000000000..1bc743816befb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_0.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_1.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_1.xml
new file mode 100644
index 0000000000000..58561159e6a99
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_1.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.100000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.500000,6.500000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.100000,22.000000l5.500000,-6.800000c-0.200000,-0.200000 -2.300000,-1.900000 -5.500000,-1.900000s-5.300000,1.800000 -5.500000,1.900000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_2.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_2.xml
new file mode 100644
index 0000000000000..4a5e1f8fa1b15
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_2.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000l7.600000,-9.400000C20.299999,12.400000 17.400000,10.000000 13.000000,10.000000s-7.300000,2.400000 -7.600000,2.700000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_3.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_3.xml
new file mode 100644
index 0000000000000..965442d4c2630
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_3.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000l9.200000,-11.400000c-0.400000,-0.300000 -3.900000,-3.200000 -9.200000,-3.200000s-8.900000,3.000000 -9.200000,3.200000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_4.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_4.xml
new file mode 100644
index 0000000000000..b29d3f932b62d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_4.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml
new file mode 100644
index 0000000000000..3d588693e2d5c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="29.5dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,2.000000C7.700000,2.000000 3.700000,3.900000 0.400000,6.400000L13.000000,22.000000L25.600000,6.500000C22.299999,4.000000 18.299999,2.000000 13.000000,2.000000zM13.000000,18.600000L3.300000,7.000000l0.000000,0.000000l0.000000,0.000000C6.000000,5.300000 8.700000,4.000000 13.000000,4.000000s7.000000,1.400000 9.700000,3.000000l0.000000,0.000000l0.000000,0.000000L13.000000,18.600000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_1x.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_1x.xml
new file mode 100644
index 0000000000000..c0252fa26919f
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_1x.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4.300000,11.000000L2.700000,11.000000L2.700000,4.400000L1.000000,5.100000L1.000000,3.700000l3.100000,-1.300000l0.200000,0.000000L4.300000,11.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9.500000,5.500000l1.200000,-3.000000l1.900000,0.000000l-2.100000,4.200000l2.200000,4.300000l-1.900000,0.000000L9.500000,7.900000L8.300000,11.000000L6.300000,11.000000l2.100000,-4.300000L6.400000,2.500000l1.900000,0.000000L9.500000,5.500000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_3g.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_3g.xml
new file mode 100644
index 0000000000000..9a6a032bdb0cc
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_3g.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.600000,6.000000l0.800000,0.000000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000s0.200000,-0.500000 0.200000,-0.900000c0.000000,-0.300000 -0.100000,-0.600000 -0.200000,-0.800000S3.700000,3.700000 3.500000,3.700000C3.200000,3.700000 3.000000,3.800000 2.900000,4.000000S2.600000,4.400000 2.600000,4.700000L1.000000,4.700000C1.000000,4.000000 1.200000,3.400000 1.700000,3.000000s1.000000,-0.600000 1.700000,-0.600000c0.800000,0.000000 1.400000,0.200000 1.900000,0.600000S6.000000,4.000000 6.000000,4.800000c0.000000,0.400000 -0.100000,0.700000 -0.300000,1.100000S5.200000,6.500000 4.800000,6.600000c0.400000,0.200000 0.700000,0.400000 0.900000,0.800000s0.300000,0.700000 0.300000,1.200000c0.000000,0.800000 -0.200000,1.400000 -0.700000,1.800000s-1.100000,0.700000 -1.900000,0.700000c-0.700000,0.000000 -1.300000,-0.200000 -1.800000,-0.600000s-0.700000,-1.000000 -0.700000,-1.800000l1.700000,0.000000c0.000000,0.300000 0.100000,0.600000 0.300000,0.800000s0.400000,0.300000 0.600000,0.300000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000S4.400000,9.000000 4.400000,8.600000c0.000000,-0.500000 -0.100000,-0.800000 -0.300000,-1.000000S3.700000,7.300000 3.400000,7.300000L2.600000,7.300000L2.600000,6.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.100000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S7.300000,9.000000 7.300000,7.900000L7.300000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000S13.000000,4.200000 13.000000,5.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000s-0.500000,-0.300000 -0.900000,-0.300000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S8.900000,5.000000 8.900000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L11.299999,7.800000l-1.300000,0.000000L9.999999,6.600000l2.900000,0.000000L12.900000,9.900000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g.xml
new file mode 100644
index 0000000000000..44f8cb1ee5a1b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_4g.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5.700000,7.800000l0.700000,0.000000l0.000000,1.300000L5.700000,9.100000L5.700000,11.000000L4.000000,11.000000L4.000000,9.200000L1.200000,9.200000l-0.100000,-1.000000L4.000000,2.500000l1.700000,0.000000L5.700000,7.800000zM2.700000,7.800000L4.000000,7.800000l0.000000,-3.000000L4.000000,5.000000L2.700000,7.800000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S7.200000,9.000000 7.200000,7.900000L7.200000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000s-0.500000,-0.300000 -0.900000,-0.300000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S8.800000,5.000000 8.800000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L11.200000,7.800000l-1.300000,0.000000L9.900000,6.600000L13.000000,6.600000L13.000000,9.900000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_e.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_e.xml
new file mode 100644
index 0000000000000..e9014eed0c7d1
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_e.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5.900000,7.300000L3.100000,7.300000l0.000000,2.400000l3.300000,0.000000L6.400000,11.000000L1.400000,11.000000L1.400000,2.500000l4.900000,0.000000l0.000000,1.300000L3.100000,3.800000l0.000000,2.100000l2.800000,0.000000L5.900000,7.300000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_g.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_g.xml
new file mode 100644
index 0000000000000..fcda0adb743cb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_g.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.500000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S1.700000,9.000000 1.700000,7.900000L1.700000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000L5.700000,5.200000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000S5.000000,3.700000 4.600000,3.700000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S3.300000,5.000000 3.300000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L5.700000,7.800000L4.500000,7.800000L4.500000,6.600000l2.900000,0.000000L7.400000,9.900000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_h.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_h.xml
new file mode 100644
index 0000000000000..b5e96952fc70c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_h.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.700000,11.000000L6.000000,11.000000L6.000000,7.500000L3.400000,7.500000L3.400000,11.000000L1.700000,11.000000L1.700000,2.500000l1.700000,0.000000l0.000000,3.700000L6.000000,6.200000L6.000000,2.500000l1.600000,0.000000L7.600000,11.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte.xml
new file mode 100644
index 0000000000000..a0cbe5f8d407d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_lte.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.000000,9.700000l2.000000,0.000000L4.000000,11.000000L0.300000,11.000000L0.300000,2.500000L2.000000,2.500000L2.000000,9.700000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M8.300000,3.800000L7.000000,3.800000L7.000000,11.000000L5.300000,11.000000L5.300000,3.800000L4.000000,3.800000L4.000000,2.500000l4.300000,0.000000L8.300000,3.800000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12.400000,7.300000l-1.700000,0.000000l0.000000,2.400000l2.100000,0.000000L12.799999,11.000000L9.000000,11.000000L9.000000,2.500000l3.700000,0.000000l0.000000,1.300000l-2.100000,0.000000l0.000000,2.100000l1.700000,0.000000L12.300000,7.300000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_roam.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_roam.xml
new file mode 100644
index 0000000000000..4a542f9988347
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_roam.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4.100000,7.900000l-1.000000,0.000000L3.100000,11.000000L1.400000,11.000000L1.400000,2.500000l2.700000,0.000000c0.900000,0.000000 1.500000,0.200000 2.000000,0.700000s0.700000,1.100000 0.700000,1.900000c0.000000,0.600000 -0.100000,1.100000 -0.300000,1.500000S6.000000,7.200000 5.600000,7.400000l1.500000,3.500000L7.100000,11.000000L5.400000,11.000000L4.100000,7.900000zM3.100000,6.500000l1.100000,0.000000c0.400000,0.000000 0.600000,-0.100000 0.800000,-0.400000s0.300000,-0.600000 0.300000,-1.000000c0.000000,-0.400000 -0.100000,-0.800000 -0.300000,-1.000000S4.600000,3.800000 4.200000,3.800000L3.100000,3.800000L3.100000,6.500000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_0.xml b/packages/SystemUI/res/drawable/stat_sys_signal_0.xml
new file mode 100644
index 0000000000000..67d925932246f
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_0.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_0_fully.xml b/packages/SystemUI/res/drawable/stat_sys_signal_0_fully.xml
new file mode 100644
index 0000000000000..3bbb800c7e517
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_0_fully.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_1.xml b/packages/SystemUI/res/drawable/stat_sys_signal_1.xml
new file mode 100644
index 0000000000000..55f764a4f59f0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_1.xml
@@ -0,0 +1,34 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>
+    <path
+        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_1_fully.xml b/packages/SystemUI/res/drawable/stat_sys_signal_1_fully.xml
new file mode 100644
index 0000000000000..b82e428f777fd
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_1_fully.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_2.xml b/packages/SystemUI/res/drawable/stat_sys_signal_2.xml
new file mode 100644
index 0000000000000..ca0eeb3e00bab
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_2.xml
@@ -0,0 +1,34 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.900000,10.000000l-11.900000,12.000000 11.900000,0.000000z"/>
+    <path
+        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_2_fully.xml b/packages/SystemUI/res/drawable/stat_sys_signal_2_fully.xml
new file mode 100644
index 0000000000000..abc8dd1248880
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_2_fully.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14.000000,10.000000l-12.000000,12.000000 12.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_3.xml b/packages/SystemUI/res/drawable/stat_sys_signal_3.xml
new file mode 100644
index 0000000000000..2b3e571ed0b19
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_3.xml
@@ -0,0 +1,34 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,19.900000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,9.900000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.700001,7.200000l-14.700001,14.700000 14.700001,0.000000z"/>
+    <path
+        android:pathData="M17.700001,7.900000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"
+        android:fillColor="#4DFFFFFF"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_3_fully.xml b/packages/SystemUI/res/drawable/stat_sys_signal_3_fully.xml
new file mode 100644
index 0000000000000..d47f167d992eb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_3_fully.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.700001,7.300000l-14.700001,14.700000 14.700001,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_4.xml b/packages/SystemUI/res/drawable/stat_sys_signal_4.xml
new file mode 100644
index 0000000000000..7d4dd8a0ac23a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_4.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.000000,22.000000l15.700001,0.000000 0.000000,-14.000000 4.299999,0.000000 0.000000,-6.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_4_fully.xml b/packages/SystemUI/res/drawable/stat_sys_signal_4_fully.xml
new file mode 100644
index 0000000000000..5b1bac32960fa
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_4_fully.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_null.xml b/packages/SystemUI/res/drawable/stat_sys_signal_null.xml
new file mode 100644
index 0000000000000..45d34a2c722df
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_signal_null.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000L22.000000,2.000000L2.000000,22.000000zM20.000000,20.000000L6.800000,20.000000L20.000000,6.800000L20.000000,20.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0.xml
new file mode 100644
index 0000000000000..49656742deffc
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0.xml
@@ -0,0 +1,30 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.200000,-1.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0_fully.xml
new file mode 100644
index 0000000000000..e9cad0ec08132
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0_fully.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1.xml
new file mode 100644
index 0000000000000..7d588a366ff3a
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000l5.500000,-6.800000c-0.200000,-0.200000 -2.300000,-1.900000 -5.500000,-1.900000s-5.300000,1.800000 -5.500000,1.900000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1_fully.xml
new file mode 100644
index 0000000000000..348f9634aef40
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1_fully.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.100000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.500000,6.500000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.100000,22.000000l5.500000,-6.800000c-0.200000,-0.200000 -2.300000,-1.900000 -5.500000,-1.900000s-5.300000,1.800000 -5.500000,1.900000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000L13.100000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2.xml
new file mode 100644
index 0000000000000..4fbdd690adc56
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.000000,11.600000c-1.300000,-0.700000 -3.400000,-1.600000 -6.000000,-1.600000c-4.400000,0.000000 -7.300000,2.400000 -7.600000,2.700000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,11.600000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2_fully.xml
new file mode 100644
index 0000000000000..66588f0e7f06b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2_fully.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000l7.600000,-9.400000C20.299999,12.400000 17.400000,10.000000 13.000000,10.000000s-7.300000,2.400000 -7.600000,2.700000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3.xml
new file mode 100644
index 0000000000000..1f3de7441ad35
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3.xml
@@ -0,0 +1,33 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.000000,8.600000c-1.600000,-0.700000 -3.600000,-1.300000 -6.000000,-1.300000c-5.300000,0.000000 -8.900000,3.000000 -9.200000,3.200000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.600000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3_fully.xml
new file mode 100644
index 0000000000000..aa5d2ed8341d2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3_fully.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000l9.200000,-11.400000c-0.400000,-0.300000 -3.900000,-3.200000 -9.200000,-3.200000s-8.900000,3.000000 -9.200000,3.200000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4.xml
new file mode 100644
index 0000000000000..ca53b56aa2c65
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4.xml
@@ -0,0 +1,30 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19.000000,8.000000l5.300000,0.000000l1.300000,-1.600000C25.100000,6.000000 20.299999,2.000000 13.000000,2.000000S0.900000,6.000000 0.400000,6.400000L13.000000,22.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l0.000000,0.000000l6.000000,-7.400000L19.000000,8.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.000000,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4_fully.xml
new file mode 100644
index 0000000000000..1c7a5399c51bd
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4_fully.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_null.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_null.xml
new file mode 100644
index 0000000000000..c68fb499dd074
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_null.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="18dp"
+        android:viewportWidth="26.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M13.000000,2.000000C7.700000,2.000000 3.700000,3.900000 0.400000,6.400000L13.000000,22.000000L25.600000,6.500000C22.299999,4.000000 18.299999,2.000000 13.000000,2.000000zM13.000000,18.600000L3.300000,7.000000l0.000000,0.000000l0.000000,0.000000C6.000000,5.300000 8.700000,4.000000 13.000000,4.000000s7.000000,1.400000 9.700000,3.000000l0.000000,0.000000l0.000000,0.000000L13.000000,18.600000z"/>
+</vector>
diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml
index 2b9cef91b59fe..ae54f8c26bc6f 100644
--- a/packages/SystemUI/res/layout/signal_cluster_view.xml
+++ b/packages/SystemUI/res/layout/signal_cluster_view.xml
@@ -17,27 +17,23 @@
 ** limitations under the License.
 */
 -->
-
+<!-- extends LinearLayout -->
 <com.android.systemui.statusbar.SignalClusterView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="wrap_content"
-    android:gravity="center"
+    android:gravity="center_vertical"
     android:orientation="horizontal"
     >
     <FrameLayout
         android:id="@+id/wifi_combo"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginEnd="-6dp"
         >
         <ImageView
             android:id="@+id/wifi_signal"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:scaleType="center"
             />
     </FrameLayout>
     <View
@@ -46,22 +42,6 @@
         android:visibility="gone"
         android:id="@+id/spacer"
         />
-    <!--<FrameLayout
-        android:id="@+id/wimax_combo"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginEnd="-6dp"
-        >
-        <ImageView
-            android:id="@+id/wimax_signal"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:scaleType="center"
-            />
-    </FrameLayout>
-    -->
     <FrameLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
diff --git a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
index d9447f72939dc..669775134502c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
@@ -18,8 +18,6 @@ package com.android.systemui.qs;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.graphics.ColorFilter;
-import android.graphics.LightingColorFilter;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -31,7 +29,6 @@ import com.android.systemui.qs.QSTile.SignalState;
 public final class SignalTileView extends QSTileView {
     private static final long DEFAULT_DURATION = new ValueAnimator().getDuration();
     private static final long SHORT_DURATION = DEFAULT_DURATION / 3;
-    private static final ColorFilter FILTER = new LightingColorFilter(0xffffffff, 0xff283034);
 
     private FrameLayout mIconFrame;
     private ImageView mSignal;
@@ -49,7 +46,6 @@ public final class SignalTileView extends QSTileView {
     private ImageView addTrafficView(int icon) {
         final ImageView traffic = new ImageView(mContext);
         traffic.setImageResource(icon);
-        traffic.setColorFilter(FILTER);
         traffic.setAlpha(0f);
         addView(traffic);
         return traffic;
@@ -95,12 +91,10 @@ public final class SignalTileView extends QSTileView {
         final SignalState s = (SignalState) state;
         mSignal.setImageDrawable(null);  // force refresh
         mSignal.setImageResource(s.iconId);
-        mSignal.setColorFilter(s.filter ? FILTER : null);
         if (s.overlayIconId > 0) {
             mOverlay.setVisibility(VISIBLE);
             mOverlay.setImageDrawable(null);  // force refresh
             mOverlay.setImageResource(s.overlayIconId);
-            mOverlay.setColorFilter(s.filter ? FILTER : null);
         } else {
             mOverlay.setVisibility(GONE);
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
index 8bae19a0d789f..fb131265a6f4a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
@@ -17,9 +17,6 @@
 package com.android.systemui.statusbar;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -36,16 +33,13 @@ public class SignalClusterView
         extends LinearLayout
         implements NetworkControllerImpl.SignalCluster {
 
-    static final boolean DEBUG = false;
     static final String TAG = "SignalClusterView";
-    static final PorterDuffColorFilter PROBLEM_FILTER
-            = new PorterDuffColorFilter(0xffab653b, PorterDuff.Mode.SRC_ATOP);
+    static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     NetworkControllerImpl mNC;
 
     private boolean mWifiVisible = false;
     private int mWifiStrengthId = 0;
-    private boolean mInetProblem;
     private boolean mMobileVisible = false;
     private int mMobileStrengthId = 0, mMobileTypeId = 0;
     private boolean mIsAirplaneMode = false;
@@ -102,22 +96,19 @@ public class SignalClusterView
     }
 
     @Override
-    public void setWifiIndicators(boolean visible, int strengthIcon, boolean problem,
-            String contentDescription) {
+    public void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription) {
         mWifiVisible = visible;
         mWifiStrengthId = strengthIcon;
-        mInetProblem = problem;
         mWifiDescription = contentDescription;
 
         apply();
     }
 
     @Override
-    public void setMobileDataIndicators(boolean visible, int strengthIcon, boolean problem,
-            int typeIcon, String contentDescription, String typeContentDescription) {
+    public void setMobileDataIndicators(boolean visible, int strengthIcon, int typeIcon,
+            String contentDescription, String typeContentDescription) {
         mMobileVisible = visible;
         mMobileStrengthId = strengthIcon;
-        mInetProblem = problem;
         mMobileTypeId = typeIcon;
         mMobileDescription = contentDescription;
         mMobileTypeDescription = typeContentDescription;
@@ -172,17 +163,12 @@ public class SignalClusterView
         return false;
     }
 
-    private void applyInetProblem(ImageView iv) {
-        iv.setColorFilter(Build.IS_DEBUGGABLE && mInetProblem ? PROBLEM_FILTER : null);
-    }
-
     // Run after each indicator change.
     private void apply() {
         if (mWifiGroup == null) return;
 
         if (mWifiVisible) {
             mWifi.setImageResource(mWifiStrengthId);
-            applyInetProblem(mWifi);
             mWifiGroup.setContentDescription(mWifiDescription);
             mWifiGroup.setVisibility(View.VISIBLE);
         } else {
@@ -197,7 +183,6 @@ public class SignalClusterView
         if (mMobileVisible && !mIsAirplaneMode) {
             mMobile.setImageResource(mMobileStrengthId);
             mMobileType.setImageResource(mMobileTypeId);
-            applyInetProblem(mMobile);
             mMobileGroup.setContentDescription(mMobileTypeDescription + " " + mMobileDescription);
             mMobileGroup.setVisibility(View.VISIBLE);
         } else {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 4fc2e0651eb47..70fe85fdb0ba4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -163,10 +163,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
     boolean mDataAndWifiStacked = false;
 
     public interface SignalCluster {
-        void setWifiIndicators(boolean visible, int strengthIcon, boolean problem,
-                String contentDescription);
-        void setMobileDataIndicators(boolean visible, int strengthIcon, boolean problem,
-                int typeIcon, String contentDescription, String typeContentDescription);
+        void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription);
+        void setMobileDataIndicators(boolean visible, int strengthIcon, int typeIcon,
+                String contentDescription, String typeContentDescription);
         void setIsAirplaneMode(boolean is, int airplaneIcon);
     }
 
@@ -365,7 +364,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
                 // only show wifi in the cluster if connected or if wifi-only
                 mWifiEnabled && (mWifiConnected || !mHasMobileDataFeature),
                 mWifiIconId,
-                mInetCondition == 0,
                 mContentDescriptionWifi);
 
         if (mIsWimaxEnabled && mWimaxConnected) {
@@ -373,7 +371,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
             cluster.setMobileDataIndicators(
                     true,
                     mAlwaysShowCdmaRssi ? mPhoneSignalIconId : mWimaxIconId,
-                    mInetCondition == 0,
                     mDataTypeIconId,
                     mContentDescriptionWimax,
                     mContentDescriptionDataType);
@@ -382,7 +379,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
             cluster.setMobileDataIndicators(
                     mHasMobileDataFeature,
                     mShowPhoneRSSIForData ? mPhoneSignalIconId : mDataSignalIconId,
-                    mInetCondition == 0,
                     mDataTypeIconId,
                     mContentDescriptionPhoneSignal,
                     mContentDescriptionDataType);
@@ -599,6 +595,12 @@ public class NetworkControllerImpl extends BroadcastReceiver
 
     private final void updateTelephonySignalStrength() {
         Rlog.d(TAG, "updateTelephonySignalStrength: hasService=" + hasService() + " ss=" + mSignalStrength);
+        if (mDemoMode) {
+            mQSPhoneSignalIconId = mDemoMobileLevel < 0 ? R.drawable.ic_qs_signal_no_signal :
+                    TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[mDemoInetCondition][mDemoMobileLevel];
+            mQSDataTypeIconId = mDemoQSDataTypeIconId;
+            return;
+        }
         if (!hasService()) {
             if (true/*CHATTY*/) Log.d(TAG, "updateTelephonySignalStrength: !hasService()");
             mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
@@ -948,6 +950,11 @@ public class NetworkControllerImpl extends BroadcastReceiver
     }
 
     private void updateWifiIcons() {
+        if (mDemoMode) {
+            mQSWifiIconId = mDemoWifiLevel < 0 ? R.drawable.ic_qs_wifi_no_network
+                    : WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mDemoInetCondition][mDemoWifiLevel];
+            return;
+        }
         if (mWifiConnected) {
             mWifiIconId = WifiIcons.WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel];
             mQSWifiIconId = WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel];
@@ -1473,6 +1480,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
     private int mDemoInetCondition;
     private int mDemoWifiLevel;
     private int mDemoDataTypeIconId;
+    private int mDemoQSDataTypeIconId;
     private int mDemoMobileLevel;
 
     @Override
@@ -1482,12 +1490,16 @@ public class NetworkControllerImpl extends BroadcastReceiver
             mDemoWifiLevel = mWifiLevel;
             mDemoInetCondition = mInetCondition;
             mDemoDataTypeIconId = mDataTypeIconId;
+            mDemoQSDataTypeIconId = mQSDataTypeIconId;
             mDemoMobileLevel = mLastSignalLevel;
         } else if (mDemoMode && command.equals(COMMAND_EXIT)) {
             mDemoMode = false;
             for (SignalCluster cluster : mSignalClusters) {
                 refreshSignalCluster(cluster);
             }
+            updateWifiIcons();
+            updateTelephonySignalStrength();
+            refreshViews();
         } else if (mDemoMode && command.equals(COMMAND_NETWORK)) {
             String airplane = args.getString("airplane");
             if (airplane != null) {
@@ -1514,9 +1526,10 @@ public class NetworkControllerImpl extends BroadcastReceiver
                     cluster.setWifiIndicators(
                             show,
                             iconId,
-                            mDemoInetCondition == 0,
                             "Demo");
                 }
+                updateWifiIcons();
+                refreshViews();
             }
             String mobile = args.getString("mobile");
             if (mobile != null) {
@@ -1534,6 +1547,16 @@ public class NetworkControllerImpl extends BroadcastReceiver
                             datatype.equals("roam")
                                     ? R.drawable.stat_sys_data_fully_connected_roam :
                             0;
+                    mDemoQSDataTypeIconId =
+                            datatype.equals("1x") ? R.drawable.ic_qs_signal_1x :
+                            datatype.equals("3g") ? R.drawable.ic_qs_signal_3g :
+                            datatype.equals("4g") ? R.drawable.ic_qs_signal_4g :
+                            datatype.equals("e") ? R.drawable.ic_qs_signal_e :
+                            datatype.equals("g") ? R.drawable.ic_qs_signal_g :
+                            datatype.equals("h") ? R.drawable.ic_qs_signal_h :
+                            datatype.equals("lte") ? R.drawable.ic_qs_signal_lte :
+                            datatype.equals("roam") ? R.drawable.ic_qs_signal_r :
+                            0;
                 }
                 int[][] icons = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH;
                 String level = args.getString("level");
@@ -1547,11 +1570,12 @@ public class NetworkControllerImpl extends BroadcastReceiver
                     cluster.setMobileDataIndicators(
                             show,
                             iconId,
-                            mDemoInetCondition == 0,
                             mDemoDataTypeIconId,
                             "Demo",
                             "Demo");
                 }
+                updateTelephonySignalStrength();
+                refreshViews();
             }
         }
     }
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 67ba879be1452..84c53ce961dba 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_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,
+          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,
@@ -49,11 +49,11 @@ class TelephonyIcons {
     };
 
     static final int[][] TELEPHONY_SIGNAL_STRENGTH_ROAMING = {
-        { 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,
+          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,
@@ -63,7 +63,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_R = {
         R.drawable.ic_qs_signal_r,
-        R.drawable.ic_qs_signal_full_r
+        R.drawable.ic_qs_signal_r
     };
 
     static final int[][] DATA_SIGNAL_STRENGTH = TELEPHONY_SIGNAL_STRENGTH;
@@ -84,7 +84,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_G = {
         R.drawable.ic_qs_signal_g,
-        R.drawable.ic_qs_signal_full_g
+        R.drawable.ic_qs_signal_g
     };
 
     static final int[][] DATA_3G = {
@@ -100,7 +100,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_3G = {
         R.drawable.ic_qs_signal_3g,
-        R.drawable.ic_qs_signal_full_3g
+        R.drawable.ic_qs_signal_3g
     };
 
     static final int[][] DATA_E = {
@@ -116,7 +116,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_E = {
         R.drawable.ic_qs_signal_e,
-        R.drawable.ic_qs_signal_full_e
+        R.drawable.ic_qs_signal_e
     };
 
     //3.5G
@@ -133,7 +133,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_H = {
                 R.drawable.ic_qs_signal_h,
-                R.drawable.ic_qs_signal_full_h
+                R.drawable.ic_qs_signal_h
     };
 
     //CDMA
@@ -151,7 +151,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_1X = {
         R.drawable.ic_qs_signal_1x,
-        R.drawable.ic_qs_signal_full_1x
+        R.drawable.ic_qs_signal_1x
     };
 
     // LTE and eHRPD
@@ -168,7 +168,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_4G = {
         R.drawable.ic_qs_signal_4g,
-        R.drawable.ic_qs_signal_full_4g
+        R.drawable.ic_qs_signal_4g
     };
 
     // LTE branded "LTE"
@@ -185,7 +185,7 @@ class TelephonyIcons {
 
     static final int[] QS_DATA_LTE = {
         R.drawable.ic_qs_signal_lte,
-        R.drawable.ic_qs_signal_full_lte
+        R.drawable.ic_qs_signal_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 57ddf7aea32ce..49af97923ecc0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java
@@ -21,11 +21,11 @@ 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_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,
+              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_0_fully,
               R.drawable.stat_sys_wifi_signal_1_fully,
               R.drawable.stat_sys_wifi_signal_2_fully,
               R.drawable.stat_sys_wifi_signal_3_fully,
@@ -38,7 +38,7 @@ class WifiIcons {
               R.drawable.ic_qs_wifi_2,
               R.drawable.ic_qs_wifi_3,
               R.drawable.ic_qs_wifi_4 },
-            { R.drawable.ic_qs_wifi_0,
+            { R.drawable.ic_qs_wifi_full_0,
               R.drawable.ic_qs_wifi_full_1,
               R.drawable.ic_qs_wifi_full_2,
               R.drawable.ic_qs_wifi_full_3,