diff --git a/app/build.gradle b/app/build.gradle
index eda6a834c..c13674861 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     compile 'com.android.support:support-v4:23.2.1'
     compile 'com.android.support:appcompat-v7:23.2.1'
     compile 'com.android.support:design:23.2.1'
-    compile 'com.android.support:preference-v7:23.2.1'
+    compile 'com.android.support:preference-v14:23.2.1'
     compile 'com.github.paolorotolo:appintro:3.4.0'
     compile 'org.apmem.tools:layouts:1.10@aar'
     compile 'com.opencsv:opencsv:3.7'
diff --git a/app/src/main/java/org/isoron/uhabits/AboutActivity.java b/app/src/main/java/org/isoron/uhabits/AboutActivity.java
index ec1be869b..279a96d45 100644
--- a/app/src/main/java/org/isoron/uhabits/AboutActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/AboutActivity.java
@@ -20,15 +20,11 @@
 package org.isoron.uhabits;
 
 import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
 import android.view.View;
 import android.widget.TextView;
 
-import org.isoron.uhabits.helpers.ColorHelper;
 import org.isoron.uhabits.helpers.UIHelper;
 
 public class AboutActivity extends BaseActivity implements View.OnClickListener
@@ -42,14 +38,8 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
         setContentView(R.layout.about);
         setupSupportActionBar(true);
 
-        if (android.os.Build.VERSION.SDK_INT >= 21 && !UIHelper.isNightMode())
-        {
-            int color = UIHelper.getStyledColor(this, R.attr.aboutScreenColor);
-            int darkerColor = ColorHelper.mixColors(color, Color.BLACK, 0.75f);
-            ActionBar actionBar = getSupportActionBar();
-            if(actionBar != null) actionBar.setBackgroundDrawable(new ColorDrawable(color));
-            getWindow().setStatusBarColor(darkerColor);
-        }
+        int color = UIHelper.getStyledColor(this, R.attr.aboutScreenColor);
+        setupActionBarColor(color);
 
         TextView tvVersion = (TextView) findViewById(R.id.tvVersion);
         TextView tvRate = (TextView) findViewById(R.id.tvRate);
diff --git a/app/src/main/java/org/isoron/uhabits/BaseActivity.java b/app/src/main/java/org/isoron/uhabits/BaseActivity.java
index e2ff85c67..7f0e2f797 100644
--- a/app/src/main/java/org/isoron/uhabits/BaseActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/BaseActivity.java
@@ -20,6 +20,8 @@
 package org.isoron.uhabits;
 
 import android.app.backup.BackupManager;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -29,6 +31,7 @@ import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
 import org.isoron.uhabits.commands.Command;
+import org.isoron.uhabits.helpers.ColorHelper;
 import org.isoron.uhabits.helpers.UIHelper;
 
 import java.util.LinkedList;
@@ -162,4 +165,21 @@ abstract public class BaseActivity extends AppCompatActivity implements Thread.U
         else
             System.exit(1);
     }
+
+    protected void setupActionBarColor(int color)
+    {
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar == null) return;
+
+        if (!UIHelper.getStyledBoolean(this, R.attr.useHabitColorAsPrimary)) return;
+
+        ColorDrawable drawable = new ColorDrawable(color);
+        actionBar.setBackgroundDrawable(drawable);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+        {
+            int darkerColor = ColorHelper.mixColors(color, Color.BLACK, 0.75f);
+            getWindow().setStatusBarColor(darkerColor);
+        }
+    }
 }
diff --git a/app/src/main/java/org/isoron/uhabits/SettingsActivity.java b/app/src/main/java/org/isoron/uhabits/SettingsActivity.java
index 1702a44c6..579e7a7a6 100644
--- a/app/src/main/java/org/isoron/uhabits/SettingsActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/SettingsActivity.java
@@ -21,6 +21,8 @@ package org.isoron.uhabits;
 
 import android.os.Bundle;
 
+import org.isoron.uhabits.helpers.UIHelper;
+
 public class SettingsActivity extends BaseActivity
 {
     @Override
@@ -29,5 +31,8 @@ public class SettingsActivity extends BaseActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.settings_activity);
         setupSupportActionBar(true);
+
+        int color = UIHelper.getStyledColor(this, R.attr.aboutScreenColor);
+        setupActionBarColor(color);
     }
 }
