diff --git a/res/drawable-nodpi/fp_enrollment_header.png b/res/drawable-nodpi/fp_enrollment_header.png
deleted file mode 100644
index 4e7b9316309..00000000000
Binary files a/res/drawable-nodpi/fp_enrollment_header.png and /dev/null differ
diff --git a/res/values-land/colors.xml b/res/values-land/colors.xml
deleted file mode 100644
index 5bab9d13af7..00000000000
--- a/res/values-land/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<resources>
-    <drawable name="fp_enrollment_header">#009688</drawable>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 38ab8939b84..2fb96ec044e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -54,13 +54,11 @@
     <color name="running_processes_free_ram">#ffced7db</color>
 
     <color name="wifi_divider">#ffe0e0e0</color>
-    <color name="sim_noitification">@*android:color/material_deep_teal_500</color>
+    <color name="sim_noitification">@*android:color/accent_device_default_light</color>
 
     <color name="confirm_device_credential_transparent_black">#60000000</color>
     <color name="voice_interaction_highlight">#33b5e5</color>
 
-    <drawable name="fp_enrollment_header_landscape">#009688</drawable>
-
     <color name="memory_normal">#ff009587</color>
     <color name="memory_moderate">#ffF3B300</color>
     <color name="memory_low">#ffff9700</color>
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index d44f9f8b2f7..5003254bf12 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -363,7 +363,8 @@ public class BatteryHistoryChart extends View {
         mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
                 2, getResources().getDisplayMetrics());
 
-        mBatteryBackgroundPaint.setColor(0xFF009688);
+        int accentColor = Utils.getColorAccent(mContext);
+        mBatteryBackgroundPaint.setColor(accentColor);
         mBatteryBackgroundPaint.setStyle(Paint.Style.FILL);
         mBatteryGoodPaint.setARGB(128, 0, 128, 0);
         mBatteryGoodPaint.setStyle(Paint.Style.STROKE);
@@ -383,13 +384,13 @@ public class BatteryHistoryChart extends View {
         mPhoneSignalChart.setColors(com.android.settings.Utils.BADNESS_COLORS);
         mDebugRectPaint.setARGB(255, 255, 0, 0);
         mDebugRectPaint.setStyle(Paint.Style.STROKE);
-        mScreenOnPaint.setColor(0xFF009688);
-        mGpsOnPaint.setColor(0xFF009688);
-        mCameraOnPaint.setColor(0xFF009688);
-        mFlashlightOnPaint.setColor(0xFF009688);
-        mWifiRunningPaint.setColor(0xFF009688);
-        mCpuRunningPaint.setColor(0xFF009688);
-        mChargingPaint.setColor(0xFF009688);
+        mScreenOnPaint.setColor(accentColor);
+        mGpsOnPaint.setColor(accentColor);
+        mCameraOnPaint.setColor(accentColor);
+        mFlashlightOnPaint.setColor(accentColor);
+        mWifiRunningPaint.setColor(accentColor);
+        mCpuRunningPaint.setColor(accentColor);
+        mChargingPaint.setColor(accentColor);
 
         TypedArray a =
             context.obtainStyledAttributes(