diff --git a/res/drawable/ic_power_system.xml b/res/drawable/ic_power_system.xml
index cdebc0e83ae..f4a6ec0827f 100644
--- a/res/drawable/ic_power_system.xml
+++ b/res/drawable/ic_power_system.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2022 The Android Open Source Project
+    Copyright (C) 2023 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.
@@ -13,12 +13,11 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
         android:tint="@color/battery_usage_system_icon_color">
     <path
         android:fillColor="@android:color/white"
diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml
index a8666ac3ecc..df1b4ba58b1 100644
--- a/res/drawable/ic_settings_bluetooth.xml
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2022 The Android Open Source Project
+    Copyright (C) 2023 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.
@@ -16,8 +16,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
         android:tint="@color/battery_usage_system_icon_color">
     <path
         android:fillColor="@android:color/white"
diff --git a/res/drawable/ic_settings_camera.xml b/res/drawable/ic_settings_camera.xml
index 278d29508ce..3402657b955 100644
--- a/res/drawable/ic_settings_camera.xml
+++ b/res/drawable/ic_settings_camera.xml
@@ -1,5 +1,5 @@
 <!--
-     Copyright (C) 2022 The Android Open Source Project
+     Copyright (C) 2023 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.
@@ -13,22 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:autoMirrored="true"
-    android:tint="@color/battery_usage_system_icon_color">
-
-    <path android:fillColor="@android:color/white"
-          android:pathData="M18.8 21l9.53-16.51C26.94 4.18 25.49 4 24 4c-4.8 0-9.19 1.69-12.64
-                            4.51l7.33 12.69.11-.2zm24.28-3c-1.84-5.85-6.3-10.52-11.99-12.68L23.77
-                            18h19.31zm.52 2H28.62l.58 1 9.53 16.5C41.99 33.94 44 29.21 44
-                            24c0-1.37-.14-2.71-.4-4zm-26.53 4l-7.8-13.5C6.01 14.06 4 18.79 4 24c0
-                            1.37.14 2.71.4 4h14.98l-2.31-4zM4.92 30c1.84 5.85 6.3 10.52 11.99
-                            12.68L24.23 30H4.92zm22.54 0l-7.8 13.51c1.4.31 2.85.49 4.34.49 4.8 0
-                            9.19-1.69 12.64-4.51L29.31 26.8 27.46 30z"/>
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="@color/battery_usage_system_icon_color">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,21Q3.175,21 2.588,20.413Q2,19.825 2,19V7Q2,6.175 2.588,5.588Q3.175,5 4,5H7.15L9,3H15L16.85,5H20Q20.825,5 21.413,5.588Q22,6.175 22,7V19Q22,19.825 21.413,20.413Q20.825,21 20,21ZM4,19H20Q20,19 20,19Q20,19 20,19V7Q20,7 20,7Q20,7 20,7H4Q4,7 4,7Q4,7 4,7V19Q4,19 4,19Q4,19 4,19ZM4,19Q4,19 4,19Q4,19 4,19V7Q4,7 4,7Q4,7 4,7Q4,7 4,7Q4,7 4,7V19Q4,19 4,19Q4,19 4,19ZM12,17.5Q13.875,17.5 15.188,16.188Q16.5,14.875 16.5,13Q16.5,11.125 15.188,9.812Q13.875,8.5 12,8.5Q10.125,8.5 8.812,9.812Q7.5,11.125 7.5,13Q7.5,14.875 8.812,16.188Q10.125,17.5 12,17.5ZM12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Z"/>
 </vector>
