diff --git a/res/drawable-hdpi/ic_settings_cell_standby.png b/res/drawable-hdpi/ic_settings_cell_standby.png
deleted file mode 100644
index 7d51c80be12..00000000000
Binary files a/res/drawable-hdpi/ic_settings_cell_standby.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_settings_development_alpha.png b/res/drawable-hdpi/ic_settings_development_alpha.png
deleted file mode 100644
index 44cfb57f75d..00000000000
Binary files a/res/drawable-hdpi/ic_settings_development_alpha.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 0a714167e56..00000000000
Binary files a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_sync_grey_holo.png b/res/drawable-hdpi/ic_sync_grey_holo.png
deleted file mode 100644
index ff927e9372d..00000000000
Binary files a/res/drawable-hdpi/ic_sync_grey_holo.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_sync_red_holo.png b/res/drawable-hdpi/ic_sync_red_holo.png
deleted file mode 100644
index f7949ae5674..00000000000
Binary files a/res/drawable-hdpi/ic_sync_red_holo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_settings_cell_standby.png b/res/drawable-mdpi/ic_settings_cell_standby.png
deleted file mode 100644
index c922222297a..00000000000
Binary files a/res/drawable-mdpi/ic_settings_cell_standby.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_settings_development_alpha.png b/res/drawable-mdpi/ic_settings_development_alpha.png
deleted file mode 100644
index cdc3ffe5edf..00000000000
Binary files a/res/drawable-mdpi/ic_settings_development_alpha.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 1a66a300450..00000000000
Binary files a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_sync_grey_holo.png b/res/drawable-mdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 822fa20b404..00000000000
Binary files a/res/drawable-mdpi/ic_sync_grey_holo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_sync_red_holo.png b/res/drawable-mdpi/ic_sync_red_holo.png
deleted file mode 100644
index 2fd7ae1ff01..00000000000
Binary files a/res/drawable-mdpi/ic_sync_red_holo.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_settings_cell_standby.png b/res/drawable-xhdpi/ic_settings_cell_standby.png
deleted file mode 100644
index a02b5a22c08..00000000000
Binary files a/res/drawable-xhdpi/ic_settings_cell_standby.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_settings_development_alpha.png b/res/drawable-xhdpi/ic_settings_development_alpha.png
deleted file mode 100644
index 3a4b3d9b06c..00000000000
Binary files a/res/drawable-xhdpi/ic_settings_development_alpha.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 9aa2fd2e605..00000000000
Binary files a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_sync_grey_holo.png b/res/drawable-xhdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 9b4662c6f97..00000000000
Binary files a/res/drawable-xhdpi/ic_sync_grey_holo.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_sync_red_holo.png b/res/drawable-xhdpi/ic_sync_red_holo.png
deleted file mode 100644
index a9e2b8cd1c5..00000000000
Binary files a/res/drawable-xhdpi/ic_sync_red_holo.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_settings_cell_standby.png b/res/drawable-xxhdpi/ic_settings_cell_standby.png
deleted file mode 100644
index 07d5c85757f..00000000000
Binary files a/res/drawable-xxhdpi/ic_settings_cell_standby.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_settings_development_alpha.png b/res/drawable-xxhdpi/ic_settings_development_alpha.png
deleted file mode 100644
index fc230845397..00000000000
Binary files a/res/drawable-xxhdpi/ic_settings_development_alpha.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 6e0924897c4..00000000000
Binary files a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_sync_grey_holo.png b/res/drawable-xxhdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 3b933bea1cd..00000000000
Binary files a/res/drawable-xxhdpi/ic_sync_grey_holo.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_sync_red_holo.png b/res/drawable-xxhdpi/ic_sync_red_holo.png
deleted file mode 100644
index 9144709199c..00000000000
Binary files a/res/drawable-xxhdpi/ic_sync_red_holo.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_settings_cell_standby.png b/res/drawable-xxxhdpi/ic_settings_cell_standby.png
deleted file mode 100644
index 3c864ce4f23..00000000000
Binary files a/res/drawable-xxxhdpi/ic_settings_cell_standby.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_settings_development_alpha.png b/res/drawable-xxxhdpi/ic_settings_development_alpha.png
deleted file mode 100644
index 47f454791ce..00000000000
Binary files a/res/drawable-xxxhdpi/ic_settings_development_alpha.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 6c29a53c977..00000000000
Binary files a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_sync_grey_holo.png b/res/drawable-xxxhdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 7cff1029f11..00000000000
Binary files a/res/drawable-xxxhdpi/ic_sync_grey_holo.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_sync_red_holo.png b/res/drawable-xxxhdpi/ic_sync_red_holo.png
deleted file mode 100644
index 115bb7aa478..00000000000
Binary files a/res/drawable-xxxhdpi/ic_sync_red_holo.png and /dev/null differ
diff --git a/res/drawable/ic_settings_cell_standby.xml b/res/drawable/ic_settings_cell_standby.xml
new file mode 100644
index 00000000000..5a9a300f021
--- /dev/null
+++ b/res/drawable/ic_settings_cell_standby.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 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="?android:attr/colorControlNormal">
+    <path
+        android:pathData="m11.986,12.0357c5.4299,-5.4312 9.9013,-9.875 9.9363,-9.875 0.035,0 0.0637,4.4437 0.0637,9.875v9.875L12.0497,21.9107 2.1134,21.9107ZM19.986,13.3522L19.986,6.7936l-3,2.9922 -3,2.9922v3.5664,3.5664h3,3z"
+        android:strokeWidth="0.25"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_development.xml b/res/drawable/ic_settings_development.xml
index 211b3a2e2ed..a6577b425cc 100644
--- a/res/drawable/ic_settings_development.xml
+++ b/res/drawable/ic_settings_development.xml
@@ -15,7 +15,14 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_settings_development_alpha"
-    android:tint="?android:attr/colorControlNormal" />
-
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="m4.3301,20.7553c-0.9663,-0.9663 -0.9968,-1.0933 -0.9968,-4.1483 0,-3.2625 -0.1683,-3.7057 -1.5,-3.9507C0.6808,12.4444 0.8254,11.2374 2.0688,10.6903l1.0978,-0.483 0.1667,-3.2801c0.1577,-3.1043 0.218,-3.3242 1.1232,-4.1016 1.1668,-1.0022 2.7101,-0.9771 2.7101,0.0439 0,0.3936 -0.3717,0.8403 -0.9167,1.1015 -0.8964,0.4296 -0.9167,0.5037 -0.9167,3.347 0,2.0922 -0.1455,3.1154 -0.5189,3.6485 -0.4696,0.6705 -0.4696,0.8112 0,1.4817 0.3796,0.542 0.5189,1.5755 0.5189,3.8507v3.1098l1.0181,0.3549c0.7672,0.2674 0.9931,0.5301 0.9167,1.066 -0.1664,1.1666 -1.7368,1.127 -2.9379,-0.0742zM16.8889,21.485c-0.5444,-0.5444 -0.1586,-1.4014 0.7778,-1.7278l1,-0.3486v-3.1098c0,-2.2752 0.1393,-3.3087 0.5189,-3.8507 0.4696,-0.6705 0.4696,-0.8112 0,-1.4817 -0.3734,-0.5331 -0.5189,-1.5563 -0.5189,-3.6485 0,-2.8432 -0.0203,-2.9174 -0.9167,-3.347 -0.5449,-0.2612 -0.9167,-0.7079 -0.9167,-1.1015 0,-1.0211 1.5433,-1.0461 2.7101,-0.0439 0.9052,0.7775 0.9655,0.9974 1.1232,4.1016l0.1667,3.2801 1.0978,0.483c1.2434,0.5471 1.388,1.7541 0.2355,1.9661 -1.3317,0.2449 -1.5,0.6881 -1.5,3.9507 0,3.0388 -0.0349,3.1863 -0.9744,4.1259 -0.9044,0.9044 -2.2817,1.2739 -2.8034,0.7521z"
+        android:strokeWidth="0.33333334"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_nfc_payment.xml b/res/drawable/ic_settings_nfc_payment.xml
index 555a6b4f1d2..f7fb28845b5 100644
--- a/res/drawable/ic_settings_nfc_payment.xml
+++ b/res/drawable/ic_settings_nfc_payment.xml
@@ -14,9 +14,16 @@
      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="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M4.7422,21.6746C4.6047,21.6205 4.1754,21.5061 3.7882,21.4204 2.4797,21.1309 2.3672,20.3896 2.3672,12.0568c0,-4.1205 0.1047,-7.7672 0.2328,-8.104 0.3419,-0.8993 2.1763,-1.2692 5.5101,-1.1111 2.904,0.1376 3.6549,0.3894 4.0191,1.3473 0.3107,0.8173 0.3107,15.3698 0,16.187 -0.1309,0.3443 -0.4965,0.7667 -0.8125,0.9385 -0.5355,0.2912 -5.9905,0.59 -6.5745,0.3601zM7.7422,20.2791c0,-0.5359 -0.7264,-0.4585 -0.8318,0.0886 -0.0643,0.3341 0.0375,0.4359 0.3716,0.3716 0.2531,-0.0487 0.4602,-0.2558 0.4602,-0.4602zM11.6172,11.5325v-6.5h-4.25,-4.25v6.5,6.5h4.25,4.25zM19.8405,17.0325c-0.3665,-0.2142 -0.3618,-0.3503 0.0543,-1.5549 0.596,-1.7254 0.5957,-4.4158 -0.0008,-6.1426C19.4486,8.0455 19.449,8.0063 19.9096,7.7597c0.4018,-0.215 0.5258,-0.1249 0.8301,0.6034 0.9392,2.2477 0.941,5.8365 0.0042,8.0787 -0.3921,0.9385 -0.3526,0.9127 -0.9034,0.5907zM17.4039,15.5602c-0.2801,-0.1773 -0.2823,-0.3164 -0.0128,-0.8084 0.4184,-0.7639 0.4225,-3.9174 0.0061,-4.6773 -0.2754,-0.5026 -0.2564,-0.63 0.1378,-0.9241 0.4109,-0.3066 0.492,-0.2601 0.8001,0.458 0.5034,1.1735 0.6184,3.6213 0.2304,4.9051 -0.3526,1.1669 -0.608,1.3971 -1.1615,1.0467zM15.0728,14.2726c-0.3388,-0.1977 -0.3753,-0.3984 -0.1901,-1.0443 0.1384,-0.4825 0.139,-1.1267 0.0016,-1.6244 -0.1944,-0.7041 -0.1543,-0.8642 0.274,-1.0934 0.276,-0.1477 0.5582,-0.2121 0.6272,-0.1431 0.2664,0.2664 0.5519,2.0703 0.4219,2.6651 -0.3596,1.6447 -0.388,1.6757 -1.1346,1.2401z"
