diff --git a/CleanSpec.mk b/CleanSpec.mk
deleted file mode 100644
index a87293db5350d..0000000000000
--- a/CleanSpec.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright (C) 2007 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.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/os/IDropBoxService.java)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/backup)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/backup)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/app)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/FrameworkTest_intermediates/)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android.policy*)
-$(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/android.policy.jar)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/obj/lib/libequalizer.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/obj/lib/libequalizertest.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/obj/lib/libreverb.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/obj/lib/libreverbtest.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/symbols/system/lib/libequalizer.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/symbols/system/lib/libequalizertest.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/symbols/system/lib/libreverb.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/symbols/system/lib/libreverbtest.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libequalizer_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libequalizertest_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverb_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverbtest_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/)
-$(call add-clean-step, find . -type f -name "*.rs" -print0 | xargs -0 touch)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libandroid_runtime.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libandroid_runtime.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libandroid_runtime.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhwui_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libhwui.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libhwui.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libhwui.so)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content/IClipboard.P)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/ITelephonyRegistry.P)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates)
-$(call add-clean-step, rm -rf out/target/common/docs/api-stubs*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustedlogic)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustedlogic)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/target/common/obj/APPS/Music2_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc/INdefTag.java)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libstagefright_aacdec_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libstagefright_mp3dec_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates/)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ModelViewer_intermediates/)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PerfTest_intermediates/)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/RSTest_intermediates/)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/hardware/IUsbManager.java)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os)
-$(call add-clean-step, rm -rf $(OUT_DIR)target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/keystore/java/android/security/IKeyChainAliasResponse.java)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/vpn)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc)
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_0.png
index 4cabd9e53bdbd..33e248b7afac7 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_0.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_100.png
index 3d1e89d92e650..64f8027d64af8 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_100.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_15.png
index 8a77137067cec..60568e3acb478 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_15.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_28.png
index dbfcfda6c8f9d..4e2a38ebd62b7 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_28.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_43.png
index cb7a692f711b5..4ee2551574055 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_43.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_57.png
index 8d1b95c392d51..b28b4e151f855 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_57.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_71.png
index 4d2b2f5a9d1e5..73cdf33d5c54e 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_71.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_85.png
index aafc6212762df..e105a10a673c9 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_85.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim0.png
index b6c745064ccce..46d5967361829 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim0.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim100.png
index 67eaebdcd619a..2cd22c173a9d0 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim100.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim15.png
index 14450cefefe39..a4d2544b62a03 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim15.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim15.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim28.png
index 05780850e14e0..aea3a31b3a309 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim28.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim28.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim43.png
index 12a7ca808552e..8b141aefbf080 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim43.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim43.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim57.png
index 8ac9023688068..23f6fb10cfe05 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim57.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim57.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim71.png
index 4debc5f091479..4f27e0a65dab0 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim71.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim71.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim85.png
index 92069c8ef19ae..89aa4a6038978 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim85.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_charge_anim85.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_unknown.png
index 290e34bdd59cd..e6c9e805e0555 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_unknown.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png
index 2538ab8941501..901839ac73f31 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png
index cfc63447fd629..e427534d7fcaf 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png
index 02757b1af968a..bf708be0851b3 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png
index 4bfb8f26bdacc..367d954c6c9b4 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_4g.png
index ff4e0406dbe52..5912575a46948 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_4g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png
index 71050c82f31e3..b112620f6ec28 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png
index aa25d50244b30..99c9284e176aa 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png
index 5641b7a49a991..9ab3454083311 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_roam.png
index a6b0762b7ec72..e32f584cec5ea 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_roam.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_roam.png 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
index 6af7f65361aac..354f5ab124cf1 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png 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
index 29d8f7b2cbcf5..ab4dbff7e9ad8 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png 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
index e80265ceaa3c0..838085bb01dc4 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_4g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_4g.png 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
index c7ff314ec9516..1d689072e14ad 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png 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
index 2396c01daed4d..7cf63eda7391b 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png 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
index 5256041ccc003..2c5a5bff9c54f 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 5d728e77ffceb..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index 4b0472ac7e30a..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index b216c2aba37f5..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index d184206931699..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index fd2d6c14c4946..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 80ceea07e205a..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index cdfa661ea4bb1..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index c8bd44f2e9c9e..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index ecdd61f47d533..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index c7c6a927861e1..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 795e610b03b06..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index 3b012cd5fd943..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index ca435ce88d9b2..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 63823bee03c2a..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index b16455f3fc5f9..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index db444203772f1..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index d99b977fc81aa..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index 72e5d5c8b7e66..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png
index 3405e1c632243..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png
index 940be0f3805b3..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_4g.png
index 199e0211c9a1b..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_4g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_4g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png
index 50cbbbaf630aa..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png
index c571496c8145c..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png
index 1920d0dfab42c..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inadnout_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inadnout_e.png
deleted file mode 100644
index 466c84c494fa8..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inadnout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png
index 2226bab11d847..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png
index 200b9a950bb22..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_4g.png
index 5a592e32ee7d0..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_4g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_4g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png
index db4078198e9ef..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png
index 6bf484125a5a6..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png
index f323073721225..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png
index 2650479416810..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png
index d00f2af0bc8ed..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_4g.png
index a60e4e7a36312..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_4g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_4g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png
index 00d914940472a..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png
index cddd68c8cded8..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png
index e43e1a9d10e38..b2e725c1a3920 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png
index 081233b4a0023..faa4d71d570d9 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0.png
deleted file mode 100644
index b30b24024e36b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0_fully.png
deleted file mode 100644
index b30b24024e36b..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1.png
deleted file mode 100644
index d018f95a6afeb..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1_fully.png
deleted file mode 100644
index c4f34cb193e20..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2.png
deleted file mode 100644
index abdb7a6647246..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2_fully.png
deleted file mode 100644
index f4806ccfa21a5..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3.png
deleted file mode 100644
index 67aeef636a968..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3_fully.png
deleted file mode 100644
index fea1863cbeb9e..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4.png
deleted file mode 100644
index 1bd644cb00671..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4_fully.png
deleted file mode 100644
index 46881b22f2ced..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_silent.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_silent.png
index 3dfb46907074c..f826905218275 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_silent.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_silent.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_vibrate.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_vibrate.png
index 2506e585cdeff..32d6320daaed3 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_vibrate.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_vibrate.png 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
index 2aeb84a032d57..e007be489ac99 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png 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
index 2aeb84a032d57..fd76878b53dd7 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png
index 4811a30f04412..ded320a3edce0 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png 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
index 3c25920326ab3..5f9291609039e 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1x.png
deleted file mode 100644
index cac47a7401fbe..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png
index 6d115b90bd0ab..47bbed28c90f8 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png 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
index 43803e48d0de0..9afd5f67abfd5 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png
index bff9fac76ae42..a81806d3fdfa7 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png 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
index 831684201f0e9..366ee35bc8916 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3g.png
deleted file mode 100644
index fabcd91722d02..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png
index 6f2402d8def90..89d12c7a3600b 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png 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
index 0968cdda75afa..c1f017f6bc570 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g.png
deleted file mode 100644
index c5301a8b8222c..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_edge.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_edge.png
deleted file mode 100644
index 36b73274d5499..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_edge.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png
index a21c7ce0bfbe6..35f6a40c65618 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_gprs.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_gprs.png
deleted file mode 100644
index 931997e92c7b8..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_gprs.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_hsdpa.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_hsdpa.png
deleted file mode 100644
index 54c0a07089b22..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_hsdpa.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_in.png
index afec31dbd35f7..c7d5eb2950b69 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_in.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_in.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_inout.png
index fa8ab312df9ec..54a98cc57d709 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_inout.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_inout.png 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 2aeb84a032d57..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_signal_out.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_out.png
index 0ec73071f0132..7fc630d518a82 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_out.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_out.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_roam.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_roam.png
deleted file mode 100644
index 4d2919361d62a..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_in.png
index 8349da58b19ce..90e88d1b127a0 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_in.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_in.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_inout.png
index f06e5d16e9f35..8e736b169ce6b 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_inout.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_inout.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_out.png
index c390437cd0913..624c75697350d 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_out.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_out.png 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
index 20cf07f4ed319..83e3aa1599ba4 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png
index f11b58ef40150..a2e2428424f4d 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png 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
index 15b099222aa83..28c84141737d8 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png
index 8bea46d2d585f..5d752270b28fb 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png 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
index 6d3151d6a0b52..a29398acfd093 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png
index ad1245e9f185d..27bae24e7e7c2 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png 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
index cb67d5720c113..bfa13d207c8a2 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png
index 117ac31db4b42..07120621ef545 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png 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
index df34c27256326..19168195ded12 100644
Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 0809456434ea0..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 0e8ec0737be15..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index f9d273759c07c..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index f5b2c9a6bb047..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index eb1b18aad7c3c..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 1abe28ab09f77..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index e896cbbe94631..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index b44123c5936ce..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index d0cc5794e7a8d..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 903b03ecb3072..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 9578a2187a2e3..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index c5e5cda14ee36..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 0730e3e97bf99..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index eafed592b7a43..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index ea66c75e4e098..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-hdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index a885aab77a483..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 32f08c83e58f0..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 0111893e576d2..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index a9c547ea3d8a4..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 68019534cdb27..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 3ae25373bca59..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index 8a9f2e2c26e27..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index 8c5c48286ae08..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 36c2cf8efea6d..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index aee1eed5c9fbe..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 30884a96768ba..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index ce91aa90ad914..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 82a4f61b3cdf7..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 55b6b3874cc96..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 519154d37465b..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-mdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index a39e5e0bd4b11..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index ffe454690afb5..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index a78cd14191286..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index a43ba991960b8..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index cfeb769e91195..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index b39d233298480..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index 5e0617fa48f14..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index da2926f5de202..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 41fd66cc9400d..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 745717bc0c07e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 1deb1f2d93a72..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index 2dce2233806d9..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index e13e73f22e1d7..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 6c9193bc40fa6..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index e9bb9c25415a7..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-large-xhdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_0.png
index 95a797d793b5e..bda766ddaa922 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_0.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_100.png
index 6184516417e01..058ef2ae732f6 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_100.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_15.png
index cfbdb09ede5ce..a78263cf81cec 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_15.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_28.png
index 218a0a66a4979..11ecb6c76233a 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_28.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_43.png
index 60728550199af..d0f198515490e 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_43.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_57.png
index fdfbd335aaefa..1ddd12a2ec55b 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_57.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_71.png
index 99f912049f052..3716a841783f9 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_71.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_85.png
index 79031328ef048..e503e18a4a3a1 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_85.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim0.png
index ec514afcbe1cf..a672990356a46 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim0.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim100.png
index 3ef6ce4986e7c..5a6054aed8aab 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim100.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim15.png
index cd748efe7745e..bd6e438c500e3 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim15.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim15.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim28.png
index 5cbc6733c47da..1e1e09564aeee 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim28.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim28.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim43.png
index 2005d00a59195..222edbdf64361 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim43.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim43.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim57.png
index e94765e49a514..70169936c053a 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim57.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim57.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim71.png
index 31b1b25c3bcc1..204e6c9a316c6 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim71.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim71.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim85.png
index f06e81f9c7713..ce20d6d672f82 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim85.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_anim85.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_unknown.png
index b5441800c1cd2..d4dca3e8c7eb8 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_unknown.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png
index 44b4272027d55..5469a4cdc7e2e 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png
index 83edad5968fab..40c7c28809ffa 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png
index 24fd220116dc8..1e3d49dd0be51 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png
index a40931375b6f2..1b3a98b7b6a96 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_4g.png
index d4f75cbaab00a..2e7b19c2feb5a 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_4g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png
index 115ea1a260dbb..2f3f519097c4b 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png
index 13b1c233d24f3..4746ef431c005 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png
index 400869e3d5769..7edc2b9702c8e 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_roam.png
index 6234c9aee6c6c..ae8c76988f99a 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_roam.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_roam.png 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
index cde53f585b0ed..675be67a047df 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png 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
index 9e1f8dc59a3be..b6653058c36e0 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png 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
index 13d9ae3dfc1b7..1900f3c374f06 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_4g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_4g.png 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
index e53ddac79cfc7..3a3d40c6b72f7 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png 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
index 3146ebffe8bb0..908fa117a84e4 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png 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
index 432bb208536b3..d702fae3162c6 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 50756bc796599..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index f8c4a65c6467b..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index a278ed9f9c184..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 14b2a218c7760..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index 8072951199efd..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index da4e7bbfac5d8..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 68330a93663e7..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index c65b1616ec15f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index a26a05e7fb42a..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index afae62550d079..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 1f88c31ec4a34..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index d2a5340a94cdb..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 9f0941a1744c5..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index c568da6356e87..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index c22ae565d8246..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 345f3510e30dd..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 4f931e0536dc1..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index 2897ddbfb433f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png
index 0a583229318af..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png
index 3a9af15c6a24b..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_4g.png
index 260634ae0ed59..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_4g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_4g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png
index 2521f00b5ff0d..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png
index 441af6e1cafc9..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png
index 65a74aa79071a..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inadnout_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inadnout_e.png
deleted file mode 100644
index addfcf2e0a378..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inadnout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png
index b87ce50b22839..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png
index 9b8e77687b288..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_4g.png
index 6a3c498a2879a..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_4g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_4g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png
index 07c92187fd785..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png
index c612b94b4f8cd..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png
index 7c66e933e91f3..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png
index c76490a72f95f..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png
index a2fff6f62f85b..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_4g.png
index 1259050e2e9c7..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_4g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_4g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png
index bd08b970a8643..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png
index 0c3c0ed2b4fe5..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png
index 40e6f7e3d1fc6..eecdefb2ec640 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png
index 6ac52f90b22bf..d90404856e591 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png
deleted file mode 100644
index f8c4b814fa54f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0_fully.png
deleted file mode 100644
index f8c4b814fa54f..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png
deleted file mode 100644
index d5a768c8cff88..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1_fully.png
deleted file mode 100644
index a697fa66fcff4..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png
deleted file mode 100644
index 018c95170ac18..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2_fully.png
deleted file mode 100644
index 95b5d3d4c31f5..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png
deleted file mode 100644
index 922790ea06020..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3_fully.png
deleted file mode 100644
index df74fc39a90b4..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png
deleted file mode 100644
index 2a527c9a57ecb..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4_fully.png
deleted file mode 100644
index bf88418ace0e3..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png
index 8e04b25bd4674..ddec9a9e7d1dd 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png
index 44bd99fa10cf1..9ca5533ea450d 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png 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
index d52cb1af4f128..c108bbb3db364 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png 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
index d52cb1af4f128..b35e15a227774 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png
index 4b805c42f0250..52d9af1954197 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png 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
index ef8ac73ca5cc6..ffbb3bf951f28 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1x.png
deleted file mode 100644
index 632127a3c6ed1..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png
index 0b48667926764..1aa2ad11909f3 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png 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
index b0182a0911da0..7387d37bbf7a6 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png
index db75f74574810..d440b655c6130 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png 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
index 9e22573a37226..53adbe15421a6 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3g.png
deleted file mode 100644
index a0c3bc7ffaddf..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png
index 504990e924666..0d0fc8c9a6bde 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png 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
index d35736e18a23c..56738e15425cf 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4g.png
deleted file mode 100644
index 3416151bd18e2..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_edge.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_edge.png
deleted file mode 100644
index 435d25d153b74..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_edge.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png
index 0e1964c7b2788..01b2709aa39d7 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_gprs.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_gprs.png
deleted file mode 100644
index 68f45308b47f1..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_gprs.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_hsdpa.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_hsdpa.png
deleted file mode 100644
index 584e70351ea1d..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_hsdpa.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_in.png
index b114fea533b4d..48e123ea93173 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_in.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_in.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_inout.png
index de3f56f34d3cf..fba56780c5a2d 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_inout.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_inout.png 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 d52cb1af4f128..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_signal_out.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_out.png
index 7f7074e891fbd..30d2c24e9e68c 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_out.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_out.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_roam.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_roam.png
deleted file mode 100644
index 2b4af59f0cc51..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_in.png
index ca3d5bfa8fffc..06a9fc499b2be 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_in.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_in.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_inout.png
index a17e1d735214e..3ab3a994ea429 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_inout.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_inout.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_out.png
index b5ab8b341f05e..a8934e6627817 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_out.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_out.png 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
index 8e9c451c187c0..7ec7805b6fd11 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png
index 25e93947754be..df24b68048fe0 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png 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
index 6de73be523bfd..55fc42746e4c4 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png
index 02d4b3f1a8bd7..ca546f5e45877 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png 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
index 108c0543d0cac..334380856a7dd 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png
index a9d22d615b1cb..5eecfd9f02b84 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png 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
index 0ed3c8f8378af..84fc68d0a7a59 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png
index dc36e0ea5d6ca..4cdece19232be 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png 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
index f3fd89a480e7a..894fd440adb90 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_0.png
new file mode 100644
index 0000000000000..4adff32e86330
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000000000..aa6b550d12bf4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_15.png
new file mode 100644
index 0000000000000..e0e8f14c85fd4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_28.png
new file mode 100644
index 0000000000000..0e7241f2cf565
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_43.png
new file mode 100644
index 0000000000000..d4dc5226b177c
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_57.png
new file mode 100644
index 0000000000000..62e48cc25ac91
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_71.png
new file mode 100644
index 0000000000000..1026a161e0bf6
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_85.png
new file mode 100644
index 0000000000000..38a8091e655d3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim0.png
new file mode 100644
index 0000000000000..b1ce7b1c59d70
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000000000..39ec52d7bb4b7
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim15.png
new file mode 100644
index 0000000000000..1eef45df83d0f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim15.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim28.png
new file mode 100644
index 0000000000000..ed936d605edf1
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim28.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim43.png
new file mode 100644
index 0000000000000..6d0c742ea254b
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim43.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim57.png
new file mode 100644
index 0000000000000..97a33dbe67573
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim57.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim71.png
new file mode 100644
index 0000000000000..967cac09bee53
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim71.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim85.png
new file mode 100644
index 0000000000000..a53de2324e3f0
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_charge_anim85.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_unknown.png
new file mode 100644
index 0000000000000..004aee3ea06f1
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth.png
new file mode 100644
index 0000000000000..7001875be52ff
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth_connected.png
new file mode 100644
index 0000000000000..05be4ba7fcefc
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_bluetooth_connected.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_1x.png
index 1629575742a92..bd402afd2ca3f 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_1x.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_3g.png
index e87bceca0338b..16989f9f4b122 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_3g.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_4g.png
index fd44002fde470..6cd6d4c6d6814 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_4g.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_e.png
index e455ad63e79a6..1b418f82094c3 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_e.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_g.png
index 661358506884d..8081290245c18 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_g.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_h.png
index 7502a5468f7d3..438c7d1fd070b 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_h.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index 39dfcd3d41010..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index e78d872920b94..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index 5f88279ffce30..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index ad73252ee034f..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index d02de5b2058cb..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index cb13b91cfb57a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index 39dfcd3d41010..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index e78d872920b94..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index 8c04bd611cb0c..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index ad73252ee034f..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index d02de5b2058cb..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index cb13b91cfb57a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index 39dfcd3d41010..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index e78d872920b94..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index 456d0b6ef0602..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index ad73252ee034f..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index d02de5b2058cb..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index cb13b91cfb57a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_roam.png
index 1309176ff73fa..3861bfe4a41ab 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_roam.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_1x.png
index 810714ee826d4..6435b673b1fa0 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_1x.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_3g.png
index 72176baef247e..bb19dd3287f25 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_3g.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_4g.png
index 82a2bf0c7b321..1351a72c03483 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_4g.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_e.png
index 1e6c6049169f4..fbc645c6ade6e 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_e.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_g.png
index 13aee0610780e..584d0ba44b11c 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_g.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_h.png
index 76c48a8c435b1..513890b6cb04c 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_h.png and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 39dfcd3d41010..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index e78d872920b94..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index 456d0b6ef0602..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index ad73252ee034f..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index d02de5b2058cb..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index cb13b91cfb57a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 39dfcd3d41010..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index e78d872920b94..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index 456d0b6ef0602..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index ad73252ee034f..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index d02de5b2058cb..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index cb13b91cfb57a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 39dfcd3d41010..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index e78d872920b94..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index 456d0b6ef0602..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index ad73252ee034f..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index d02de5b2058cb..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index cb13b91cfb57a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0.png
new file mode 100644
index 0000000000000..140639951ff64
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0_fully.png
new file mode 100644
index 0000000000000..3106dc6e36c1d
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_0_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1.png
new file mode 100644
index 0000000000000..41898c51fadf4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1_fully.png
new file mode 100644
index 0000000000000..7dc95c6b7cf8d
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2.png
new file mode 100644
index 0000000000000..b81ff914e038d
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2_fully.png
new file mode 100644
index 0000000000000..b5213ee448613
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3.png
new file mode 100644
index 0000000000000..d0f3e05c54aed
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3_fully.png
new file mode 100644
index 0000000000000..b0d9e8bd57d0f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4.png
new file mode 100644
index 0000000000000..4ced31943625e
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4_fully.png
new file mode 100644
index 0000000000000..98a49ade99477
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_flightmode.png
new file mode 100644
index 0000000000000..f1bd2122e024f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_flightmode.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_in.png
new file mode 100644
index 0000000000000..6fd5ee6815684
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_in.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_inout.png
new file mode 100644
index 0000000000000..b3d7009968785
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_inout.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_out.png
new file mode 100644
index 0000000000000..ead3e0ccfb7e6
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_out.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_in.png
new file mode 100644
index 0000000000000..bab05a5b3bc18
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_in.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_inout.png
new file mode 100644
index 0000000000000..dcab42705f1bd
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_inout.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_out.png
new file mode 100644
index 0000000000000..d763537d4a4c2
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_out.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_0.png
new file mode 100644
index 0000000000000..a79f1608ac56e
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1.png
new file mode 100644
index 0000000000000..0d18c9a133911
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1_fully.png
new file mode 100644
index 0000000000000..9cc2883b67912
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2.png
new file mode 100644
index 0000000000000..f063167bb1918
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2_fully.png
new file mode 100644
index 0000000000000..57b0b207b3b95
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3.png
new file mode 100644
index 0000000000000..b5ba6ce29bc20
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3_fully.png
new file mode 100644
index 0000000000000..ba9b6b36ba4b2
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4.png
new file mode 100644
index 0000000000000..afd259c17c569
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000000000..6c3851cb58e3b
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_0.png
new file mode 100644
index 0000000000000..d1a1d4cd3cb75
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000000000..270a4b68589b1
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_15.png
new file mode 100644
index 0000000000000..02290b78fa5cd
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_28.png
new file mode 100644
index 0000000000000..cf4540af56891
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_43.png
new file mode 100644
index 0000000000000..0e70a88bc1d71
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_57.png
new file mode 100644
index 0000000000000..4d0f2e468810c
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_71.png
new file mode 100644
index 0000000000000..8bb5b806c9b39
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_85.png
new file mode 100644
index 0000000000000..15ed5f2388b70
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim0.png
new file mode 100644
index 0000000000000..31d84fb9a029a
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000000000..033d413e12019
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim15.png
new file mode 100644
index 0000000000000..6599c56f7f32d
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim15.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim28.png
new file mode 100644
index 0000000000000..62ecbf87107b9
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim28.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim43.png
new file mode 100644
index 0000000000000..f819830923950
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim43.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim57.png
new file mode 100644
index 0000000000000..0d2c11d5b1108
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim57.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim71.png
new file mode 100644
index 0000000000000..e96cb7463ed3b
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim71.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim85.png
new file mode 100644
index 0000000000000..783ae63e42f7f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_charge_anim85.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_unknown.png
new file mode 100644
index 0000000000000..d71738d76f5ca
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth.png
new file mode 100644
index 0000000000000..4b800f1ab85e3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth_connected.png
new file mode 100644
index 0000000000000..da0b81e7b487f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_bluetooth_connected.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_1x.png
index 73cdabefece41..76323a393375b 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_1x.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_3g.png
index b5a39cce67230..6413129b8d9ad 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_3g.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_4g.png
index 6de880cba39ba..800feb507e00c 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_4g.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_e.png
index 2dbbfc0eb001c..60f34f8b9821c 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_e.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_g.png
index a45f011647164..b5a03c51e304d 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_g.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_h.png
index 517a6bb28ea2f..1e642ba5b0afc 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_h.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index f50c9872c7e45..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index 1fff17eec67bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index 821d00e650b1c..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index e27439e2f75db..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index 8b53f0fd577cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index a23ec6e5e413a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index f50c9872c7e45..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index 1fff17eec67bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index 4cdce84ba45a2..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index e27439e2f75db..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index 8b53f0fd577cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index a23ec6e5e413a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index f50c9872c7e45..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index 1fff17eec67bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index 5a2662a2e8519..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index e27439e2f75db..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index 8b53f0fd577cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index a23ec6e5e413a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_roam.png
index 5226c1cbd1702..ee2e99e0e07b9 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_roam.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_1x.png
index a84564848ef02..0432a00cde236 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_1x.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_3g.png
index 1d15587c152d0..2b845c6866e5a 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_3g.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_4g.png
index 52d573619b818..e6adbcdb19576 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_4g.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_e.png
index 79a2a0593c21c..7d1ac1e088549 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_e.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_g.png
index b032594194720..28dcb63b28574 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_g.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_h.png
index c4abcc909f3ce..bf92415e73eca 100644
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_h.png and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index f50c9872c7e45..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index 1fff17eec67bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index 5a2662a2e8519..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index e27439e2f75db..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index 8b53f0fd577cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index a23ec6e5e413a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index f50c9872c7e45..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index 1fff17eec67bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index 5a2662a2e8519..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index e27439e2f75db..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 8b53f0fd577cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index a23ec6e5e413a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index f50c9872c7e45..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 1fff17eec67bf..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index 5a2662a2e8519..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index e27439e2f75db..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 8b53f0fd577cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index a23ec6e5e413a..0000000000000
Binary files a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0.png
new file mode 100644
index 0000000000000..39be951db25f0
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0_fully.png
new file mode 100644
index 0000000000000..a321f9979aa57
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_0_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1.png
new file mode 100644
index 0000000000000..3b628a8be314a
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1_fully.png
new file mode 100644
index 0000000000000..1642486b8e70c
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2.png
new file mode 100644
index 0000000000000..a7b200cbc51ca
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2_fully.png
new file mode 100644
index 0000000000000..f2955361ce7e6
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3.png
new file mode 100644
index 0000000000000..6c87397ff2c1f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3_fully.png
new file mode 100644
index 0000000000000..a97e3aa081366
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4.png
new file mode 100644
index 0000000000000..e161245798cf4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4_fully.png
new file mode 100644
index 0000000000000..5296baf4f9f32
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_flightmode.png
new file mode 100644
index 0000000000000..c1d44175f7776
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_flightmode.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_in.png
new file mode 100644
index 0000000000000..d106a54a8d520
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_in.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_inout.png
new file mode 100644
index 0000000000000..3f385c5cda6e4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_inout.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_out.png
new file mode 100644
index 0000000000000..d5c47af06c829
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_out.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_in.png
new file mode 100644
index 0000000000000..0ea6312727fc2
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_in.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_inout.png
new file mode 100644
index 0000000000000..139cc4f6d4148
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_inout.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_out.png
new file mode 100644
index 0000000000000..011bd4356a921
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_out.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_0.png
new file mode 100644
index 0000000000000..d7da48635c318
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1.png
new file mode 100644
index 0000000000000..276cde5b4a273
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1_fully.png
new file mode 100644
index 0000000000000..9a7496c1c543f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2.png
new file mode 100644
index 0000000000000..c3f6f9c64f057
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2_fully.png
new file mode 100644
index 0000000000000..f603753efce4b
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3.png
new file mode 100644
index 0000000000000..3a4a8fb88bc07
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3_fully.png
new file mode 100644
index 0000000000000..21fb6c5b29e0c
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4.png
new file mode 100644
index 0000000000000..8c6ab93094635
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000000000..9848f65e11ef9
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_0.png
new file mode 100644
index 0000000000000..db5cf1ee953d3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000000000..aa0a675b573f9
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_15.png
new file mode 100644
index 0000000000000..6f9c4dfaad931
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_28.png
new file mode 100644
index 0000000000000..0693213d0b272
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_43.png
new file mode 100644
index 0000000000000..b2d90f8b51301
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_57.png
new file mode 100644
index 0000000000000..a21b1ce8fa8df
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_71.png
new file mode 100644
index 0000000000000..2f6d19f54c95f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_85.png
new file mode 100644
index 0000000000000..8950439b1e77a
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim0.png
new file mode 100644
index 0000000000000..255ae10eaec75
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000000000..afb58eb531138
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim15.png
new file mode 100644
index 0000000000000..9e06eb8a4bd93
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim15.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim28.png
new file mode 100644
index 0000000000000..ebf3d18cfa4bc
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim28.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim43.png
new file mode 100644
index 0000000000000..528e6ffe49ce4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim43.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim57.png
new file mode 100644
index 0000000000000..46de2acd948a6
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim57.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim71.png
new file mode 100644
index 0000000000000..89b5f48898e68
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim71.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim85.png
new file mode 100644
index 0000000000000..b80e5aea9c8d3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_charge_anim85.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_unknown.png
new file mode 100644
index 0000000000000..4394f925da6ed
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth.png
new file mode 100644
index 0000000000000..ad51789bda870
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth_connected.png
new file mode 100644
index 0000000000000..1844208402701
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_bluetooth_connected.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_1x.png
new file mode 100644
index 0000000000000..bf45cff7a03b4
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_3g.png
new file mode 100644
index 0000000000000..3102e072026ae
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_4g.png
new file mode 100644
index 0000000000000..85bc70f76740f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_e.png
new file mode 100644
index 0000000000000..afc7295c1558c
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_g.png
new file mode 100644
index 0000000000000..9efae5f722754
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_h.png
new file mode 100644
index 0000000000000..3be3fa4c63d31
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_roam.png
new file mode 100644
index 0000000000000..0edc9b53b09d3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_connected_roam.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_1x.png
new file mode 100644
index 0000000000000..b8d7d80a43404
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_3g.png
new file mode 100644
index 0000000000000..bad3f5fca90a5
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_4g.png
new file mode 100644
index 0000000000000..e2459dc1bc361
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_e.png
new file mode 100644
index 0000000000000..4dd84d99c57e9
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_g.png
new file mode 100644
index 0000000000000..34e018fe40cc6
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_h.png
new file mode 100644
index 0000000000000..a84771b47a4ae
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_data_fully_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0.png
new file mode 100644
index 0000000000000..a343c50d456a3
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0_fully.png
new file mode 100644
index 0000000000000..8a7991771d9ac
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_0_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1.png
new file mode 100644
index 0000000000000..643a122fb7d70
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1_fully.png
new file mode 100644
index 0000000000000..83832eb64e0fb
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2.png
new file mode 100644
index 0000000000000..b5041212d8842
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2_fully.png
new file mode 100644
index 0000000000000..72d8f420aedae
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3.png
new file mode 100644
index 0000000000000..8945f428267bd
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3_fully.png
new file mode 100644
index 0000000000000..1d4b788a69996
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4.png
new file mode 100644
index 0000000000000..889e48f498e60
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4_fully.png
new file mode 100644
index 0000000000000..4810d47be1478
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_flightmode.png
new file mode 100644
index 0000000000000..b6121eb4c8d51
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_flightmode.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_in.png
new file mode 100644
index 0000000000000..dc0f361349603
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_in.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_inout.png
new file mode 100644
index 0000000000000..f0a98eb0ddda9
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_inout.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_out.png
new file mode 100644
index 0000000000000..10df40e091c14
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_out.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_in.png
new file mode 100644
index 0000000000000..22410f1180c7a
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_in.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_inout.png
new file mode 100644
index 0000000000000..f7fe0bef782a5
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_inout.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_out.png
new file mode 100644
index 0000000000000..2555d65993822
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_out.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_0.png
new file mode 100644
index 0000000000000..317e89f8b295d
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1.png
new file mode 100644
index 0000000000000..fb1d2358ab1e7
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1_fully.png
new file mode 100644
index 0000000000000..08b2ec7a94e3f
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2.png
new file mode 100644
index 0000000000000..a7fe3f307c059
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2_fully.png
new file mode 100644
index 0000000000000..3eb6fc5f4d801
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3.png
new file mode 100644
index 0000000000000..ca10b4e463873
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3_fully.png
new file mode 100644
index 0000000000000..a88aa5495edc7
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4.png
new file mode 100644
index 0000000000000..0174b9803ee68
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4.png differ
diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000000000..fa114d4896724
Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_0.png
index bcea4f9b07b07..80bd4d2b54f38 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_0.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_100.png
index d915a9da12c11..b16c738c177d9 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_100.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_15.png
index 6cf20537c2246..eabe427545c01 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_15.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_28.png
index d4a2068c8b14d..cc2de139c1001 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_28.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_43.png
index 4be3873e46b18..0b24eadb53d65 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_43.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_57.png
index 31e48136bfdbc..3d122bbcbc6ee 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_57.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_71.png
index 032fa29a592f3..096c724bfe088 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_71.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_85.png
index 52ad54112f341..20482b21b9dab 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_85.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim0.png
index d7248b4c12567..276e0bf209c35 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim0.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim100.png
index 5d1a99cbbb0e6..d838103cd07c4 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim100.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim15.png
index b342507b0f9ed..896a58a73dfb3 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim15.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim15.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim28.png
index b618f7516d9a1..986093c7f0996 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim28.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim28.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim43.png
index 11946cde2f0f9..a80b024992a1d 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim43.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim43.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim57.png
index e22730905a91f..7a19040ed7f05 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim57.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim57.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim71.png
index 4b0838c18fbfd..ee09d0bb283d5 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim71.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim71.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim85.png
index ecd4396ee9568..09b9c9230656c 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim85.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim85.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_unknown.png
index 8c5465a329fc8..ffac512d95ec9 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_unknown.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png
index 9e7992adc9bbc..791b70a7eccf4 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth_connected.png
index ccf5b0e8e5f32..637367b2ee95c 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth_connected.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth_connected.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_1x.png
index 04918c8421175..14f81761211ca 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_1x.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_1x.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_3g.png
index 34da2965ec84f..41694659c1738 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_3g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_3g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_4g.png
index f6cb0cea81c5f..713f09bba0300 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_4g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_4g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png
index eb4927adfb2ba..8c37831d94b0f 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_e.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_g.png
index 14087e43b3f62..8e8770ae8487b 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_h.png
index 87b67b30e595b..4db2986ecd126 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_h.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_roam.png
index 33fa2aed2e5a3..0f35728b65114 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_roam.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_roam.png 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
index a84382f955366..c60a559f986dc 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_1x.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_1x.png 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
index b59a72ec34f34..d262f5fa6e611 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_3g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_3g.png 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
index c7927d9be725d..24ebdcdcdfb54 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_4g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_4g.png 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
index eddb4eb27f850..88792d95fa35c 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_e.png 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
index 2759a8e49eaad..8be35c076d290 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_g.png 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
index f129965af6aa1..62f288cd650ee 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_h.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_h.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 1abe1645d6894..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index 06dc7008f71a7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index d1ae45d684aeb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 0c932417f1240..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index 3be20a2cd6f4b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 502382ec282de..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index b423454ef56a5..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index b0848713c464b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index 8cbaff393bf65..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 0e5365606f87f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 55c66b468319c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index 103927b5b4e4f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 2a0c21a31e2cc..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 23dfd7a9f403f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index 1258359dc9fb2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 32c1432f15da2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index b56be83713882..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index cd37477573a89..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_1x.png
index 347b219f3bda3..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_1x.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_1x.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_3g.png
index ef5b653584836..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_3g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_3g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_4g.png
index cd96a4ab4df55..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_4g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_4g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_e.png
index 02461a9de9692..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_e.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_e.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_g.png
index 033267f03307f..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_h.png
index 73ae17507af8b..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_h.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_in_h.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inadnout_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inadnout_e.png
deleted file mode 100644
index 1355da174451d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inadnout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_1x.png
index ceb316c4cd1eb..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_1x.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_1x.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_3g.png
index ff4a0b3d7761c..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_3g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_3g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_4g.png
index b2ebf40525a62..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_4g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_4g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_e.png
index 7f833ad60baa3..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_e.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_e.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_g.png
index b47e4c3868643..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_h.png
index 4f884925d44ef..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_h.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_inandout_h.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_1x.png
index 7f7e1ef08e617..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_1x.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_1x.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_3g.png
index f0ab0811e6f09..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_3g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_3g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_4g.png
index e556da144f2c6..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_4g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_4g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_e.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_e.png
index a28d771dee063..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_e.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_e.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_g.png
index 7be9754869d5e..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_g.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_h.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_h.png
index 16271a81405a4..48038f0b29513 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_h.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_out_h.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_no_sim.png
index edff8db774391..da933a383d506 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_no_sim.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_no_sim.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_0.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_0.png
deleted file mode 100644
index e7938f1c6fd66..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_0_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_0_fully.png
deleted file mode 100644
index e7938f1c6fd66..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_1.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_1.png
deleted file mode 100644
index 33fda46b7b48c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_1_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_1_fully.png
deleted file mode 100644
index 1d5484bf77765..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_2.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_2.png
deleted file mode 100644
index 478b293740b1e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_2_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_2_fully.png
deleted file mode 100644
index b9cff0e754948..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_3.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_3.png
deleted file mode 100644
index 4945e230a082f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_3_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_3_fully.png
deleted file mode 100644
index a55ecd86afa7f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_4.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_4.png
deleted file mode 100644
index 0641c9a3a66f7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_4_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_4_fully.png
deleted file mode 100644
index d0eebb67642b8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_r_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_silent.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_silent.png
index cd89105d092f9..ad9940d184b1c 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_silent.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_silent.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_vibrate.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_vibrate.png
index e85d643fca933..7f03f6171ff9c 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_vibrate.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_ringer_vibrate.png 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
index 726f7adf338d0..5ac554042e02f 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0.png 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
index 726f7adf338d0..6edae807e85e8 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png
index a77c8a8b1ab54..0ff602eaf0d12 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png 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
index 1527803b6aeaa..33078c59def39 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1x.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1x.png
deleted file mode 100644
index e487f5ec2c336..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png
index 64ddafda8f02b..7f4bd1bdc5fb6 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png 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
index 6cf7a28368d5d..a35d1a5593ad2 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png
index 0bc3d0b09fd3c..e99e3c532cc32 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png 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
index 34ec2316c364e..7844661689a65 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3g.png
deleted file mode 100644
index 15d0f2f88949f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png
index c7c1e3e3fc1a3..6b4fc4151f0d9 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png 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
index 6e4dc8ce12e0b..0e7946fa00ac4 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4g.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4g.png
deleted file mode 100644
index 90ca4e347ea78..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_edge.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_edge.png
deleted file mode 100644
index befa1eb542ebe..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_edge.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_flightmode.png
index 419afa04dc81b..91aaa2040df55 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_flightmode.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_flightmode.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_gprs.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_gprs.png
deleted file mode 100644
index 93af4fa54dfa1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_gprs.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_hsdpa.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_hsdpa.png
deleted file mode 100644
index c3f9e5df82448..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_hsdpa.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_in.png
index b20c61b70fad3..46ad7cec57810 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_in.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_in.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_inout.png
index b51178d07ba06..824564171a8d4 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_inout.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_inout.png 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 726f7adf338d0..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_signal_out.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_out.png
index 485d407a902c6..cb182b1c4256c 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_out.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_out.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_roam.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_roam.png
deleted file mode 100644
index 19cf3b073e80c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_in.png
index 6ed28c6df327b..eb6679d238ab0 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_in.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_in.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_inout.png
index 4f462ad6ec3e4..8893512d716f0 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_inout.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_inout.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_out.png
index 66d8f802a8019..2efb2f8732c56 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_out.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_out.png 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
index b2b2ace9bb243..a9174c8bf1344 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_0.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png
index 5212337d75a68..8045d21de35e6 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png 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
index 43e590bb4df8a..0dc74ebadb2d9 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png
index e900d6b8be7fa..3b3e36e1e8157 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png 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
index 990734c85f5f5..ff606a9bfc757 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png
index d982c1fcea0d3..e4730e872f83a 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png 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
index daf275045c569..6db40fecd69cc 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png
index b93e9ac0e51e8..515c1b08c8e43 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png 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
index 576f120eefe04..9fae4d50bde31 100644
Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_0.png
deleted file mode 100644
index a08c5f6f6a814..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_100.png
deleted file mode 100644
index 6aa38bca82c70..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_100.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_15.png
deleted file mode 100644
index 36c26b646aabe..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_15.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_28.png
deleted file mode 100644
index 55940d22d0c8c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_28.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_43.png
deleted file mode 100644
index f65ef5bef8fdb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_43.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_57.png
deleted file mode 100644
index 8a0f4e74739fb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_57.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_71.png
deleted file mode 100644
index 2d81b220d40fc..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_71.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_85.png
deleted file mode 100644
index 4c08cffd44402..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_85.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim0.png
deleted file mode 100644
index 27d3b50a4e819..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim100.png
deleted file mode 100644
index f017dd15decba..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim100.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim15.png
deleted file mode 100644
index 6cd2c7177ec27..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim15.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim28.png
deleted file mode 100644
index 76195caa5e36c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim28.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim43.png
deleted file mode 100644
index fb097b09c850a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim43.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim57.png
deleted file mode 100644
index 04740b832eaaf..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim57.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim71.png
deleted file mode 100644
index 147d256bcc4fd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim71.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim85.png
deleted file mode 100644
index de808a2f615e6..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_charge_anim85.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_unknown.png
deleted file mode 100644
index d19d6eeca88b8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_battery_unknown.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_bluetooth.png
deleted file mode 100644
index 4bce24dc563ba..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_bluetooth.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_bluetooth_connected.png
deleted file mode 100644
index 0467e128f3b0b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_bluetooth_connected.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 0809456434ea0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 0e8ec0737be15..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index f9d273759c07c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index f5b2c9a6bb047..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index eb1b18aad7c3c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 1abe28ab09f77..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index e896cbbe94631..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index b44123c5936ce..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index d0cc5794e7a8d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 903b03ecb3072..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 9578a2187a2e3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index c5e5cda14ee36..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 0730e3e97bf99..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index eafed592b7a43..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index ea66c75e4e098..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 4db62e38b487b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 69a6ce6db323b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index 6f59975b0c967..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 2b593d10226c2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index ef4cac8a2c0cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index db42b0d0a2b87..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0.png
deleted file mode 100644
index 8a9deeadf90fb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 8a9deeadf90fb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_1.png
deleted file mode 100644
index 11ee533a1ff48..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index 43edb8c82465b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_2.png
deleted file mode 100644
index 7919030de673a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index 0699681529e3c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_3.png
deleted file mode 100644
index 95048385d4916..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index db8bedb101da9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_4.png
deleted file mode 100644
index 89e1b2c0ce914..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index 88f720d062ca8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_flightmode.png
deleted file mode 100644
index 89fcbd4eeaea1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_flightmode.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_in.png
deleted file mode 100644
index 0ec439cd32e33..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_inout.png
deleted file mode 100644
index 4b22619c21ab6..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_null.png
deleted file mode 100644
index 8a9deeadf90fb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_out.png
deleted file mode 100644
index 9b8c88904e4f6..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_in.png
deleted file mode 100644
index e601a90ef27e3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_inout.png
deleted file mode 100644
index b65c93fbd1977..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_out.png
deleted file mode 100644
index 80fdafe18c0eb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index c54f630ee9b5d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 8cfc59bbd277d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index 3381016628332..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index 0a77e7b9b32e0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index 660b3a03ef1a0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index 0c278ad57f880..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index 921d88b46f1fc..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index 4c6c08e84d1bd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index de32ddd8d210c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_0.png
deleted file mode 100644
index 5087adb285716..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_100.png
deleted file mode 100644
index 4c212e7be03a5..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_100.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_15.png
deleted file mode 100644
index bf23074571490..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_15.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_28.png
deleted file mode 100644
index 45dcf77cfe333..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_28.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_43.png
deleted file mode 100644
index a2848de03a348..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_43.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_57.png
deleted file mode 100644
index 89c998b1e1a3e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_57.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_71.png
deleted file mode 100644
index 9269d6ec3d682..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_71.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_85.png
deleted file mode 100644
index 344ae30ec9774..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_85.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim0.png
deleted file mode 100644
index 13b5cae0008db..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim100.png
deleted file mode 100644
index 664755908c7aa..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim100.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim15.png
deleted file mode 100644
index a0e67c8fc70e9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim15.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim28.png
deleted file mode 100644
index 9a75c24600f87..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim28.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim43.png
deleted file mode 100644
index a1f73c2c705dc..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim43.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim57.png
deleted file mode 100644
index 6b17f1ccd78ed..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim57.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim71.png
deleted file mode 100644
index 9553580324e48..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim71.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim85.png
deleted file mode 100644
index 8507f39736c01..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_charge_anim85.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_unknown.png
deleted file mode 100644
index 6966cec5d87b7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_battery_unknown.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_bluetooth.png
deleted file mode 100644
index 84ce77f101113..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_bluetooth.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_bluetooth_connected.png
deleted file mode 100644
index b8670f2fec6d7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_bluetooth_connected.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index a885aab77a483..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 32f08c83e58f0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 0111893e576d2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index a9c547ea3d8a4..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 68019534cdb27..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index 3ae25373bca59..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index 8a9f2e2c26e27..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index 8c5c48286ae08..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index 36c2cf8efea6d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index aee1eed5c9fbe..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 30884a96768ba..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index ce91aa90ad914..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 82a4f61b3cdf7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 55b6b3874cc96..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 519154d37465b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 795c6e1d96366..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index b7f53462effd8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index b28bf04afbea3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 2722c21bb1038..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 596cae5ae4840..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index 50476ad62b809..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0.png
deleted file mode 100644
index 2de4515843a61..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 2de4515843a61..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_1.png
deleted file mode 100644
index cdbab379d85fe..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index ec398cb36bd0e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_2.png
deleted file mode 100644
index b1f16d679f73a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index e15a12b760923..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_3.png
deleted file mode 100644
index 90a1a3d2465ba..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index 21d944a2f2bc8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_4.png
deleted file mode 100644
index 9b2263f016e9f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index ca3623798e044..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_flightmode.png
deleted file mode 100644
index 2cea01037d0b2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_flightmode.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_in.png
deleted file mode 100644
index 3d22838ff5fe8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_inout.png
deleted file mode 100644
index 3bee79543bf2f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_null.png
deleted file mode 100644
index 2de4515843a61..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_out.png
deleted file mode 100644
index ad6bdced9c4b0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_in.png
deleted file mode 100644
index 6d68d4e8261d0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_inout.png
deleted file mode 100644
index 04ddb6574ca05..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_out.png
deleted file mode 100644
index 830b006ef6a4b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index f3be79b845e8c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 7f335679bbec8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index 471a9006d5ae6..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index b153c838061e0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index 3a5ddb79f77f7..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index 609117c3a55ff..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index d8cd1fb6b352c..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index 806b43b779f0a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index f6994341f9ffd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_0.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_0.png
deleted file mode 100644
index 64d8b5e27877a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_100.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_100.png
deleted file mode 100644
index 4e718b0749ec4..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_100.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_15.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_15.png
deleted file mode 100644
index 7306b48057a08..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_15.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_28.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_28.png
deleted file mode 100644
index f414632ec322a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_28.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_43.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_43.png
deleted file mode 100644
index 9e7a84ad223db..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_43.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_57.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_57.png
deleted file mode 100644
index e17ce984db753..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_57.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_71.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_71.png
deleted file mode 100644
index 861b0b70c4f75..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_71.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_85.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_85.png
deleted file mode 100644
index fe1330b719dec..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_85.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim0.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim0.png
deleted file mode 100644
index d459a0041937b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim100.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim100.png
deleted file mode 100644
index debd23e0aabf5..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim100.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim15.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim15.png
deleted file mode 100644
index 69ba2229b3e2a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim15.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim28.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim28.png
deleted file mode 100644
index 7d862bb7ec547..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim28.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim43.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim43.png
deleted file mode 100644
index 6687c82642fe3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim43.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim57.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim57.png
deleted file mode 100644
index 8438e76721beb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim57.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim71.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim71.png
deleted file mode 100644
index 1842da23e7421..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim71.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim85.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim85.png
deleted file mode 100644
index f9d2754a9cbfd..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_charge_anim85.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_unknown.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_unknown.png
deleted file mode 100644
index 892ba42e19dec..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_battery_unknown.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_bluetooth.png
deleted file mode 100644
index 73e0886e7bd0d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_bluetooth.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_bluetooth_connected.png
deleted file mode 100644
index dc3aae368e091..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_bluetooth_connected.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 9d0fe7e63f2c8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index d3f6f555219d8..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_4g.png
deleted file mode 100644
index 7170a84b02581..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index febf95883d040..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index 4da4f54bf14d1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_h.png
deleted file mode 100644
index e7755729cd0d1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_4g.png
deleted file mode 100644
index 5e0617fa48f14..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_4g.png
deleted file mode 100644
index da2926f5de202..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_roam.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_roam.png
deleted file mode 100644
index fef89cf2a30fc..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_connected_roam.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index c543b9a7f3a14..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 3395fff2aa688..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_4g.png
deleted file mode 100644
index 612843defdf7f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 9de370342a01f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index dabfec585ac98..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 0ca6fbf6e7add..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_connected_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_in_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_inandout_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 04f827038680e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_1x.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 517705c049482..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_3g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_4g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_4g.png
deleted file mode 100644
index 947a42c033b6f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_4g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 5c0ee2983371e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_e.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 31d6c017d7a85..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_g.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index 04ae05209c393..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_data_fully_out_h.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0.png
deleted file mode 100644
index b9410f601b0c1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index b9410f601b0c1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_1.png
deleted file mode 100644
index aa730967f4e43..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_1_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index b534296ab6800..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_2.png
deleted file mode 100644
index a33c488039856..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_2_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index fdd9c9245be4e..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_3.png
deleted file mode 100644
index 5454b4962fc1a..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_3_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index e338fd9656d3b..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_4.png
deleted file mode 100644
index 549b7d2a297e6..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_4_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index 9779320915740..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_flightmode.png
deleted file mode 100644
index 5ca5827cbadbb..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_flightmode.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_in.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_in.png
deleted file mode 100644
index 174ef2d7774a2..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_inout.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_inout.png
deleted file mode 100644
index 3e9dece41bac9..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_null.png
deleted file mode 100644
index b9410f601b0c1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_null.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_out.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_out.png
deleted file mode 100644
index 8952833694a22..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_in.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_in.png
deleted file mode 100644
index 180a13bcbeebf..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_in.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_inout.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_inout.png
deleted file mode 100644
index b9efa16805ff1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_inout.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_out.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_out.png
deleted file mode 100644
index d8493acb9af47..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_out.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index 885831e81c467..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_0.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 03fcf54eab87d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_1.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_1_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index 9bf7beca40d88..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_1_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index 15a82aca6cb30..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_2.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_2_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index eb9ce59a9ba20..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_2_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index 1c62fe3fbf0b1..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_3.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_3_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index 09cdfc4ba5fe3..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_3_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index 5447a85dbe7e0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_4.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_4_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index 04187de44af60..0000000000000
Binary files a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_wifi_signal_4_fully.png and /dev/null differ
diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml
index c735dbd6efa40..955d8aee1c0fb 100644
--- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml
+++ b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml
@@ -121,9 +121,10 @@
                 android:layout_width="wrap_content"
                 android:visibility="gone"
                 />
