diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml
index 3ceffde2d9acbdef41c9e7ff073c2c94ce99c159..627fc48c4e964c786d233d383fcdd0cbace5eede 100644
--- a/res/drawable/quantum_ic_add_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_add_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml
index 955f7912485b489357222a9081800bc13b92bf6f..3809f5c35c65cd3f3ef71501a0a9be02b45697fe 100644
--- a/res/drawable/quantum_ic_close_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_close_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml
index fdb88f3b93c7dd2d96d64daf38cd8dd7033ffc96..5b5d7b76eb541cf4a3bbcbe7fec616d8b32a2302 100644
--- a/res/drawable/quantum_ic_menu_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml
index 6e9da640e287a26d99e812ea7a0c390938211a6e..03dcbaa98b0f3021b3e14d4d28af245684c0a7a0 100644
--- a/res/drawable/quantum_ic_search_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_search_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
diff --git a/res/layout/contact_list_filter_item.xml b/res/layout/contact_list_filter_item.xml
index 637b2246ab851f3544323c19e5aa837696e16643..81981e4ca56ffb9680440930dc1f6f429491d9f4 100644
--- a/res/layout/contact_list_filter_item.xml
+++ b/res/layout/contact_list_filter_item.xml
@@ -61,7 +61,7 @@
     </LinearLayout>
 
     <RadioButton
-        android:buttonTint="@color/color_default_blue1"
+        android:buttonTint="@color/accent"
         android:id="@+id/radioButton"
         android:clickable="false"
         android:layout_width="wrap_content"
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index e630f034a309c51b4a6e471b22fb9f0c4bfca6fd..f16a321554b888a58983e3d4c49beacdaa19eeef 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -30,7 +30,7 @@
         android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
-        android:tint="@color/color_default_blue1" />
+        android:tint="@color/accent" />
 
     <android.widget.AutoCompleteTextView
         android:id="@+id/search_view"
@@ -42,7 +42,6 @@
         android:fontFamily="@string/search_font_family"
         android:textColor="@color/searchbox_text_color"
         android:textColorHint="@color/searchbox_hint_text_color"
-        android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
         android:background="@null"
         android:inputType="textFilter"
         android:singleLine="true"
@@ -54,7 +53,7 @@
         android:layout_width="@dimen/search_box_close_icon_size"
         android:padding="@dimen/search_box_close_icon_padding"
         android:src="@drawable/quantum_ic_close_vd_theme_24"
-        android:tint="@color/color_default_blue1"
+        android:tint="@color/accent"
         android:clickable="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_clear_search" />
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index c1a0424d12c8804bf48904f727a2fe6c2222446e..0b7f53578575a4a1a806eac61b9b70b438c567bc 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -18,12 +18,12 @@
     xmlns:app="http://schemas.android.com/tools">
 
     <item
-        app:itemIconTint="@color/color_default_blue1"
+        app:itemIconTint="@color/accent"
         android:id="@+id/menu_search"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
         contacts:showAsAction="ifRoom"
-        app:iconTint="@color/color_default_blue1"
+        app:iconTint="@color/accent"
         />
 
     <item
diff --git a/res/menu/search_menu.xml b/res/menu/search_menu.xml
index c715c16ad4cb76c7a182b868d7d92a220de194a8..a530cc34bce708f8fd38e3c91bcfee9913b49f4c 100644
--- a/res/menu/search_menu.xml
+++ b/res/menu/search_menu.xml
@@ -17,9 +17,9 @@
     xmlns:contacts="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/tools">
     <item
-        app:itemIconTint="@color/color_default_blue1"
+        app:itemIconTint="@color/accent"
         android:id="@+id/menu_search"
-        app:iconTint="@color/color_default_blue1"
+        app:iconTint="@color/accent"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
         contacts:showAsAction="always" />
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index a5ed0de5afa668d36f2e595df6a75cae4490f56c..5c25afdce8a7d3a97a30827946769a8b439e82a0 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -13,7 +13,7 @@
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
         <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
         <item name="list_section_header_height">24dip</item>
@@ -57,8 +57,7 @@
     </style>
 
     <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_blue1</item>
-
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -82,8 +81,8 @@
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
         <item name="android:colorPrimary">@color/primary_color</item>
         <item name="colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
-        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/accent</item>        
+        <item name="colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6ebfe51826a6320adb1ab6da9e3c5c7bfa571dc3..88b4be8f12d2975a2ec58c7ae7beaca6e9bc9b3f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -30,9 +30,8 @@
 
     <color name="action_bar_background">#2a56c6</color>
 
-
     <color name="nav_item_selected_background">#0f000000</color>
-    <color name="action_bar_button_text_color">@color/color_default_blue1</color>
+    <color name="action_bar_button_text_color">@color/accent</color>
     <color name="action_bar_button_menu_color">#ffffff</color>
 
     <color name="actionbar_background_color">@color/primary_color</color>