+        android:strokeWidth="0.25"
+        android:fillColor="#000000"/>
+</vector>
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_settings_nfc_payment_am_alpha"
-    android:tint="?android:attr/colorControlNormal"
-    android:autoMirrored="true" />
 
diff --git a/res/drawable/ic_settings_sync_disabled.xml b/res/drawable/ic_settings_sync_disabled.xml
new file mode 100644
index 00000000000..7dd71c7f9e6
--- /dev/null
+++ b/res/drawable/ic_settings_sync_disabled.xml
@@ -0,0 +1,27 @@
+<!--
+    Copyright (C) 2019 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="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.78,22.61l-3.72,-3.72c-0.92,0.54 -1.95,0.91 -3.05,1.05v-2.02c0.56,-0.09 1.08,-0.28 1.57,-0.52L6.6,9.43c-0.38,0.78 -0.6,1.65 -0.6,2.57 0,2.22 1.21,4.15 3,5.19L9,14h2v6L5,20v-2h1.74C5.07,16.54 4,14.4 4,12c0,-1.48 0.41,-2.86 1.12,-4.05L1.39,4.22 2.8,2.81l18.38,18.38 -1.4,1.42zM15,6.81c1.79,1.04 3,2.97 3,5.19 0,0.92 -0.23,1.79 -0.6,2.57l1.49,1.49C19.59,14.87 20,13.48 20,12c0,-2.4 -1.07,-4.54 -2.74,-6L19,6L19,4h-6v6h2L15,6.81zM11,6.09L11,4.07c-1.11,0.14 -2.14,0.51 -3.05,1.05l1.49,1.49c0.49,-0.24 1.01,-0.43 1.56,-0.52z"/>
+</vector>
+
diff --git a/res/drawable/ic_settings_sync_failed.xml b/res/drawable/ic_settings_sync_failed.xml
new file mode 100644
index 00000000000..8cb128a67c7
--- /dev/null
+++ b/res/drawable/ic_settings_sync_failed.xml
@@ -0,0 +1,27 @@
+<!--
+    Copyright (C) 2019 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="?android:attr/colorError">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,4.07v2.02C8.17,6.57 6,9.03 6,12c0,2.22 1.21,4.15 3,5.19L9,14h2v6L5,20v-2h1.74C5.07,16.54 4,14.4 4,12c0,-4.08 3.05,-7.44 7,-7.93zM19.51,14.74c0.3,0.52 0.49,1.11 0.49,1.76 0,1.93 -1.57,3.5 -3.5,3.5 -0.65,0 -1.25,-0.19 -1.77,-0.49 -0.65,-0.38 -1.17,-0.96 -1.46,-1.67 -0.17,-0.41 -0.27,-0.87 -0.27,-1.34 0,-1.93 1.57,-3.5 3.5,-3.5 0.48,0 0.93,0.1 1.35,0.27 0.09,-0.41 0.15,-0.83 0.15,-1.27 0,-2.22 -1.21,-4.15 -3,-5.19L15,10h-2L13,4h6v2h-1.74C18.93,7.46 20,9.6 20,12c0,0.96 -0.18,1.89 -0.49,2.74zM17,18h-1v1h1v-1zM17,14h-1v3h1v-3z"/>
+</vector>
+
diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java
index eea31131256..c0da387fee3 100644
--- a/src/com/android/settings/accounts/AccountPreference.java
+++ b/src/com/android/settings/accounts/AccountPreference.java
@@ -125,13 +125,13 @@ public class AccountPreference extends Preference {
                 res = R.drawable.ic_settings_sync;
                 break;
             case SYNC_DISABLED:
-                res = R.drawable.ic_sync_grey_holo;
+                res = R.drawable.ic_settings_sync_disabled;
                 break;
             case SYNC_ERROR:
-                res = R.drawable.ic_sync_red_holo;
+                res = R.drawable.ic_settings_sync_failed;
                 break;
             default:
-                res = R.drawable.ic_sync_red_holo;
+                res = R.drawable.ic_settings_sync_failed;
                 Log.e(TAG, "Unknown sync status: " + status);
         }
         return res;