-            <include layout="@layout/stacked_signal_icons" 
-                android:layout_width="32dp"
-                android:layout_height="24dp"
+            <include layout="@layout/signal_cluster_view" 
+                android:id="@+id/signal_cluster"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 />
             <ImageView
                 android:id="@+id/battery"
diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml
new file mode 100644
index 0000000000000..41a30c79166a8
--- /dev/null
+++ b/packages/SystemUI/res/layout/signal_cluster_view.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* apps/common/assets/default/default/skins/StatusBar.xml
+**
+** Copyright 2011, 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.
+*/
+-->
+
+<com.android.systemui.statusbar.SignalClusterView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:orientation="horizontal"
+    >
+    <FrameLayout
+        android:id="@+id/wifi_combo"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="-6dp"
+        >
+        <ImageView
+            android:id="@+id/wifi_signal"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:scaleType="center"
+            />
+        <ImageView
+            android:id="@+id/wifi_inout"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center|bottom"
+            />
+    </FrameLayout>
+    <FrameLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        >
+        <View
+            android:layout_height="6dp"
+            android:layout_width="6dp"
+            android:visibility="invisible"
+            />
+        <FrameLayout
+            android:id="@+id/mobile_combo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            >
+            <ImageView
+                android:id="@+id/mobile_signal"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                />
+            <ImageView
+                android:id="@+id/mobile_type"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                />
+            <ImageView
+                android:id="@+id/mobile_inout"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="right|bottom"
+                />
+        </FrameLayout>
+    </FrameLayout>
+</com.android.systemui.statusbar.SignalClusterView>
diff --git a/packages/SystemUI/res/layout/stacked_signal_icons.xml b/packages/SystemUI/res/layout/stacked_signal_icons.xml
deleted file mode 100644
index fdeb74b16c14d..0000000000000
--- a/packages/SystemUI/res/layout/stacked_signal_icons.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* apps/common/assets/default/default/skins/StatusBar.xml
-**
-** Copyright 2011, 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.
-*/
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    >
-    <ImageView
-        android:id="@+id/mobile_signal"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_alignLeft="@+id/wifi_signal"
-        android:layout_alignWithParentIfMissing="true"
-        />
-    <ImageView
-        android:id="@+id/network_type"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignRight="@id/mobile_signal"
-        android:layout_centerVertical="true"
-        />
-    <ImageView
-        android:id="@+id/wifi_signal"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:scaleType="center"
-        android:paddingLeft="7dp"
-        />
-    <ImageView
-        android:id="@+id/network_direction"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        />
-</RelativeLayout>
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index d8d5d6d701881..ed13ace30b31f 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -57,9 +57,10 @@
             android:orientation="horizontal"
             android:gravity="center"
             >
