diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index dc4c1eb7cc9204ee8755618106ad8ddb3388ea65..653ce027935b7c1b1f43eab652b3b8aa15610198 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -261,7 +261,7 @@ public class DataUsageSummaryPreference extends Preference {
                         TextUtils.expandTemplate(getContext().getText(R.string.data_remaining),
                                 DataUsageUtils.formatDataUsage(getContext(), dataRemaining)));
                 usageRemainingField.setTextColor(
-                        Utils.getColorAttr(getContext(), R.color.color_default_accent));
+                        Utils.getColorAttr(getContext(), android.R.attr.colorAccent));
             } else {
                 usageRemainingField.setText(
                         TextUtils.expandTemplate(getContext().getText(R.string.data_overusage),
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 32883bac7fd33fbf2519ed2cf80e82cec6569fb8..8b47046655cfcb5311891b1e56fe0ff2f9e61292 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -59,7 +59,7 @@ public class StorageVolumePreference extends Preference {
 
         mStorageManager = context.getSystemService(StorageManager.class);
         mVolume = volume;
-        mColorTintList = Utils.getColorAttr(context, R.color.color_default_accent);
+        mColorTintList = Utils.getColorAttr(context, android.R.attr.colorAccent);
 
         setLayoutResource(R.layout.storage_volume);
 
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index 6d5f8d3a28fb057fcaab25ddaf14ca7c15b78358..01b5e8d0d7e800f916b4978863d89f184b5bf2d1 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -132,7 +132,7 @@ public class UserProfileController extends AbstractPreferenceController implemen
 
     private static Drawable applyTint(Context context, Drawable icon) {
         icon = icon.mutate();
-        icon.setTintList(Utils.getColorAttr(context, R.color.color_default_accent));
+        icon.setTintList(Utils.getColorAttr(context, android.R.attr.colorAccent));
         return icon;
     }
 
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index dd993fa553f3480274fbb5b17943ce92e0cc3d1d..2806caab96d0df319fb7b28d7a4ee8f29cf3a7c4 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -539,7 +539,7 @@ public class MobileNetworkUtils {
         // Set the signal strength icon at the bottom right
         icons.setLayerGravity(1 /* index of SignalDrawable */, Gravity.BOTTOM | Gravity.RIGHT);
         icons.setLayerSize(1 /* index of SignalDrawable */, iconSize, iconSize);
-        icons.setTintList(Utils.getColorAttr(context, R.color.color_default_accent));
+        icons.setTintList(Utils.getColorAttr(context, android.R.attr.colorAccent));
         return icons;
     }
 
diff --git a/src/com/android/settings/notification/ImportancePreference.java b/src/com/android/settings/notification/ImportancePreference.java
index 7cca2bc86c42f35e5b5683ff60ade3c2dd377788..702a278cd7a3963c72ab331d14f1fac70bd4606a 100644
--- a/src/com/android/settings/notification/ImportancePreference.java
+++ b/src/com/android/settings/notification/ImportancePreference.java
@@ -155,11 +155,11 @@ public class ImportancePreference extends Preference {
     }
 
     private ColorStateList getAccentTint() {
-        return Utils.getColorAttr(getContext(), com.android.settings.R.color.color_default_accent);
+        return Utils.getColorAttr(getContext(), android.R.attr.colorAccent);
     }
 
     private ColorStateList getRegularTint() {
-        return Utils.getColorAttr(getContext(), com.android.settings.R.color.color_default_primary_text);
+        return Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary);
     }
 
     void setImportanceSummary(ViewGroup parent, int importance, boolean fromUser) {
diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
index 62ea975ce102f2daa183f11bb5893af0a09338d1..bb43a16bc775b0c3043716127ad21b5b12c60b0a 100644
--- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
+++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
@@ -206,7 +206,7 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
         try {
             icon = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
                     .loadIcon(mPackageManager);
-            icon.setTintList(Utils.getColorAttr(mContext, R.color.color_default_secondary_text));
+            icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
         } catch (PackageManager.NameNotFoundException e) {
             Log.w(TAG, "Cannot find group icon for " + permissionGroup, e);
         }
diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index 9163a97f1f519555c60e3d134a3ab8f3b70f68c5..a5d4157818c2e4251913d752ef24d12f1e1b0bd4 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -177,7 +177,7 @@ public class SimListDialogFragment extends SimDialogFragment implements
                 summary.setText("");
                 icon.setImageDrawable(mContext.getDrawable(R.drawable.ic_feedback_24dp));
                 icon.setImageTintList(
-                        Utils.getColorAttr(mContext, R.color.color_default_secondary_text));
+                        Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
             } else {
                 title.setText(sub.getDisplayName());
                 summary.setText(isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : "");
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index 9c5db4b754f9586beee3f30feaa660a8a36bb102..93a81001bd4de1668b8bee5d61fea03e8db0ce7f 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -400,7 +400,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
                 final Drawable drawable = getContext().getDrawable(
                         Utils.getWifiIconResource(level));
                 drawable.setTintList(
-                        Utils.getColorAttr(getContext(), R.color.color_default_accent));
+                        Utils.getColorAttr(getContext(), android.R.attr.colorAccent));
                 imageView.setImageDrawable(drawable);
             }