diff --git a/packages/SystemUI/res/drawable-mdpi/battery_0.png b/packages/SystemUI/res/drawable-mdpi/battery_0.png
index b5d36cc228211..77162c87ab93a 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/battery_0.png and b/packages/SystemUI/res/drawable-mdpi/battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_100.png b/packages/SystemUI/res/drawable-mdpi/battery_100.png
index 75cc4091b1730..588a74b16eefb 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/battery_100.png and b/packages/SystemUI/res/drawable-mdpi/battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_20.png b/packages/SystemUI/res/drawable-mdpi/battery_20.png
deleted file mode 100644
index c0d003039fde0..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/battery_20.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_25.png b/packages/SystemUI/res/drawable-mdpi/battery_25.png
new file mode 100644
index 0000000000000..b11570b2ff2da
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/battery_25.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_40.png b/packages/SystemUI/res/drawable-mdpi/battery_40.png
deleted file mode 100644
index e301c08f0a9d7..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/battery_40.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_50.png b/packages/SystemUI/res/drawable-mdpi/battery_50.png
new file mode 100644
index 0000000000000..94d7eca5535e0
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/battery_50.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_60.png b/packages/SystemUI/res/drawable-mdpi/battery_60.png
deleted file mode 100644
index 0fde1fa2782ee..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/battery_60.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_75.png b/packages/SystemUI/res/drawable-mdpi/battery_75.png
new file mode 100644
index 0000000000000..3cb35910bdc2c
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/battery_75.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/battery_80.png b/packages/SystemUI/res/drawable-mdpi/battery_80.png
deleted file mode 100644
index 15c4e1c31beef..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/battery_80.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_0.png b/packages/SystemUI/res/drawable-mdpi/signal_0.png
index 6533677b04d48..cf436ad2adcb4 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/signal_0.png and b/packages/SystemUI/res/drawable-mdpi/signal_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_100.png b/packages/SystemUI/res/drawable-mdpi/signal_100.png
index e8976a26d06c6..0011a1b1c1d4d 100644
Binary files a/packages/SystemUI/res/drawable-mdpi/signal_100.png and b/packages/SystemUI/res/drawable-mdpi/signal_100.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_20.png b/packages/SystemUI/res/drawable-mdpi/signal_20.png
deleted file mode 100644
index 651e2a96d967b..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/signal_20.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_25.png b/packages/SystemUI/res/drawable-mdpi/signal_25.png
new file mode 100644
index 0000000000000..69c643f59de85
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/signal_25.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_40.png b/packages/SystemUI/res/drawable-mdpi/signal_40.png
deleted file mode 100644
index 6ba7906db72fb..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/signal_40.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_50.png b/packages/SystemUI/res/drawable-mdpi/signal_50.png
new file mode 100644
index 0000000000000..c8acd72d77f59
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/signal_50.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_60.png b/packages/SystemUI/res/drawable-mdpi/signal_60.png
deleted file mode 100644
index 6d2e8128fe7e5..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/signal_60.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_75.png b/packages/SystemUI/res/drawable-mdpi/signal_75.png
new file mode 100644
index 0000000000000..9650dfa204689
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/signal_75.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/signal_80.png b/packages/SystemUI/res/drawable-mdpi/signal_80.png
deleted file mode 100644
index a1526234a785b..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/signal_80.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable/battery.xml b/packages/SystemUI/res/drawable/battery.xml
index c2294d1072ce5..f4a720d17a1fc 100644
--- a/packages/SystemUI/res/drawable/battery.xml
+++ b/packages/SystemUI/res/drawable/battery.xml
@@ -23,13 +23,12 @@
-
-
+
-
-
-
-
+
+
+
diff --git a/packages/SystemUI/res/drawable/battery_charging.xml b/packages/SystemUI/res/drawable/battery_charging.xml
index 2fd0c6d3b7643..c9b77ddda9277 100644
--- a/packages/SystemUI/res/drawable/battery_charging.xml
+++ b/packages/SystemUI/res/drawable/battery_charging.xml
@@ -19,33 +19,27 @@
-->
- -
+
-
-
+
- -
+
-
-
-
+
+
- -
+
-
-
-
-
-
- -
-
-
-
+
+
-
-
+
diff --git a/packages/SystemUI/res/drawable/signal.xml b/packages/SystemUI/res/drawable/signal.xml
index 8b4f56b2962ee..5aa211af6729e 100644
--- a/packages/SystemUI/res/drawable/signal.xml
+++ b/packages/SystemUI/res/drawable/signal.xml
@@ -20,10 +20,9 @@
-
-
-
-
+
+
+