diff --git a/res/drawable/ic_cellular_1_bar.xml b/res/drawable/ic_settings_cellular.xml
similarity index 77%
rename from res/drawable/ic_cellular_1_bar.xml
rename to res/drawable/ic_settings_cellular.xml
index a07e25752fe..c23a3a88948 100644
--- a/res/drawable/ic_cellular_1_bar.xml
+++ b/res/drawable/ic_settings_cellular.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2022 The Android Open Source Project
+  Copyright (C) 2023 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.
@@ -12,14 +12,13 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  -->
-
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="@color/battery_usage_system_icon_color">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="@color/battery_usage_system_icon_color">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,7v13H7L20,7 M22,2L2,22h20V2L22,2z" />
diff --git a/res/drawable/ic_settings_cpu.xml b/res/drawable/ic_settings_cpu.xml
new file mode 100644
index 00000000000..370e54f88d1
--- /dev/null
+++ b/res/drawable/ic_settings_cpu.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2023 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="@color/battery_usage_system_icon_color">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9,15V9H15V15ZM11,13H13V11H11ZM9,21V19H7Q6.175,19 5.588,18.413Q5,17.825 5,17V15H3V13H5V11H3V9H5V7Q5,6.175 5.588,5.588Q6.175,5 7,5H9V3H11V5H13V3H15V5H17Q17.825,5 18.413,5.588Q19,6.175 19,7V9H21V11H19V13H21V15H19V17Q19,17.825 18.413,18.413Q17.825,19 17,19H15V21H13V19H11V21ZM17,17Q17,17 17,17Q17,17 17,17V7Q17,7 17,7Q17,7 17,7H7Q7,7 7,7Q7,7 7,7V17Q7,17 7,17Q7,17 7,17ZM12,12Z"/>
+</vector>
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index 61d1aeb5fcf..8a176cf280d 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2022 The Android Open Source Project
+    Copyright (C) 2023 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.
@@ -14,10 +14,10 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
         android:tint="@color/battery_usage_system_icon_color">
     <path
         android:fillColor="@android:color/white"
diff --git a/res/drawable/ic_settings_flashlight.xml b/res/drawable/ic_settings_flashlight.xml
new file mode 100644
index 00000000000..378cf31d500
--- /dev/null
+++ b/res/drawable/ic_settings_flashlight.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2023 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="@color/battery_usage_system_icon_color">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8,22V11L6,8V2H18V8L16,11V22ZM12,15.5Q11.375,15.5 10.938,15.062Q10.5,14.625 10.5,14Q10.5,13.375 10.938,12.938Q11.375,12.5 12,12.5Q12.625,12.5 13.062,12.938Q13.5,13.375 13.5,14Q13.5,14.625 13.062,15.062Q12.625,15.5 12,15.5ZM8,5H16V4H8ZM16,7H8V7.4L10,10.4V20H14V10.4L16,7.4ZM12,12Z"/>
+</vector>
diff --git a/res/drawable/ic_settings_gps.xml b/res/drawable/ic_settings_gps.xml
new file mode 100644
index 00000000000..772d81d4bfd
--- /dev/null
+++ b/res/drawable/ic_settings_gps.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2023 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="@color/battery_usage_system_icon_color">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,22Q11.65,22 11.4,21.8Q11.15,21.6 11.025,21.275Q10.55,19.875 9.838,18.65Q9.125,17.425 7.85,15.775Q6.575,14.125 5.787,12.625Q5,11.125 5,9Q5,6.075 7.038,4.037Q9.075,2 12,2Q14.925,2 16.962,4.037Q19,6.075 19,9Q19,11.275 18.138,12.787Q17.275,14.3 16.15,15.775Q14.8,17.575 14.113,18.762Q13.425,19.95 12.975,21.275Q12.85,21.625 12.588,21.812Q12.325,22 12,22ZM12,18.425Q12.425,17.575 12.963,16.75Q13.5,15.925 14.55,14.55Q15.625,13.15 16.312,11.962Q17,10.775 17,9Q17,6.925 15.538,5.463Q14.075,4 12,4Q9.925,4 8.463,5.463Q7,6.925 7,9Q7,10.775 7.688,11.962Q8.375,13.15 9.45,14.55Q10.5,15.925 11.038,16.75Q11.575,17.575 12,18.425ZM12,11.5Q13.05,11.5 13.775,10.775Q14.5,10.05 14.5,9Q14.5,7.95 13.775,7.225Q13.05,6.5 12,6.5Q10.95,6.5 10.225,7.225Q9.5,7.95 9.5,9Q9.5,10.05 10.225,10.775Q10.95,11.5 12,11.5ZM12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Z"/>
+</vector>
diff --git a/res/drawable/ic_settings_voice_calls.xml b/res/drawable/ic_settings_voice_calls.xml
index c8817a89006..fbaf9021865 100644
--- a/res/drawable/ic_settings_voice_calls.xml
+++ b/res/drawable/ic_settings_voice_calls.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2022 The Android Open Source Project
+  Copyright (C) 2023 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.
@@ -14,12 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="@color/battery_usage_system_icon_color">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="@color/battery_usage_system_icon_color">
     <path