-            <include layout="@layout/stacked_signal_icons" 
-                android:layout_width="24dp"
-                android:layout_height="match_parent"
+            <include layout="@layout/signal_cluster_view" 
+                android:id="@+id/signal_cluster"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 />
             <ImageView
                 android:id="@+id/battery"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
new file mode 100644
index 0000000000000..325a6053ee2f7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.android.systemui.statusbar;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.systemui.statusbar.policy.NetworkController;
+
+import com.android.systemui.R;
+
+public class SignalClusterView
+        extends LinearLayout 
+        implements NetworkController.SignalCluster {
+
+    NetworkController mNC;
+
+    ViewGroup mWifiGroup, mMobileGroup;
+    ImageView mWifi, mMobile, mWifiActivity, mMobileActivity, mMobileType;
+
+    public SignalClusterView(Context context) {
+        this(context, null);
+    }
+
+    public SignalClusterView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SignalClusterView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public void setNetworkController(NetworkController nc) {
+        mNC = nc;
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        mWifiGroup      = (ViewGroup) findViewById(R.id.wifi_combo);
+        mWifi           = (ImageView) findViewById(R.id.wifi_signal);
+        mWifiActivity   = (ImageView) findViewById(R.id.wifi_inout);
+        mMobileGroup    = (ViewGroup) findViewById(R.id.mobile_combo);
+        mMobile         = (ImageView) findViewById(R.id.mobile_signal);
+        mMobileActivity = (ImageView) findViewById(R.id.mobile_inout);
+        mMobileType     = (ImageView) findViewById(R.id.mobile_type);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+    }
+
+    public void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon) {
+        if (mWifiGroup == null) return;
+
+        if (visible) {
+            mWifiGroup.setVisibility(View.VISIBLE);
+            mWifi.setImageResource(strengthIcon);
+            mWifiActivity.setImageResource(activityIcon);
+        } else {
+            mWifiGroup.setVisibility(View.GONE);
+        }
+    }
+
+    public void setMobileDataIndicators(boolean visible, int strengthIcon, int activityIcon,
+            int typeIcon) {
+        if (mMobileGroup == null) return;
+
+        if (visible) {
+            mMobileGroup.setVisibility(View.VISIBLE);
+            mMobile.setImageResource(strengthIcon);
+            mMobileActivity.setImageResource(activityIcon);
+            mMobileType.setImageResource(typeIcon);
+        } else {
+            mMobileGroup.setVisibility(View.GONE);
+        }
+    }
+}
+
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index a54c5c2b1b959..81c25e06891da 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -80,6 +80,7 @@ import com.android.systemui.recent.RecentsPanelView;
 import com.android.systemui.statusbar.NotificationData;
 import com.android.systemui.statusbar.StatusBar;
 import com.android.systemui.statusbar.StatusBarIconView;