@@ -44,7 +43,6 @@
     <color name="primary_color_dark">@lineageos.platform:color/color_default_primary</color>
     <color name="primary_color">@lineageos.platform:color/color_default_primary_dark</color>
 
-
     <color name="group_primary_color_dark">#546E7A</color>
     <color name="group_primary_color">#607D8B</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 10c48df8df258a95b019c8180821a157383d55a3..4f7511f14a474b05d80c6742713e061103bbd871 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,17 +20,6 @@
         <item name="actionBarStyle">@style/EditorActionBarStyle</item>
         <item name="colorButtonNormal">@color/background_primary</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="android:editTextStyle">@style/myEditText</item>
-    </style>
-    <style name="myEditText" parent="@android:style/Widget.Holo.Light.EditText">
-        <item name="android:textCursorDrawable">@color/color_default_blue1</item>
-        <item name="android:colorControlNormal">@color/color_default_secondary_text</item>
-        <item name="colorControlNormal">@color/color_default_secondary_text</item>
-        <item name="android:colorControlActivated">@color/color_default_blue1</item>
-        <item name="colorControlActivated">@color/color_default_blue1</item>
-        <item name="android:colorControlHighlight">@color/color_default_blue1</item>
-        <item name="colorControlHighlight">@color/color_default_blue1</item>
     </style>
 
     <style name="Theme.QuickContact" parent="@style/PeopleTheme">
@@ -43,7 +32,7 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
         <!-- We need to use a light ripple behind ActionBar items in order for them to
              be visible when using some of the darker ActionBar tints -->
         <item name="android:actionBarItemBackground">
@@ -63,7 +52,7 @@
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
         <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
         <item name="list_section_header_height">24dip</item>
@@ -108,7 +97,7 @@
         <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
     </style>
     <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -138,8 +127,8 @@
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
         <item name="android:colorPrimary">@color/primary_color</item>
         <item name="colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
@@ -198,8 +187,8 @@
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
-        <item name="color">@color/color_default_blue1</item>
-        <item name="android:color">@color/color_default_blue1</item>
+        <item name="color">@color/accent</item>
+        <item name="android:color">@color/accent</item>
     </style>
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
@@ -240,8 +229,7 @@
         <item name="android:titleTextAppearance">@style/ContactsActionBarTitleTextAppCompat</item>
         <item name="titleTextAppearance">@style/ContactsActionBarTitleTextAppCompat</item>
         <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
-        <item name="android:tint">@color/color_default_blue1</item>
-
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="LightToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
@@ -263,7 +251,7 @@
     <style name="ContactsActionBarTitleText"
         parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
         <item name="android:textSize">20dp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
     </style>
 
     <style name="ContactsActionBarTitleTextAppCompat" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
@@ -272,7 +260,7 @@
     </style>
 
     <style name="ContactsActionBarTitleTextBlack" parent="@style/ContactsActionBarTitleTextAppCompat">
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
     </style>
 
     <!-- Action bar overflow menu icon. -->
@@ -284,7 +272,7 @@
 
     <!-- Toolbar navigation button. -->
     <style name="ContactToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="android:tint">@color/action_bar_button_text_color</item>
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="ContactPickerTheme" parent="PeopleActivityTheme">
@@ -297,8 +285,8 @@
     <style name="ContactListFilterTheme" parent="@style/PeopleTheme">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>
-        <item name="android:colorControlNormal">@color/color_default_blue1</item>
-        <item name="android:textColorSecondary">@color/color_default_blue1</item>
+        <item name="android:colorControlNormal">@color/accent</item>
+        <item name="android:textColorSecondary">@color/accent</item>
 
     </style>
 
@@ -317,7 +305,7 @@
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
     </style>
 
     <style name="SelectableItem" parent="@android:style/Theme.Material.Light">
@@ -360,12 +348,12 @@
     <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
         since the Alert dialog is private. They are identical anyway. -->
     <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
     </style>
 
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="colorAccent">@color/accent</item>
     </style>
 
     <style name="EditKindIconStyle">
@@ -417,7 +405,7 @@
     <!-- Button style for main contacts no account empty view. -->
     <style name="NoAccountViewButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -425,7 +413,7 @@
     <!-- Add contacts button style for empty states. -->
     <style name="AddContactsButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -482,7 +470,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
      make margin between the button and screen edge 16dp -->
     <style name="FilterActionButtonStyle" parent="@android:Widget.ActionButton">
         <item name="android:minWidth">@dimen/contact_filter_action_button_width</item>
-        <item name="android:textColor">@color/actionbar_text_color</item>
+        <item name="android:textColor">@color/accent</item>
     </style>
 
     <style name="CustomContactListFilterView" parent="ContactListFilterTheme">