-      android:fillColor="@android:color/white"
-      android:pathData="M40,31c-2.49,0 -4.89,-0.4 -7.14,-1.14 -0.69,-0.22 -1.48,-0.06 -2.03,0.49l-4.4,4.41c-5.67,-2.88 -10.29,-7.51 -13.18,-13.17l4.4,-4.41c0.55,-0.55 0.71,-1.34 0.49,-2.03C17.4,12.9 17,10.49 17,8c0,-1.11 -0.89,-2 -2,-2L8,6c-1.11,0 -2,0.89 -2,2 0,18.78 15.22,34 34,34 1.11,0 2,-0.89 2,-2v-7c0,-1.11 -0.89,-2 -2,-2zM38,24h4c0,-9.94 -8.06,-18 -18,-18v4c7.73,0 14,6.27 14,14zM30,24h4c0,-5.52 -4.48,-10 -10,-10v4c3.31,0 6,2.69 6,6z"/>
+        android:fillColor="@android:color/white"
+        android:pathData="M19,12Q19,9.075 16.962,7.037Q14.925,5 12,5V3Q13.875,3 15.513,3.712Q17.15,4.425 18.363,5.637Q19.575,6.85 20.288,8.487Q21,10.125 21,12ZM15,12Q15,10.75 14.125,9.875Q13.25,9 12,9V7Q14.075,7 15.538,8.462Q17,9.925 17,12ZM19.95,21Q16.725,21 13.663,19.562Q10.6,18.125 8.238,15.762Q5.875,13.4 4.438,10.337Q3,7.275 3,4.05Q3,3.6 3.3,3.3Q3.6,3 4.05,3H8.1Q8.45,3 8.725,3.225Q9,3.45 9.05,3.8L9.7,7.3Q9.75,7.65 9.688,7.937Q9.625,8.225 9.4,8.45L6.975,10.9Q8.025,12.7 9.613,14.275Q11.2,15.85 13.1,17L15.45,14.65Q15.675,14.425 16.038,14.312Q16.4,14.2 16.75,14.25L20.2,14.95Q20.55,15.025 20.775,15.287Q21,15.55 21,15.9V19.95Q21,20.4 20.7,20.7Q20.4,21 19.95,21ZM6.025,9 L7.675,7.35Q7.675,7.35 7.675,7.35Q7.675,7.35 7.675,7.35L7.25,5Q7.25,5 7.25,5Q7.25,5 7.25,5H5.025Q5.025,5 5.025,5Q5.025,5 5.025,5Q5.15,6.025 5.375,7.025Q5.6,8.025 6.025,9ZM14.975,17.95Q15.95,18.375 16.963,18.625Q17.975,18.875 19,18.95Q19,18.95 19,18.95Q19,18.95 19,18.95V16.75Q19,16.75 19,16.75Q19,16.75 19,16.75L16.65,16.275Q16.65,16.275 16.65,16.275Q16.65,16.275 16.65,16.275ZM6.025,9Q6.025,9 6.025,9Q6.025,9 6.025,9Q6.025,9 6.025,9Q6.025,9 6.025,9Q6.025,9 6.025,9Q6.025,9 6.025,9Q6.025,9 6.025,9Q6.025,9 6.025,9ZM14.975,17.95Q14.975,17.95 14.975,17.95Q14.975,17.95 14.975,17.95Q14.975,17.95 14.975,17.95Q14.975,17.95 14.975,17.95Q14.975,17.95 14.975,17.95Q14.975,17.95 14.975,17.95Q14.975,17.95 14.975,17.95Q14.975,17.95 14.975,17.95Z"/>
 </vector>