+import com.android.systemui.statusbar.SignalClusterView;
 import com.android.systemui.statusbar.policy.DateView;
 import com.android.systemui.statusbar.policy.BatteryController;
 import com.android.systemui.statusbar.policy.LocationController;
@@ -344,26 +345,9 @@ public class PhoneStatusBar extends StatusBar {
         mBatteryController = new BatteryController(mContext);
         mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));
         mNetworkController = new NetworkController(mContext);
-        final ImageView comboRSSI = 
-                (ImageView)sb.findViewById(R.id.network_signal);
-        if (comboRSSI != null) {
-            mNetworkController.addCombinedSignalIconView(comboRSSI);
-        }
-        final ImageView mobileRSSI = 
-                (ImageView)sb.findViewById(R.id.mobile_signal);
-        if (mobileRSSI != null) {
-            mNetworkController.addPhoneSignalIconView(mobileRSSI);
-        }
-        final ImageView wifiRSSI = 
-                (ImageView)sb.findViewById(R.id.wifi_signal);
-        if (wifiRSSI != null) {
-            mNetworkController.addWifiIconView(wifiRSSI);
-        }
-        mNetworkController.addDataTypeIconView(
-                (ImageView)sb.findViewById(R.id.network_type));
-        mNetworkController.addDataDirectionOverlayIconView(
-                (ImageView)sb.findViewById(R.id.network_direction));
-        mNetworkController.setStackedMode(true);
+        final SignalClusterView signalCluster = 
+                (SignalClusterView)sb.findViewById(R.id.signal_cluster);
+        mNetworkController.addSignalCluster(signalCluster);
 
         // Recents Panel
         updateRecentsPanel();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index e675657ab81cd..1a24d05e48248 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -120,6 +120,7 @@ public class NetworkController extends BroadcastReceiver {
     ArrayList<ImageView> mCombinedSignalIconViews = new ArrayList<ImageView>();
     ArrayList<ImageView> mDataTypeIconViews = new ArrayList<ImageView>();
     ArrayList<TextView> mLabelViews = new ArrayList<TextView>();
+    ArrayList<SignalCluster> mSignalClusters = new ArrayList<SignalCluster>();
     int mLastPhoneSignalIconId = -1;
     int mLastDataDirectionIconId = -1;
     int mLastDataDirectionOverlayIconId = -1;
@@ -133,6 +134,12 @@ public class NetworkController extends BroadcastReceiver {
     // yuck -- stop doing this here and put it in the framework
     IBatteryStats mBatteryStats;
 
+    public interface SignalCluster {
+        void setWifiIndicators(boolean visible, int strengthIcon, int activityIcon);
+        void setMobileDataIndicators(boolean visible, int strengthIcon, int activityIcon,
+                int typeIcon);
+    }
+
     /**
      * Construct this controller object and register for updates.
      */
@@ -214,6 +221,10 @@ public class NetworkController extends BroadcastReceiver {
         mLabelViews.add(v);
     }
 
+    public void addSignalCluster(SignalCluster v) {
+        mSignalClusters.add(v);
+    }
+
     public void setStackedMode(boolean stacked) {
         mDataAndWifiStacked = true;
     }
@@ -369,12 +380,12 @@ public class NetworkController extends BroadcastReceiver {
     private final void updateTelephonySignalStrength() {
         if (!hasService()) {
             //Slog.d(TAG, "updateTelephonySignalStrength: no service");
-            mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
-            mDataSignalIconId = R.drawable.stat_sys_signal_0; // note we use 0 instead of null
+            mPhoneSignalIconId = R.drawable.stat_sys_signal_0;
+            mDataSignalIconId = R.drawable.stat_sys_signal_0;
         } else {
             if (mSignalStrength == null) {
-                mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
-                mDataSignalIconId = R.drawable.stat_sys_signal_0; // note we use 0 instead of null
+                mPhoneSignalIconId = R.drawable.stat_sys_signal_0;
+                mDataSignalIconId = R.drawable.stat_sys_signal_0;
                 mContentDescriptionPhoneSignal = mContext.getString(
                         AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0]);
             } else {
@@ -414,13 +425,13 @@ public class NetworkController extends BroadcastReceiver {
                 break;
             case TelephonyManager.NETWORK_TYPE_EDGE:
                 mDataIconList = TelephonyIcons.DATA_E[mInetCondition];
-                mDataTypeIconId = R.drawable.stat_sys_signal_edge;
+                mDataTypeIconId = R.drawable.stat_sys_data_connected_e;
                 mContentDescriptionDataType = mContext.getString(
                         R.string.accessibility_data_connection_edge);
                 break;
             case TelephonyManager.NETWORK_TYPE_UMTS:
                 mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
-                mDataTypeIconId = R.drawable.stat_sys_signal_3g;
+                mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
                 mContentDescriptionDataType = mContext.getString(
                         R.string.accessibility_data_connection_3g);
                 break;
@@ -429,12 +440,12 @@ public class NetworkController extends BroadcastReceiver {
             case TelephonyManager.NETWORK_TYPE_HSPA:
                 if (mHspaDataDistinguishable) {
                     mDataIconList = TelephonyIcons.DATA_H[mInetCondition];
-                    mDataTypeIconId = R.drawable.stat_sys_signal_hsdpa;
+                    mDataTypeIconId = R.drawable.stat_sys_data_connected_h;
                     mContentDescriptionDataType = mContext.getString(
                             R.string.accessibility_data_connection_3_5g);
                 } else {
                     mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
-                    mDataTypeIconId = R.drawable.stat_sys_signal_3g;
+                    mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
                     mContentDescriptionDataType = mContext.getString(
                             R.string.accessibility_data_connection_3g);
                 }
@@ -442,13 +453,13 @@ public class NetworkController extends BroadcastReceiver {
             case TelephonyManager.NETWORK_TYPE_CDMA:
                 // display 1xRTT for IS95A/B
                 mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
-                mDataTypeIconId = R.drawable.stat_sys_signal_1x;
+                mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
                 mContentDescriptionDataType = mContext.getString(
                         R.string.accessibility_data_connection_cdma);
                 break;
             case TelephonyManager.NETWORK_TYPE_1xRTT:
                 mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
-                mDataTypeIconId = R.drawable.stat_sys_signal_1x;
+                mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
                 mContentDescriptionDataType = mContext.getString(
                         R.string.accessibility_data_connection_cdma);
                 break;
@@ -457,25 +468,25 @@ public class NetworkController extends BroadcastReceiver {
             case TelephonyManager.NETWORK_TYPE_EVDO_B:
             case TelephonyManager.NETWORK_TYPE_EHRPD:
                 mDataIconList = TelephonyIcons.DATA_3G[mInetCondition];
-                mDataTypeIconId = R.drawable.stat_sys_signal_3g;
+                mDataTypeIconId = R.drawable.stat_sys_data_connected_3g;
                 mContentDescriptionDataType = mContext.getString(
                         R.string.accessibility_data_connection_3g);
                 break;
             case TelephonyManager.NETWORK_TYPE_LTE:
                 mDataIconList = TelephonyIcons.DATA_4G[mInetCondition];
-                mDataTypeIconId = R.drawable.stat_sys_signal_4g;
+                mDataTypeIconId = R.drawable.stat_sys_data_connected_4g;
                 mContentDescriptionDataType = mContext.getString(
                         R.string.accessibility_data_connection_4g);
                 break;
             default:
                 mDataIconList = TelephonyIcons.DATA_G[mInetCondition];
-                mDataTypeIconId = R.drawable.stat_sys_signal_gprs;
+                mDataTypeIconId = R.drawable.stat_sys_data_connected_g;
                 mContentDescriptionDataType = mContext.getString(
                         R.string.accessibility_data_connection_gprs);
                 break;
         }
         if ((isCdma() && isCdmaEri()) || mPhone.isNetworkRoaming()) {
-            mDataTypeIconId = R.drawable.stat_sys_signal_roam;
+            mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
         }
     }
 
@@ -730,7 +741,9 @@ public class NetworkController extends BroadcastReceiver {
         Context context = mContext;
 
         int combinedSignalIconId;
-        int dataDirectionOverlayIconId = 0;
+        int dataDirectionOverlayIconId = 0,
+            wifiActivityIconId = 0,
+            mobileActivityIconId = 0;
         int dataTypeIconId;
         String label;
         int N;
@@ -753,6 +766,7 @@ public class NetworkController extends BroadcastReceiver {
                     case WifiManager.DATA_ACTIVITY_NONE:
                         break;
                 }
+                wifiActivityIconId = dataDirectionOverlayIconId;
             }
             combinedSignalIconId = mWifiIconId;
             mContentDescriptionCombinedSignal = mContentDescriptionWifi;
@@ -774,6 +788,7 @@ public class NetworkController extends BroadcastReceiver {
                     dataDirectionOverlayIconId = 0;
                     break;
             }
+            mobileActivityIconId = dataDirectionOverlayIconId;
             combinedSignalIconId = mDataSignalIconId;
             mContentDescriptionCombinedSignal = mContentDescriptionDataType;
             dataTypeIconId = mDataTypeIconId;
@@ -790,7 +805,7 @@ public class NetworkController extends BroadcastReceiver {
             combinedSignalIconId = R.drawable.stat_sys_signal_flightmode;
             mContentDescriptionCombinedSignal = mContext.getString(
                     R.string.accessibility_airplane_mode);
-            dataTypeIconId = 0;
+            dataTypeIconId = R.drawable.stat_sys_signal_flightmode; // was 0;
         } else {
             label = context.getString(R.string.status_bar_settings_signal_meter_disconnected);
             // On devices without mobile radios, we want to show the wifi icon
@@ -821,6 +836,25 @@ public class NetworkController extends BroadcastReceiver {
                     + " mBluetoothTetherIconId=0x" + Integer.toHexString(mBluetoothTetherIconId));
         }
 
+        if (mLastPhoneSignalIconId          != mPhoneSignalIconId
+         || mLastDataDirectionOverlayIconId != dataDirectionOverlayIconId
+         || mLastWifiIconId                 != mWifiIconId
+         || mLastDataTypeIconId             != dataTypeIconId)
+        {
+            // NB: the mLast*s will be updated later
+            for (SignalCluster cluster : mSignalClusters) {
+                cluster.setWifiIndicators(
+                        mWifiEnabled,
+                        mWifiIconId,
+                        wifiActivityIconId);
+                cluster.setMobileDataIndicators(
+                        hasMobileDataFeature(),
+                        mPhoneSignalIconId,
+                        mobileActivityIconId,
+                        dataTypeIconId);
+            }
+        }
+
         // the phone icon on phones
         if (mLastPhoneSignalIconId != mPhoneSignalIconId) {
             mLastPhoneSignalIconId = mPhoneSignalIconId;
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 449ea997283cc..959e06dc3ccb1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
@@ -36,16 +36,16 @@ class TelephonyIcons {
     };
 
     static final int[][] TELEPHONY_SIGNAL_STRENGTH_ROAMING = {
-        { R.drawable.stat_sys_r_signal_0,
-          R.drawable.stat_sys_r_signal_1,
-          R.drawable.stat_sys_r_signal_2,
-          R.drawable.stat_sys_r_signal_3,
-          R.drawable.stat_sys_r_signal_4 },
-        { R.drawable.stat_sys_r_signal_0_fully,
-          R.drawable.stat_sys_r_signal_1_fully,
-          R.drawable.stat_sys_r_signal_2_fully,
-          R.drawable.stat_sys_r_signal_3_fully,
-          R.drawable.stat_sys_r_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,
+          R.drawable.stat_sys_signal_3_fully,
+          R.drawable.stat_sys_signal_4_fully }
     };
 
     static final int[][] DATA_SIGNAL_STRENGTH = TELEPHONY_SIGNAL_STRENGTH;
@@ -55,72 +55,72 @@ class TelephonyIcons {
     //GSM/UMTS
     static final int[][] DATA_G = {
             { R.drawable.stat_sys_data_connected_g,
-              R.drawable.stat_sys_data_in_g,
-              R.drawable.stat_sys_data_out_g,
-              R.drawable.stat_sys_data_inandout_g },
+              R.drawable.stat_sys_data_connected_g,
+              R.drawable.stat_sys_data_connected_g,
+              R.drawable.stat_sys_data_connected_g },
             { R.drawable.stat_sys_data_fully_connected_g,
-              R.drawable.stat_sys_data_fully_in_g,
-              R.drawable.stat_sys_data_fully_out_g,
-              R.drawable.stat_sys_data_fully_inandout_g }
+              R.drawable.stat_sys_data_fully_connected_g,
+              R.drawable.stat_sys_data_fully_connected_g,
+              R.drawable.stat_sys_data_fully_connected_g }
         };
 
     static final int[][] DATA_3G = {
             { R.drawable.stat_sys_data_connected_3g,
-              R.drawable.stat_sys_data_in_3g,
-              R.drawable.stat_sys_data_out_3g,
-              R.drawable.stat_sys_data_inandout_3g },
+              R.drawable.stat_sys_data_connected_3g,
+              R.drawable.stat_sys_data_connected_3g,
+              R.drawable.stat_sys_data_connected_3g },
             { R.drawable.stat_sys_data_fully_connected_3g,
-              R.drawable.stat_sys_data_fully_in_3g,
-              R.drawable.stat_sys_data_fully_out_3g,
-              R.drawable.stat_sys_data_fully_inandout_3g }
+              R.drawable.stat_sys_data_fully_connected_3g,
+              R.drawable.stat_sys_data_fully_connected_3g,
+              R.drawable.stat_sys_data_fully_connected_3g }
         };
 
     static final int[][] DATA_E = {
             { R.drawable.stat_sys_data_connected_e,
-              R.drawable.stat_sys_data_in_e,
-              R.drawable.stat_sys_data_out_e,
-              R.drawable.stat_sys_data_inandout_e },
+              R.drawable.stat_sys_data_connected_e,
+              R.drawable.stat_sys_data_connected_e,
+              R.drawable.stat_sys_data_connected_e },
             { R.drawable.stat_sys_data_fully_connected_e,
-              R.drawable.stat_sys_data_fully_in_e,
-              R.drawable.stat_sys_data_fully_out_e,
-              R.drawable.stat_sys_data_fully_inandout_e }
+              R.drawable.stat_sys_data_fully_connected_e,
+              R.drawable.stat_sys_data_fully_connected_e,
+              R.drawable.stat_sys_data_fully_connected_e }
         };
 
     //3.5G
     static final int[][] DATA_H = {
             { R.drawable.stat_sys_data_connected_h,
-              R.drawable.stat_sys_data_in_h,
-              R.drawable.stat_sys_data_out_h,
-              R.drawable.stat_sys_data_inandout_h },
+              R.drawable.stat_sys_data_connected_h,
+              R.drawable.stat_sys_data_connected_h,
+              R.drawable.stat_sys_data_connected_h },
             { R.drawable.stat_sys_data_fully_connected_h,
-              R.drawable.stat_sys_data_fully_in_h,
-              R.drawable.stat_sys_data_fully_out_h,
-              R.drawable.stat_sys_data_fully_inandout_h }
+              R.drawable.stat_sys_data_fully_connected_h,
+              R.drawable.stat_sys_data_fully_connected_h,
+              R.drawable.stat_sys_data_fully_connected_h }
     };
 
     //CDMA
     // Use 3G icons for EVDO data and 1x icons for 1XRTT data
     static final int[][] DATA_1X = {
             { R.drawable.stat_sys_data_connected_1x,
-              R.drawable.stat_sys_data_in_1x,
-              R.drawable.stat_sys_data_out_1x,
-              R.drawable.stat_sys_data_inandout_1x },
+              R.drawable.stat_sys_data_connected_1x,
+              R.drawable.stat_sys_data_connected_1x,
+              R.drawable.stat_sys_data_connected_1x },
             { R.drawable.stat_sys_data_fully_connected_1x,
-              R.drawable.stat_sys_data_fully_in_1x,
-              R.drawable.stat_sys_data_fully_out_1x,
-              R.drawable.stat_sys_data_fully_inandout_1x }
+              R.drawable.stat_sys_data_fully_connected_1x,
+              R.drawable.stat_sys_data_fully_connected_1x,
+              R.drawable.stat_sys_data_fully_connected_1x }
             };
 
     // LTE and eHRPD
     static final int[][] DATA_4G = {
             { R.drawable.stat_sys_data_connected_4g,
-              R.drawable.stat_sys_data_in_4g,
-              R.drawable.stat_sys_data_out_4g,
-              R.drawable.stat_sys_data_inandout_4g },
+              R.drawable.stat_sys_data_connected_4g,
+              R.drawable.stat_sys_data_connected_4g,
+              R.drawable.stat_sys_data_connected_4g },
             { R.drawable.stat_sys_data_fully_connected_4g,
-              R.drawable.stat_sys_data_fully_in_4g,
-              R.drawable.stat_sys_data_fully_out_4g,
-              R.drawable.stat_sys_data_fully_inandout_4g }
+              R.drawable.stat_sys_data_fully_connected_4g,
+              R.drawable.stat_sys_data_fully_connected_4g,
+              R.drawable.stat_sys_data_fully_connected_4g }
         };
 
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
index e90aad4e36d50..81b572117ed6f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -485,25 +485,9 @@ public class TabletStatusBar extends StatusBar implements
         mBluetoothController.addIconView((ImageView)sb.findViewById(R.id.bluetooth));
 
         mNetworkController = new NetworkController(mContext);
-        final ImageView comboRSSI = 
-                (ImageView)sb.findViewById(R.id.network_signal);
-        if (comboRSSI != null) {
-            mNetworkController.addCombinedSignalIconView(comboRSSI);
-        }
-        final ImageView mobileRSSI = 
-                (ImageView)sb.findViewById(R.id.mobile_signal);
-        if (mobileRSSI != null) {
-            mNetworkController.addPhoneSignalIconView(mobileRSSI);
-        }
-        final ImageView wifiRSSI = 
-                (ImageView)sb.findViewById(R.id.wifi_signal);
-        if (wifiRSSI != null) {
-            mNetworkController.addWifiIconView(wifiRSSI);
-        }
-        mNetworkController.addDataTypeIconView(
-                (ImageView)sb.findViewById(R.id.network_type));
-        mNetworkController.addDataDirectionOverlayIconView(
-                (ImageView)sb.findViewById(R.id.network_direction));
+        final SignalClusterView signalCluster = 
+                (SignalClusterView)sb.findViewById(R.id.signal_cluster);
+        mNetworkController.addSignalCluster(signalCluster);
 
         // The navigation buttons
         mBackButton = (ImageView)sb.findViewById(R.id.back);