diff --git a/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java b/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java
index d72ed67a8..8be54b586 100644
--- a/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java
@@ -20,15 +20,11 @@
 package org.isoron.uhabits;
 
 import android.content.ContentUris;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 
 import org.isoron.uhabits.helpers.ColorHelper;
-import org.isoron.uhabits.helpers.UIHelper;
 import org.isoron.uhabits.models.Habit;
 
 public class ShowHabitActivity extends BaseActivity
@@ -58,17 +54,7 @@ public class ShowHabitActivity extends BaseActivity
 
         actionBar.setTitle(habit.name);
 
-        if (!UIHelper.getStyledBoolean(this, R.attr.useHabitColorAsPrimary)) return;
-
-        int color = ColorHelper.getColor(this, habit.color);
-        ColorDrawable drawable = new ColorDrawable(color);
-        actionBar.setBackgroundDrawable(drawable);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-        {
-            int darkerColor = ColorHelper.mixColors(color, Color.BLACK, 0.75f);
-            getWindow().setStatusBarColor(darkerColor);
-        }
+        setupActionBarColor(ColorHelper.getColor(this, habit.color));
     }
 
     public Habit getHabit()
diff --git a/app/src/main/java/org/isoron/uhabits/fragments/SettingsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/SettingsFragment.java
index 0c4491b34..7679a3c71 100644
--- a/app/src/main/java/org/isoron/uhabits/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/SettingsFragment.java
@@ -22,15 +22,15 @@ package org.isoron.uhabits.fragments;
 import android.app.backup.BackupManager;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceFragmentCompat;
 
 import org.isoron.uhabits.MainActivity;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.helpers.UIHelper;
 
-public class SettingsFragment extends PreferenceFragment
+public class SettingsFragment extends PreferenceFragmentCompat
         implements SharedPreferences.OnSharedPreferenceChangeListener
 {
     @Override
@@ -48,6 +48,12 @@ public class SettingsFragment extends PreferenceFragment
             removePreference("translate", "linksCategory");
     }
 
+    @Override
+    public void onCreatePreferences(Bundle bundle, String s)
+    {
+
+    }
+
     private void removePreference(String preferenceKey, String categoryKey)
     {
         PreferenceCategory cat = (PreferenceCategory) findPreference(categoryKey);
diff --git a/app/src/main/res/layout/preference_category_custom.xml b/app/src/main/res/layout/preference_category_custom.xml
new file mode 100644
index 000000000..5b1e58947
--- /dev/null
+++ b/app/src/main/res/layout/preference_category_custom.xml
@@ -0,0 +1,26 @@
+<?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
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/title"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="0dip"
+          android:textColor="?aboutScreenColor"
+          android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+          android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
+          android:paddingTop="8dip" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 281275c0c..4128ac50f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,6 +19,7 @@
 
 <resources>
     <style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:dialogTheme">@style/MyDialogStyle</item>
         <item name="android:alertDialogTheme">@style/MyDialogStyle</item>
@@ -30,6 +31,7 @@
 
         <item name="colorPrimary">@color/blue_grey_800</item>
         <item name="colorPrimaryDark">@color/blue_grey_900</item>
+        <item name="colorAccent">?aboutScreenColor</item>
         <item name="cardBackgroundColor">@color/grey_50</item>
         <item name="windowBackgroundColor">@color/grey_200</item>
         <item name="headerBackgroundColor">@color/grey_200</item>
@@ -56,10 +58,11 @@
         <item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
-        <item name="aboutScreenColor">@color/blue_700</item>
+        <item name="aboutScreenColor">@color/blue_800</item>
     </style>
 
     <style name="AppBaseThemeDark" parent="@style/Theme.AppCompat.NoActionBar">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:dialogTheme">@style/MyDialogStyleDark</item>
         <item name="android:alertDialogTheme">@style/MyDialogStyleDark</item>
@@ -70,6 +73,7 @@
 
         <item name="colorPrimary">@color/grey_950</item>
         <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorAccent">?aboutScreenColor</item>
         <item name="cardBackgroundColor">@color/grey_850</item>
         <item name="windowBackgroundColor">@color/grey_900</item>
         <item name="headerBackgroundColor">@color/grey_900</item>
@@ -215,5 +219,7 @@
         <item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
     </style>
 
-
+    <style name="Preference.Category.Material">
+        <item name="android:layout">@layout/preference_category_custom</item>
+    </style>
 </resources>