diff --git a/res/drawable/ic_settings_wireless_no_theme.xml b/res/drawable/ic_settings_wireless_no_theme.xml
index 5e18b89ad4c..4d14c551f36 100644
--- a/res/drawable/ic_settings_wireless_no_theme.xml
+++ b/res/drawable/ic_settings_wireless_no_theme.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2022 The Android Open Source Project
+    Copyright (C) 2023 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.
@@ -14,10 +14,10 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
         android:tint="@color/battery_usage_system_icon_color">
     <path
         android:pathData="M1.003,9L3.003,11C7.973,6.03 16.033,6.03 21.003,11L23.003,9C16.933,2.93 7.083,2.93 1.003,9ZM9.003,17L12.003,20L15.003,17C13.353,15.34 10.663,15.34 9.003,17ZM7.005,15L5.005,13C8.875,9.14 15.145,9.14 19.005,13L17.005,15C14.245,12.241 9.765,12.241 7.005,15Z"
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
index 69b57ca5f35..b3e190f94c9 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
@@ -565,7 +565,7 @@ public class BatteryEntry {
                 break;
             case BatteryConsumer.POWER_COMPONENT_CPU:  // id: 1
                 name = context.getResources().getString(R.string.power_cpu);
-                iconId = R.drawable.ic_power_system;
+                iconId = R.drawable.ic_settings_cpu;
                 break;
             case BatteryConsumer.POWER_COMPONENT_BLUETOOTH: // id: 2
                 name = context.getResources().getString(R.string.power_bluetooth);
@@ -577,15 +577,15 @@ public class BatteryEntry {
                 break;
             case BatteryConsumer.POWER_COMPONENT_FLASHLIGHT:  // id: 6
                 name = context.getResources().getString(R.string.power_flashlight);
-                iconId = R.drawable.ic_settings_display;
+                iconId = R.drawable.ic_settings_flashlight;
                 break;
             case BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO: // id: 8
                 name = context.getResources().getString(R.string.power_cell);
-                iconId = R.drawable.ic_cellular_1_bar;
+                iconId = R.drawable.ic_settings_cellular;
                 break;
             case BatteryConsumer.POWER_COMPONENT_GNSS:  // id: 10
                 name = context.getResources().getString(R.string.power_gps);
-                iconId = R.drawable.ic_power_system;
+                iconId = R.drawable.ic_settings_gps;
                 break;
             case BatteryConsumer.POWER_COMPONENT_WIFI:  // id: 11
                 name = context.getResources().getString(R.string.power_wifi);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
index 6a5ae347bbe..dec5d7d3345 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
@@ -322,7 +322,7 @@ public class BatteryEntryTest {
                 R.drawable.ic_settings_display);
         assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_CPU,
                 R.string.power_cpu,
-                R.drawable.ic_power_system);
+                R.drawable.ic_settings_cpu);
         assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
                 R.string.power_bluetooth,
                 R.drawable.ic_settings_bluetooth);
@@ -331,13 +331,13 @@ public class BatteryEntryTest {
                 R.drawable.ic_settings_camera);
         assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT,
                 R.string.power_flashlight,
-                R.drawable.ic_settings_display);
+                R.drawable.ic_settings_flashlight);
         assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO,
                 R.string.power_cell,
-                R.drawable.ic_cellular_1_bar);
+                R.drawable.ic_settings_cellular);
         assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_GNSS,
                 R.string.power_gps,
-                R.drawable.ic_power_system);
+                R.drawable.ic_settings_gps);
         assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_WIFI,
                 R.string.power_wifi,
                 R.drawable.ic_settings_wireless_no_theme);