From 7c6a63c8158a39c3813f3da761c2033e46e7cdc6 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Fri, 30 Jul 2021 15:38:02 +0000
Subject: [PATCH] Contacts: /e/ UI Dark Mode Implementation

---
 Android.bp                                    |   1 +
 AndroidManifest.xml                           |   4 +-
 res/drawable/fab_bg.xml                       |   2 +-
 res/drawable/ic_add_circle_24dp.xml           |   2 +-
 res/drawable/ic_add_contact_shortcut.xml      |   2 +-
 res/drawable/ic_work_profile.xml              |   2 +-
 .../item_background_material_dark.xml         |   2 +-
 .../quantum_ic_account_circle_vd_theme_24.xml |   4 +-
 res/drawable/quantum_ic_add_vd_theme_24.xml   |   4 +-
 .../quantum_ic_arrow_back_vd_theme_24.xml     |   4 +-
 ...antum_ic_arrow_back_white_vd_theme_24.xml} |  18 +-
 ...quantum_ic_arrow_drop_down_vd_theme_24.xml |   4 +-
 .../quantum_ic_assistant_vd_theme_24.xml      |   4 +-
 .../quantum_ic_business_vd_theme_24.xml       |   4 +-
 .../quantum_ic_call_received_vd_theme_24.xml  |   4 +-
 .../quantum_ic_camera_alt_vd_theme_24.xml     |   6 +-
 .../quantum_ic_cancel_vd_theme_24.xml         |   4 +-
 .../quantum_ic_circles_ext_vd_theme_24.xml    |   4 +-
 res/drawable/quantum_ic_close_vd_theme_24.xml |   4 +-
 .../quantum_ic_content_copy_vd_theme_24.xml   |   4 +-
 .../quantum_ic_create_vd_theme_24.xml         |   4 +-
 .../quantum_ic_create_white_vd_theme_24.xml   |  25 +++
 .../quantum_ic_delete_vd_theme_24.xml         |   4 +-
 .../quantum_ic_dialer_sip_vd_theme_24.xml     |   4 +-
 .../quantum_ic_directions_vd_theme_24.xml     |   4 +-
 res/drawable/quantum_ic_done_vd_theme_24.xml  |   4 +-
 .../quantum_ic_drawer_emergency_info_24.xml   |   4 +-
 res/drawable/quantum_ic_drawer_my_info_32.xml |   6 +-
 res/drawable/quantum_ic_email_vd_theme_24.xml |   4 +-
 res/drawable/quantum_ic_error_vd_theme_24.xml |   4 +-
 res/drawable/quantum_ic_event_vd_theme_24.xml |   4 +-
 .../quantum_ic_expand_less_vd_theme_24.xml    |   4 +-
 .../quantum_ic_expand_more_vd_theme_24.xml    |   4 +-
 .../quantum_ic_hangout_vd_theme_24.xml        |   4 +-
 .../quantum_ic_hangout_video_vd_theme_24.xml  |   4 +-
 res/drawable/quantum_ic_help_vd_theme_24.xml  |   4 +-
 .../quantum_ic_history_vd_theme_24.xml        |   4 +-
 .../quantum_ic_insert_comment_vd_theme_24.xml |   4 +-
 res/drawable/quantum_ic_label_vd_theme_24.xml |   4 +-
 res/drawable/quantum_ic_link_vd_theme_24.xml  |   4 +-
 res/drawable/quantum_ic_menu_vd_theme_24.xml  |   4 +-
 .../quantum_ic_message_vd_theme_24.xml        |   4 +-
 res/drawable/quantum_ic_mic_vd_theme_24.xml   |   4 +-
 .../quantum_ic_more_vert_vd_theme_24.xml      |   4 +-
 ...quantum_ic_more_vert_white_vd_theme_24.xml |  25 +++
 .../quantum_ic_perm_phone_msg_vd_theme_24.xml |   4 +-
 .../quantum_ic_person_add_vd_theme_24.xml     |   4 +-
 ...uantum_ic_person_add_white_vd_theme_24.xml |  25 +++
 .../quantum_ic_person_vd_theme_24.xml         |   4 +-
 res/drawable/quantum_ic_phone_vd_theme_24.xml |   4 +-
 res/drawable/quantum_ic_place_vd_theme_24.xml |   4 +-
 .../quantum_ic_public_vd_theme_24.xml         |   4 +-
 .../quantum_ic_search_vd_theme_24.xml         |   4 +-
 .../quantum_ic_settings_vd_theme_24.xml       |   4 +-
 res/drawable/quantum_ic_share_vd_theme_24.xml |   4 +-
 .../quantum_ic_sim_card_vd_theme_24.xml       |   4 +-
 .../quantum_ic_smartphone_vd_theme_24.xml     |   4 +-
 .../quantum_ic_star_border_vd_theme_24.xml    |   4 +-
 ...antum_ic_star_border_white_vd_theme_24.xml |  25 +++
 res/drawable/quantum_ic_star_vd_theme_24.xml  |   4 +-
 .../quantum_ic_star_white_vd_theme_24.xml     |  25 +++
 .../quantum_ic_videocam_vd_theme_24.xml       |   4 +-
 .../quantum_launchscreen_contacts.xml         |   2 +-
 res/layout-v23/edit_date_picker.xml           |   1 +
 res/layout-v23/edit_spinner.xml               |   2 +
 .../custom_contact_list_filter_group.xml      |   2 +-
 res/layout/custom_pref_layout.xml             |  54 ++++++
 res/layout/custom_settings_toolbar.xml        |  22 +++
 res/layout/date_picker.xml                    |   3 +-
 res/layout/default_account_checkbox.xml       |   2 +-
 res/layout/dialog_call_subject.xml            |   2 +-
 res/layout/dialog_title.xml                   |   5 +-
 res/layout/drawer_item.xml                    |   1 -
 res/layout/edit_date_picker.xml               |   1 +
 res/layout/edit_delete_button.xml             |   2 +-
 res/layout/edit_spinner.xml                   |   2 +
 res/layout/editor_account_header.xml          |   2 +-
 res/layout/floating_action_button.xml         |   2 +-
 res/layout/fragment_sim_import.xml            |   2 +-
 res/layout/name_edit_expansion_view.xml       |   2 +-
 ...quickcontact_collapsed_suggestion_card.xml |   2 +-
 res/layout/quickcontact_content.xml           |   2 +-
 .../quickcontact_title_and_phoneticname.xml   |   4 +-
 res/layout/selection_bar.xml                  |   4 +-
 res/layout/sim_import_list_item_disabled.xml  |   2 +-
 res/layout/structured_name_editor_view.xml    |   1 +
 res/menu/edit_contact.xml                     |   4 +-
 res/menu/people_options.xml                   |   9 +-
 res/values-night-v27/styles.xml               |  23 +++
 res/values-night/colors.xml                   |  12 --
 res/values-night/styles.xml                   |   4 +
 res/values-v27/styles.xml                     | 132 ++------------
 res/values/colors.xml                         | 114 ++++++------
 res/values/styles.xml                         | 168 ++++++++++++++----
 res/xml/preference_about.xml                  | 118 +++++++-----
 res/xml/preference_display_options.xml        |  74 +++++++-
 .../android/contacts/NonPhoneActivity.java    |   2 +-
 .../contacts/activities/ActionBarAdapter.java |   2 +-
 .../ContactEditorAccountsChangedActivity.java |   2 +-
 .../activities/ContactEditorActivity.java     |   8 -
 .../activities/ContactSelectionActivity.java  |  11 +-
 .../contacts/activities/LicenseActivity.java  |  40 ++++-
 .../contacts/activities/PeopleActivity.java   |  16 +-
 .../activities/ShowOrCreateActivity.java      |   2 +-
 .../contacts/detail/ContactDisplayUtils.java  |   4 +-
 .../contacts/dialog/ClearFrequentsDialog.java |   2 +-
 .../contacts/drawer/DrawerAdapter.java        |   8 +-
 .../editor/CancelEditDialogFragment.java      |   2 +-
 ...JoinContactConfirmationDialogFragment.java |   2 +-
 .../contacts/editor/LabeledEditorView.java    |   2 +-
 .../editor/PhotoSourceDialogFragment.java     |  33 ++--
 .../editor/PickRawContactDialogFragment.java  |   2 +-
 .../editor/SelectAccountDialogFragment.java   |   2 +-
 ...plitContactConfirmationDialogFragment.java |   2 +-
 ...gestionEditConfirmationDialogFragment.java |   2 +-
 .../contacts/editor/TextFieldsEditorView.java |   2 +
 .../group/GroupNameEditDialogFragment.java    |  75 ++++----
 .../ContactDeletionInteraction.java           |   2 +-
 .../ContactMultiDeletionInteraction.java      |  27 +--
 .../interactions/ExportDialogFragment.java    |   6 +-
 .../GroupDeletionDialogFragment.java          |   2 +-
 .../interactions/ImportDialogFragment.java    |   6 +-
 .../contacts/list/AccountFilterActivity.java  |  10 +-
 .../contacts/list/ContactListItemView.java    |   2 +-
 .../list/CustomContactListFilterActivity.java |  14 +-
 .../DefaultContactBrowseListFragment.java     |   4 +-
 .../list/EnableGlobalSyncDialogFragment.java  |   2 +-
 .../preference/AboutPreferenceFragment.java   |  62 ++++---
 .../ContactsPreferenceActivity.java           |  21 +--
 .../contacts/preference/CustomPreference.java |  41 +++++
 .../preference/DefaultAccountPreference.java  |  13 ++
 .../preference/DisplayOrderPreference.java    |  14 ++
 .../PhoneticNameDisplayPreference.java        |  14 ++
 .../preference/SortOrderPreference.java       |  14 ++
 .../quickcontact/QuickContactActivity.java    |  29 ++-
 .../contacts/util/AccountSelectionUtil.java   |   2 +-
 .../contacts/util/MaterialColorMapUtils.java  |   2 +-
 .../contacts/vcard/CancelActivity.java        |   4 +-
 .../contacts/vcard/ExportVCardActivity.java   |   2 +-
 .../contacts/vcard/ImportVCardActivity.java   |   2 +-
 .../vcard/ImportVCardDialogFragment.java      |   2 +-
 .../SelectPhoneAccountDialogFragment.java     |   2 +-
 tests/res/layout/fill_call_log_test.xml       |   2 +-
 143 files changed, 1035 insertions(+), 627 deletions(-)
 rename res/{color/contact_list_name_text_color.xml => drawable/quantum_ic_arrow_back_white_vd_theme_24.xml} (54%)
 create mode 100644 res/drawable/quantum_ic_create_white_vd_theme_24.xml
 create mode 100644 res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml
 create mode 100644 res/drawable/quantum_ic_person_add_white_vd_theme_24.xml
 create mode 100644 res/drawable/quantum_ic_star_border_white_vd_theme_24.xml
 create mode 100644 res/drawable/quantum_ic_star_white_vd_theme_24.xml
 create mode 100644 res/layout/custom_pref_layout.xml
 create mode 100644 res/layout/custom_settings_toolbar.xml
 create mode 100644 res/values-night-v27/styles.xml
 delete mode 100644 res/values-night/colors.xml
 create mode 100644 res/values-night/styles.xml
 create mode 100644 src/com/android/contacts/preference/CustomPreference.java

diff --git a/Android.bp b/Android.bp
index 31ee993cdf..96cae0af6c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,6 +19,7 @@ android_app {
         "androidx.recyclerview_recyclerview",
         "androidx.palette_palette",
         "androidx.legacy_legacy-support-v4",
+        "androidx.webkit_webkit",
         "android-common",
         "com.android.vcard",
         "guava",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eb5496c4e6..8593a6b7f1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -287,7 +287,7 @@
 
         <activity
             android:name=".activities.ShowOrCreateActivity"
-            android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
+            android:theme="@style/customDialogNoActionBar">
 
             <intent-filter>
                 <action android:name="com.android.contacts.action.SHOW_OR_CREATE_CONTACT"/>
@@ -303,7 +303,7 @@
             android:excludeFromRecents="true"
             android:launchMode="singleTop"
             android:taskAffinity=""
-            android:theme="@style/Theme.QuickContact"
+            android:theme="@style/Theme.QuickContact.White.TopBar"
             android:windowSoftInputMode="stateUnchanged">
 
             <intent-filter>
diff --git a/res/drawable/fab_bg.xml b/res/drawable/fab_bg.xml
index 007d3e2205..40e44017a7 100644
--- a/res/drawable/fab_bg.xml
+++ b/res/drawable/fab_bg.xml
@@ -4,7 +4,7 @@
     android:shape="oval">
 
     <solid
-        android:color="#ffffff"/>
+        android:color="@color/primary_color_dark"/>
 
     <size
         android:width="120dp"
diff --git a/res/drawable/ic_add_circle_24dp.xml b/res/drawable/ic_add_circle_24dp.xml
index ebaab3498f..378f57f6a3 100644
--- a/res/drawable/ic_add_circle_24dp.xml
+++ b/res/drawable/ic_add_circle_24dp.xml
@@ -22,6 +22,6 @@
         android:viewportWidth="192.0">
   <path android:fillColor="@color/ic_add_contact_shortcut_background"
         android:pathData="M96,8C47.38,8 8,47.38 8,96s39.38,88 88,88s88,-39.38 88,-88S144.62,8 96,8z"/>
-  <path android:fillColor="#039BE5"
+  <path android:fillColor="@color/accent"
         android:pathData="M124,100h-24v24h-8v-24H68v-8h24V68h8v24h24V100z"/>
 </vector>
diff --git a/res/drawable/ic_add_contact_shortcut.xml b/res/drawable/ic_add_contact_shortcut.xml
index 85a7e61bd7..f56005ee1c 100644
--- a/res/drawable/ic_add_contact_shortcut.xml
+++ b/res/drawable/ic_add_contact_shortcut.xml
@@ -22,6 +22,6 @@
     android:viewportWidth="192.0">
     <path android:fillColor="@color/ic_add_contact_shortcut_background"
         android:pathData="M96,8C47.38,8 8,47.38 8,96s39.38,88 88,88s88,-39.38 88,-88S144.62,8 96,8z"/>
-    <path android:fillColor="#039BE5"
+    <path android:fillColor="@color/accent"
         android:pathData="M124,100h-24v24h-8v-24H68v-8h24V68h8v24h24V100z"/>
 </vector>
diff --git a/res/drawable/ic_work_profile.xml b/res/drawable/ic_work_profile.xml
index d30e8e1c10..168a5f9b33 100644
--- a/res/drawable/ic_work_profile.xml
+++ b/res/drawable/ic_work_profile.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M20,6h-4V4c0,-1.11 -0.89,-2 -2,-2h-4C8.89,2 8,2.89 8,4v2H4C2.89,6 2.01,6.89 2.01,8L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V8C22,6.89 21.11,6 20,6zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,15 12,15zM14,6h-4V4h4V6z"
-        android:fillColor="#7F7F7F"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/item_background_material_dark.xml b/res/drawable/item_background_material_dark.xml
index 87b1e17471..8437f61c1d 100644
--- a/res/drawable/item_background_material_dark.xml
+++ b/res/drawable/item_background_material_dark.xml
@@ -18,6 +18,6 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@color/ripple_material_dark" >
     <item android:id="@android:id/mask">
-        <color android:color="@android:color/white" />
+        <color android:color="@color/color_default_background" />
     </item>
 </ripple>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_account_circle_vd_theme_24.xml b/res/drawable/quantum_ic_account_circle_vd_theme_24.xml
index df2f6e7a63..cf08fb1415 100644
--- a/res/drawable/quantum_ic_account_circle_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_account_circle_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml
index 627fc48c4e..8f76cfee2b 100644
--- a/res/drawable/quantum_ic_add_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_add_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/accent"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml b/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
index 174cf12fba..6524874fea 100644
--- a/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
diff --git a/res/color/contact_list_name_text_color.xml b/res/drawable/quantum_ic_arrow_back_white_vd_theme_24.xml
similarity index 54%
rename from res/color/contact_list_name_text_color.xml
rename to res/drawable/quantum_ic_arrow_back_white_vd_theme_24.xml
index 2327e2ae1b..aa7331fc6b 100644
--- a/res/color/contact_list_name_text_color.xml
+++ b/res/drawable/quantum_ic_arrow_back_white_vd_theme_24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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.
@@ -13,7 +12,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/disabled_contact_list_name_text" android:state_enabled="false" />
-    <item android:color="@color/primary_text_color" />
-</selector>
\ No newline at end of file
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/accent"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml b/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml
index 87c39de0b6..66ba35ca8c 100644
--- a/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M7,10l5,5 5,-5z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_assistant_vd_theme_24.xml b/res/drawable/quantum_ic_assistant_vd_theme_24.xml
index 2d5135bda9..ad48048dc0 100644
--- a/res/drawable/quantum_ic_assistant_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_assistant_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M19,2L5,2c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h4l3,3 3,-3h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM13.88,12.88L12,17l-1.88,-4.12L6,11l4.12,-1.88L12,5l1.88,4.12L18,11l-4.12,1.88z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_business_vd_theme_24.xml b/res/drawable/quantum_ic_business_vd_theme_24.xml
index 684265b4f4..b523eec080 100644
--- a/res/drawable/quantum_ic_business_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_business_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_call_received_vd_theme_24.xml b/res/drawable/quantum_ic_call_received_vd_theme_24.xml
index 3793f74b73..69887b0266 100644
--- a/res/drawable/quantum_ic_call_received_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_call_received_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,5.41L18.59,4 7,15.59V9H5v10h10v-2H8.41z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml b/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml
index 07ed76be11..c2605d37e3 100644
--- a/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml
@@ -19,11 +19,11 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_cancel_vd_theme_24.xml b/res/drawable/quantum_ic_cancel_vd_theme_24.xml
index 409ba75eb2..d6fa914bc1 100644
--- a/res/drawable/quantum_ic_cancel_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_cancel_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml b/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml
index 73baff2682..f29bf0b91c 100644
--- a/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,10c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,4c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM6,13c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM6,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM12,11.1c-1.05,0 -1.9,0.85 -1.9,1.9s0.85,1.9 1.9,1.9c1.05,0 1.9,-0.85 1.9,-1.9s-0.85,-1.9 -1.9,-1.9zM18,13c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM18,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml
index 3809f5c35c..687efeaaff 100644
--- a/res/drawable/quantum_ic_close_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_close_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/accent"
         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_content_copy_vd_theme_24.xml b/res/drawable/quantum_ic_content_copy_vd_theme_24.xml
index b43eb4aada..9776c7f2eb 100644
--- a/res/drawable/quantum_ic_content_copy_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_content_copy_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_create_vd_theme_24.xml b/res/drawable/quantum_ic_create_vd_theme_24.xml
index 8f161bc438..18b0b1142e 100644
--- a/res/drawable/quantum_ic_create_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_create_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_create_white_vd_theme_24.xml b/res/drawable/quantum_ic_create_white_vd_theme_24.xml
new file mode 100644
index 0000000000..842a3cc622
--- /dev/null
+++ b/res/drawable/quantum_ic_create_white_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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:tint="@color/accent"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_delete_vd_theme_24.xml b/res/drawable/quantum_ic_delete_vd_theme_24.xml
index 698a0bcfed..f4ca0a3102 100644
--- a/res/drawable/quantum_ic_delete_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_delete_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml b/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml
index 6ef33dbd0d..d2fb20e48e 100644
--- a/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M17,3h-1v5h1L17,3zM15,5h-2L13,4h2L15,3h-3v3h2v1h-2v1h3L15,5zM18,3v5h1L19,6h2L21,3h-3zM20,5h-1L19,4h1v1zM20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.01,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.27,-0.26 0.35,-0.65 0.24,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_directions_vd_theme_24.xml b/res/drawable/quantum_ic_directions_vd_theme_24.xml
index 7da99e052f..9d142aea66 100644
--- a/res/drawable/quantum_ic_directions_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_directions_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M21.71,11.29l-9,-9c-0.39,-0.39 -1.02,-0.39 -1.41,0l-9,9c-0.39,0.39 -0.39,1.02 0,1.41l9,9c0.39,0.39 1.02,0.39 1.41,0l9,-9c0.39,-0.38 0.39,-1.01 0,-1.41zM14,14.5V12h-4v3H8v-4c0,-0.55 0.45,-1 1,-1h5V7.5l3.5,3.5 -3.5,3.5z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_done_vd_theme_24.xml b/res/drawable/quantum_ic_done_vd_theme_24.xml
index 0c810e80e4..bd15ece8d0 100644
--- a/res/drawable/quantum_ic_done_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_done_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_drawer_emergency_info_24.xml b/res/drawable/quantum_ic_drawer_emergency_info_24.xml
index 6b6a14336b..5850be17ca 100644
--- a/res/drawable/quantum_ic_drawer_emergency_info_24.xml
+++ b/res/drawable/quantum_ic_drawer_emergency_info_24.xml
@@ -3,8 +3,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
         android:pathData="M9.6,2v5.6l-5,-3L2,9l5,3l-5,3l2.3,4l5.3,-2.7v5.6h4.6v-5.6l5.3,2.7l2.3,-4l-5.6,-2.7L21.9,9l-2.3,-4l-5.3,3V2H9.6z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="@color/accent"/>
 </vector>
diff --git a/res/drawable/quantum_ic_drawer_my_info_32.xml b/res/drawable/quantum_ic_drawer_my_info_32.xml
index 4e310cb4a1..7a7ced3706 100644
--- a/res/drawable/quantum_ic_drawer_my_info_32.xml
+++ b/res/drawable/quantum_ic_drawer_my_info_32.xml
@@ -5,15 +5,15 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M15.8,1C7.5,1 0.9,7.7 1,16c0.1,8.3 6.9,15 15.2,15S31.1,24.3 31,16C30.9,7.7 24.1,1 15.8,1z"
-        android:fillColor="#4185F3"/>
+        android:fillColor="@color/accent"/>
     <path
         android:pathData="M16,12.3m-3.8,0a3.8,3.8 0,1 1,7.6 0a3.8,3.8 0,1 1,-7.6 0"
         android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
+        android:fillColor="@android:color/white"
         android:strokeAlpha="0.2"/>
     <path
         android:pathData="M23.5,23.5h-15v-1.9c0,-2.5 5,-3.8 7.5,-3.8s7.5,1.3 7.5,3.8V23.5z"
         android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
+        android:fillColor="@android:color/white"
         android:strokeAlpha="0.2"/>
 </vector>
diff --git a/res/drawable/quantum_ic_email_vd_theme_24.xml b/res/drawable/quantum_ic_email_vd_theme_24.xml
index 724f45a770..4c7b3327fd 100644
--- a/res/drawable/quantum_ic_email_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_email_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_error_vd_theme_24.xml b/res/drawable/quantum_ic_error_vd_theme_24.xml
index b9dbeb41db..6381d6be1d 100644
--- a/res/drawable/quantum_ic_error_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_error_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_event_vd_theme_24.xml b/res/drawable/quantum_ic_event_vd_theme_24.xml
index e0107b1231..1d5f63dc6e 100644
--- a/res/drawable/quantum_ic_event_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_event_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_expand_less_vd_theme_24.xml b/res/drawable/quantum_ic_expand_less_vd_theme_24.xml
index 2f60a68c04..c48e5bc51e 100644
--- a/res/drawable/quantum_ic_expand_less_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_expand_less_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_expand_more_vd_theme_24.xml b/res/drawable/quantum_ic_expand_more_vd_theme_24.xml
index 9fbfe48ec3..8d85b3a05b 100644
--- a/res/drawable/quantum_ic_expand_more_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_expand_more_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_hangout_vd_theme_24.xml b/res/drawable/quantum_ic_hangout_vd_theme_24.xml
index ab07ba8fd0..65b9bfb5f9 100644
--- a/res/drawable/quantum_ic_hangout_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_hangout_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M11.5,2C6.81,2 3,5.81 3,10.5S6.81,19 11.5,19h0.5v3.5c4.86,-2.34 8,-7.5 8,-12C20,5.81 16.19,2 11.5,2zM11,11l-1,2L8.5,13l1,-2L8,11L8,8h3v3zM15,11l-1,2h-1.5l1,-2L12,11L12,8h3v3z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml b/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml
index 1ce818a97d..03cb7c28c0 100644
--- a/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM18,16l-4,-3.2L14,16L6,16L6,8h8v3.2L18,8v8z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_help_vd_theme_24.xml b/res/drawable/quantum_ic_help_vd_theme_24.xml
index 385d7204c9..b6734dfa8c 100644
--- a/res/drawable/quantum_ic_help_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_help_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_history_vd_theme_24.xml b/res/drawable/quantum_ic_history_vd_theme_24.xml
index 51621fd908..a4e9d517a8 100644
--- a/res/drawable/quantum_ic_history_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_history_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml b/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml
index 247cb1bead..5b0c4bdda5 100644
--- a/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_label_vd_theme_24.xml b/res/drawable/quantum_ic_label_vd_theme_24.xml
index 5630805057..529d2ae54e 100644
--- a/res/drawable/quantum_ic_label_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_label_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_link_vd_theme_24.xml b/res/drawable/quantum_ic_link_vd_theme_24.xml
index 67a167ebab..39ae3a36b4 100644
--- a/res/drawable/quantum_ic_link_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_link_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml
index 5b5d7b76eb..98621658c3 100644
--- a/res/drawable/quantum_ic_menu_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/accent"
         android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_message_vd_theme_24.xml b/res/drawable/quantum_ic_message_vd_theme_24.xml
index a06a1da6ef..7bd601ad02 100644
--- a/res/drawable/quantum_ic_message_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_message_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_mic_vd_theme_24.xml b/res/drawable/quantum_ic_mic_vd_theme_24.xml
index ea4bef41bd..8f0e462d2b 100644
--- a/res/drawable/quantum_ic_mic_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_mic_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_more_vert_vd_theme_24.xml b/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
index 442451fe1c..9111f6f050 100644
--- a/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml b/res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml
new file mode 100644
index 0000000000..3ae916e544
--- /dev/null
+++ b/res/drawable/quantum_ic_more_vert_white_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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:tint="@color/accent"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml b/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml
index d7e0fb430c..0026e9556a 100644
--- a/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.58l2.2,-2.21c0.28,-0.27 0.36,-0.66 0.25,-1.01C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM12,3v10l3,-3h6V3h-9z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_person_add_vd_theme_24.xml b/res/drawable/quantum_ic_person_add_vd_theme_24.xml
index 48a017f334..c98d13339d 100644
--- a/res/drawable/quantum_ic_person_add_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_person_add_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_person_add_white_vd_theme_24.xml b/res/drawable/quantum_ic_person_add_white_vd_theme_24.xml
new file mode 100644
index 0000000000..64a1ce95c0
--- /dev/null
+++ b/res/drawable/quantum_ic_person_add_white_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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:tint="@color/accent"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_person_vd_theme_24.xml b/res/drawable/quantum_ic_person_vd_theme_24.xml
index a5d9c8c063..aaee2f4af4 100644
--- a/res/drawable/quantum_ic_person_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_person_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_phone_vd_theme_24.xml b/res/drawable/quantum_ic_phone_vd_theme_24.xml
index 8d37e2bfed..226f010ed4 100644
--- a/res/drawable/quantum_ic_phone_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_phone_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_place_vd_theme_24.xml b/res/drawable/quantum_ic_place_vd_theme_24.xml
index 4276861aa7..442fdae8d0 100644
--- a/res/drawable/quantum_ic_place_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_place_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_public_vd_theme_24.xml b/res/drawable/quantum_ic_public_vd_theme_24.xml
index 6dffe5ce23..9509debf97 100644
--- a/res/drawable/quantum_ic_public_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_public_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml
index 03dcbaa98b..8b86c55d1c 100644
--- a/res/drawable/quantum_ic_search_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_search_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/accent"
         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/drawable/quantum_ic_settings_vd_theme_24.xml b/res/drawable/quantum_ic_settings_vd_theme_24.xml
index 1867c79553..75a624fa13 100644
--- a/res/drawable/quantum_ic_settings_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_settings_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_share_vd_theme_24.xml b/res/drawable/quantum_ic_share_vd_theme_24.xml
index f024a22efd..14a315852b 100644
--- a/res/drawable/quantum_ic_share_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_share_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_sim_card_vd_theme_24.xml b/res/drawable/quantum_ic_sim_card_vd_theme_24.xml
index 2bc9387f6a..72721c92c7 100644
--- a/res/drawable/quantum_ic_sim_card_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_sim_card_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M19.99,4c0,-1.1 -0.89,-2 -1.99,-2h-8L4,8v12c0,1.1 0.9,2 2,2h12.01c1.1,0 1.99,-0.9 1.99,-2l-0.01,-16zM9,19L7,19v-2h2v2zM17,19h-2v-2h2v2zM9,15L7,15v-4h2v4zM13,19h-2v-4h2v4zM13,13h-2v-2h2v2zM17,15h-2v-4h2v4z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml
index 9f987e75cb..7fa28695ae 100644
--- a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_star_border_vd_theme_24.xml b/res/drawable/quantum_ic_star_border_vd_theme_24.xml
index e266072cde..42f1d22f8c 100644
--- a/res/drawable/quantum_ic_star_border_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_star_border_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_star_border_white_vd_theme_24.xml b/res/drawable/quantum_ic_star_border_white_vd_theme_24.xml
new file mode 100644
index 0000000000..387287c970
--- /dev/null
+++ b/res/drawable/quantum_ic_star_border_white_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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:tint="@color/accent"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
+</vector>
diff --git a/res/drawable/quantum_ic_star_vd_theme_24.xml b/res/drawable/quantum_ic_star_vd_theme_24.xml
index f5a93c6f03..c0ce965864 100644
--- a/res/drawable/quantum_ic_star_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_star_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_star_white_vd_theme_24.xml b/res/drawable/quantum_ic_star_white_vd_theme_24.xml
new file mode 100644
index 0000000000..7cb3e408bc
--- /dev/null
+++ b/res/drawable/quantum_ic_star_white_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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:tint="@color/accent"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_videocam_vd_theme_24.xml b/res/drawable/quantum_ic_videocam_vd_theme_24.xml
index 87408576b6..9aff1b4216 100644
--- a/res/drawable/quantum_ic_videocam_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_videocam_vd_theme_24.xml
@@ -19,8 +19,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@color/accent">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
         android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
 </vector>
diff --git a/res/drawable/quantum_launchscreen_contacts.xml b/res/drawable/quantum_launchscreen_contacts.xml
index 276b2da337..2785e6536e 100755
--- a/res/drawable/quantum_launchscreen_contacts.xml
+++ b/res/drawable/quantum_launchscreen_contacts.xml
@@ -16,7 +16,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:opacity="opaque">
-  <item android:drawable="@android:color/white" />
+  <item android:drawable="@color/color_default_background" />
   <item
       android:id="@+id/launchscreens_product_logo"
       android:bottom="@dimen/launchscreens_product_logo_bottom">
diff --git a/res/layout-v23/edit_date_picker.xml b/res/layout-v23/edit_date_picker.xml
index 299ccec685..f65d805861 100644
--- a/res/layout-v23/edit_date_picker.xml
+++ b/res/layout-v23/edit_date_picker.xml
@@ -19,6 +19,7 @@
 <Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/date_view"
+    android:theme="@style/CustomEditTextTheme"
     style="@style/SpinnerButtonStyle"
     android:layout_width="match_parent"
     android:layout_height="@dimen/editor_min_line_item_height"
diff --git a/res/layout-v23/edit_spinner.xml b/res/layout-v23/edit_spinner.xml
index 37015f7166..22737662ab 100644
--- a/res/layout-v23/edit_spinner.xml
+++ b/res/layout-v23/edit_spinner.xml
@@ -20,7 +20,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/spinner"
     android:layout_gravity="bottom|start"
+    android:theme="@style/CustomEditTextTheme"
     style="@android:style/Widget.Material.Spinner.Underlined"
+    android:popupBackground="@color/color_default_foreground"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:paddingBottom="0dp"
diff --git a/res/layout/custom_contact_list_filter_group.xml b/res/layout/custom_contact_list_filter_group.xml
index 036d650ff0..7fbca4ca02 100644
--- a/res/layout/custom_contact_list_filter_group.xml
+++ b/res/layout/custom_contact_list_filter_group.xml
@@ -77,7 +77,7 @@
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:duplicateParentState="true"
-            android:buttonTint="@color/color_default_blue1"
+            android:buttonTint="@color/accent"
         />
 
     </LinearLayout>
diff --git a/res/layout/custom_pref_layout.xml b/res/layout/custom_pref_layout.xml
new file mode 100644
index 0000000000..3a6ec36807
--- /dev/null
+++ b/res/layout/custom_pref_layout.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="@color/color_default_background"
+    android:focusable="true" >
+
+    <FrameLayout
+        android:id="@+id/icon_frame"
+        android:background="@color/color_default_background"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:background="@color/color_default_background"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorPrimary"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/custom_settings_toolbar.xml b/res/layout/custom_settings_toolbar.xml
new file mode 100644
index 0000000000..831ed0b098
--- /dev/null
+++ b/res/layout/custom_settings_toolbar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="@color/primary_color_dark">
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:textSize="20sp"
+        android:gravity="center_vertical"
+        android:background="@color/primary_color_dark"
+        android:textColor="@color/color_default_primary_text"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/date_picker.xml b/res/layout/date_picker.xml
index 9bfb8de996..4010230395 100644
--- a/res/layout/date_picker.xml
+++ b/res/layout/date_picker.xml
@@ -34,10 +34,11 @@
         android:paddingTop="5dip"
         android:paddingBottom="5dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/color_default_primary_text"
         android:layout_gravity="center_horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:buttonTint="@color/color_default_blue1"
+        android:buttonTint="@color/accent"
         />
     <!-- Warning: everything within the parent is removed and re-ordered depending
          on the date format selected by the user. -->
diff --git a/res/layout/default_account_checkbox.xml b/res/layout/default_account_checkbox.xml
index 635f90e504..3dae2a8099 100644
--- a/res/layout/default_account_checkbox.xml
+++ b/res/layout/default_account_checkbox.xml
@@ -32,6 +32,6 @@
         android:textAlignment="viewStart"
         android:text="@string/set_default_account"
         android:textColor="@color/dialtacts_secondary_text_color"
-        android:buttonTint="@color/color_default_blue1"
+        android:buttonTint="@color/accent"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dialog_call_subject.xml b/res/layout/dialog_call_subject.xml
index 61513ebe91..977345f86a 100644
--- a/res/layout/dialog_call_subject.xml
+++ b/res/layout/dialog_call_subject.xml
@@ -128,7 +128,7 @@
                     android:layout_width="25dp"
                     android:layout_height="25dp"
                     android:src="@drawable/quantum_ic_history_vd_theme_24"
-                    android:tint="@color/call_subject_history_icon"
+                    android:tint="@color/accent"
                     android:layout_alignParentStart="true"
                     android:layout_centerVertical="true" />
 
diff --git a/res/layout/dialog_title.xml b/res/layout/dialog_title.xml
index 45f5f73676..e8e9ab2174 100644
--- a/res/layout/dialog_title.xml
+++ b/res/layout/dialog_title.xml
@@ -18,10 +18,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingTop="18dp"
+    android:paddingTop="4dp"
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
-    android:textSize="20sp"
+    android:textSize="25sp"
+    android:textStyle="bold"
     android:textColor="@color/contacts_text_color"
     android:textAlignment="viewStart"
     android:fontFamily="sans-serif-medium"
diff --git a/res/layout/drawer_item.xml b/res/layout/drawer_item.xml
index 1bb6c7faee..f7621a35d3 100644
--- a/res/layout/drawer_item.xml
+++ b/res/layout/drawer_item.xml
@@ -20,7 +20,6 @@
     style="@style/DrawerItemStyle">
 
     <ImageView
-        android:tint="@color/color_default_gray2"
         android:id="@+id/icon"
         style="@style/DrawerItemIconStyle"/>
 
diff --git a/res/layout/edit_date_picker.xml b/res/layout/edit_date_picker.xml
index 5d60a36859..fa2bd61f4a 100644
--- a/res/layout/edit_date_picker.xml
+++ b/res/layout/edit_date_picker.xml
@@ -19,6 +19,7 @@
 <Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/date_view"
+    android:theme="@style/CustomEditTextTheme"
     style="@style/SpinnerButtonStyle"
     android:layout_width="match_parent"
     android:layout_height="@dimen/editor_min_line_item_height"
diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml
index 2eea95057b..7776956874 100644
--- a/res/layout/edit_delete_button.xml
+++ b/res/layout/edit_delete_button.xml
@@ -30,7 +30,7 @@
         android:duplicateParentState="true"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/quantum_ic_close_vd_theme_24"
-        android:tint="@color/quantum_black_hint_text"
+        android:tint="@color/accent"
         android:paddingLeft="@dimen/editor_round_button_padding_left"
         android:paddingRight="@dimen/editor_round_button_padding_right"
         android:paddingStart="@dimen/editor_round_button_padding_left"
diff --git a/res/layout/edit_spinner.xml b/res/layout/edit_spinner.xml
index b1c879cdd9..d1712c4f2b 100644
--- a/res/layout/edit_spinner.xml
+++ b/res/layout/edit_spinner.xml
@@ -20,7 +20,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/spinner"
     android:layout_gravity="bottom|start"
+    android:theme="@style/CustomEditTextTheme"
     style="@android:style/Widget.Material.Spinner.Underlined"
+    android:popupBackground="@color/color_default_foreground"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:paddingBottom="0dp"
diff --git a/res/layout/editor_account_header.xml b/res/layout/editor_account_header.xml
index 9a4ed803b4..5697ac05cb 100644
--- a/res/layout/editor_account_header.xml
+++ b/res/layout/editor_account_header.xml
@@ -67,7 +67,7 @@
     <ImageView
         android:id="@+id/account_expander_icon"
         android:src="@drawable/quantum_ic_expand_more_vd_theme_24"
-        android:tint="@color/quantum_black_secondary_text"
+        android:tint="@color/accent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|end"
diff --git a/res/layout/floating_action_button.xml b/res/layout/floating_action_button.xml
index bb616f2ed1..571acb8a29 100644
--- a/res/layout/floating_action_button.xml
+++ b/res/layout/floating_action_button.xml
@@ -37,5 +37,5 @@
         android:background="@drawable/floating_action_button"
         android:contentDescription="@string/action_menu_add_new_contact_button"
         android:src="@drawable/quantum_ic_add_vd_theme_24"
-        android:tint="@color/color_default_blue1"/>
+        android:tint="@color/accent"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_sim_import.xml b/res/layout/fragment_sim_import.xml
index bea50d12dd..f06dfef900 100644
--- a/res/layout/fragment_sim_import.xml
+++ b/res/layout/fragment_sim_import.xml
@@ -95,7 +95,7 @@
                 android:minWidth="0dp"
                 android:scaleType="center"
                 android:src="@drawable/quantum_ic_arrow_drop_down_vd_theme_24"
-                android:tint="?android:textColorSecondary"
+                android:tint="@color/accent"
                 android:visibility="gone"/>
         </LinearLayout>
 
diff --git a/res/layout/name_edit_expansion_view.xml b/res/layout/name_edit_expansion_view.xml
index 066850f9aa..01064495b1 100644
--- a/res/layout/name_edit_expansion_view.xml
+++ b/res/layout/name_edit_expansion_view.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:duplicateParentState="true"
-        android:tint="@color/quantum_black_secondary_text"
+        android:tint="@color/accent"
         android:background="?android:attr/selectableItemBackground"
         android:paddingLeft="@dimen/editor_round_button_padding_left"
         android:paddingRight="@dimen/editor_round_button_padding_right"
diff --git a/res/layout/quickcontact_collapsed_suggestion_card.xml b/res/layout/quickcontact_collapsed_suggestion_card.xml
index ac2ec499c2..a3a47a6d81 100644
--- a/res/layout/quickcontact_collapsed_suggestion_card.xml
+++ b/res/layout/quickcontact_collapsed_suggestion_card.xml
@@ -30,7 +30,7 @@
 
         <ImageView
                 android:src="@drawable/quantum_ic_assistant_vd_theme_24"
-                android:tint="@color/editor_icon_color"
+                android:tint="@color/accent"
                 android:layout_width="@dimen/quickcontact_collapse_icon_size"
                 android:layout_height="@dimen/quickcontact_collapse_icon_size"
                 android:layout_margin="@dimen/quickcontact_collapse_image_padding"
diff --git a/res/layout/quickcontact_content.xml b/res/layout/quickcontact_content.xml
index b6cff4b14c..a536d2413f 100644
--- a/res/layout/quickcontact_content.xml
+++ b/res/layout/quickcontact_content.xml
@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     android:fillViewport="true"
     android:id="@+id/content_scroller"
-    android:background="@color/card_margin_color">
+    android:background="@color/color_default_background">
 
     <!-- All the cards should be inserted into this LinearLayout -->
     <LinearLayout
diff --git a/res/layout/quickcontact_title_and_phoneticname.xml b/res/layout/quickcontact_title_and_phoneticname.xml
index 350c5e93c2..9222733354 100644
--- a/res/layout/quickcontact_title_and_phoneticname.xml
+++ b/res/layout/quickcontact_title_and_phoneticname.xml
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|start"
-        android:textColor="@color/actionbar_text_color"
+        android:textColor="@color/color_default_view_on_accent"
         android:maxLines="@integer/quickcontact_title_lines"
         android:textSize="@dimen/quickcontact_maximum_title_size"
         android:textAlignment="viewStart"
@@ -38,7 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/large_title"
-        android:textColor="@color/actionbar_text_color"
+        android:textColor="@color/color_default_view_on_accent"
         android:maxLines="@integer/quickcontact_title_lines"
         android:textSize="@dimen/quickcontact_maximum_phonetic_name_size"
         android:textAlignment="viewStart"
diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index 272a2fcf9d..02121ccef9 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -25,7 +25,7 @@
         android:layout_width="@dimen/selection_bar_close_icon_size"
         android:layout_height="@dimen/selection_bar_close_icon_size"
         android:layout_gravity="center_vertical|start"
-        android:tint="@color/quantum_black_secondary_text"
+        android:tint="@color/accent"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_edit_select"
         android:src="@drawable/quantum_ic_close_vd_theme_24"/>
@@ -51,7 +51,7 @@
         android:paddingEnd="16dp"
         android:paddingStart="16dp"
         android:text="@string/menu_add_contacts"
-        android:textColor="@color/primary_color"
+        android:textColor="@color/secondary_text_color"
         android:textStyle="bold"
         android:visibility="gone"/>
 
diff --git a/res/layout/sim_import_list_item_disabled.xml b/res/layout/sim_import_list_item_disabled.xml
index 4647049f72..4553805416 100644
--- a/res/layout/sim_import_list_item_disabled.xml
+++ b/res/layout/sim_import_list_item_disabled.xml
@@ -11,4 +11,4 @@
     android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingStart="@dimen/activity_horizontal_margin"
     android:textAppearance="?android:textAppearanceListItem"
-    android:textColor="@color/contact_list_name_text_color"/>
+    android:textColor="@color/color_default_primary_text"/>
diff --git a/res/layout/structured_name_editor_view.xml b/res/layout/structured_name_editor_view.xml
index 201fe094ca..60f42d1f96 100644
--- a/res/layout/structured_name_editor_view.xml
+++ b/res/layout/structured_name_editor_view.xml
@@ -32,6 +32,7 @@
     <ImageView
         android:id="@+id/kind_icon"
         android:src="@lineageos.platform:drawable/ic_person_stroked"
+        android:tint="@color/accent"
         android:contentDescription="@string/header_name_entry"
         style="@style/EditKindIconStyle"/>
 
diff --git a/res/menu/edit_contact.xml b/res/menu/edit_contact.xml
index c049941d03..0f5bb69440 100644
--- a/res/menu/edit_contact.xml
+++ b/res/menu/edit_contact.xml
@@ -17,8 +17,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        app:itemTextColor="@color/color_default_blue1"
-        app:itemIconTint="@color/color_default_blue1"
+        app:itemTextColor="@color/accent"
+        app:itemIconTint="@color/accent"
         android:id="@+id/menu_save"
         app:showAsAction="always"
         app:actionLayout="@layout/editor_save_button"
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index 0b7f535785..51bbc0f104 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -36,18 +36,21 @@
         android:id="@+id/menu_share"
         android:icon="@drawable/quantum_ic_share_vd_theme_24"
         android:title="@string/menu_share"
-        contacts:showAsAction="ifRoom"/>
+        contacts:showAsAction="ifRoom"
+        app:iconTint="@color/accent"/>
 
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/quantum_ic_delete_vd_theme_24"
         android:title="@string/menu_deleteContact"
-        contacts:showAsAction="ifRoom"/>
+        contacts:showAsAction="ifRoom"
+        app:iconTint="@color/accent"/>
 
     <item
         android:id="@+id/menu_join"
         android:icon="@drawable/quantum_ic_link_vd_theme_24"
         android:title="@string/menu_joinAggregate"
-        contacts:showAsAction="ifRoom"/>
+        contacts:showAsAction="ifRoom"
+        app:iconTint="@color/accent"/>
 
 </menu>
diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml
new file mode 100644
index 0000000000..c8901e4e2b
--- /dev/null
+++ b/res/values-night-v27/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchScreenTheme" parent="LaunchScreenBaseTheme">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="PeopleThemeAppCompat" parent="PeopleBaseThemeAppCompat">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="ContactsPreferencesTheme" parent="ContactsPreferencesBaseTheme">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="PeopleTheme" parent="PeopleBaseTheme">
+        <item name="android:forceDarkAllowed">true</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
deleted file mode 100644
index e88ed65b73..0000000000
--- a/res/values-night/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * SPDX-License-Identifier: Apache-2.0
- * Copyright (C) 2020 The LineageOS Project
--->
-<resources>
-    <!-- Background color of pinned header items. -->
-    <color name="list_item_pinned_header_color">#1f1f1f</color>
-
-    <!-- Color of contact name in list. -->
-    <color name="contact_list_name_text_color">#dadada</color>
-</resources>
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
new file mode 100644
index 0000000000..e9adaebdff
--- /dev/null
+++ b/res/values-night/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="customDialogNoActionBar" parent="@android:style/Theme.Material.Dialog.NoActionBar" />
+</resources>
\ No newline at end of file
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index 5c25afdce8..d0e4dd4dc5 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -1,132 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
-        <!-- Style for the overflow button in the actionbar. -->
-        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
-        <item name="android:actionModeCloseDrawable">@drawable/quantum_ic_close_vd_theme_24</item>
-        <item name="android:textColorPrimary">@color/primary_text_color</item>
-        <item name="android:textColorSecondary">@color/secondary_text_color</item>
-        <item name="android:icon">@android:color/transparent</item>
-        <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <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/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>
-        <item name="list_item_padding_top">
-            @dimen/contact_browser_list_item_padding_top_or_bottom
-        </item>
-        <item name="list_item_padding_right">32dp</item>
-        <item name="list_item_padding_bottom">
-            @dimen/contact_browser_list_item_padding_top_or_bottom
-        </item>
-        <item name="list_item_padding_left">0dp</item>
-        <item name="list_item_gap_between_image_and_text">
-            @dimen/contact_browser_list_item_gap_between_image_and_text
-        </item>
-        <item name="list_item_gap_between_label_and_data">5dip</item>
-        <item name="list_item_presence_icon_margin">4dip</item>
-        <item name="list_item_presence_icon_size">16dip</item>
-        <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
-        <item name="list_item_profile_photo_size">70dip</item>
-        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
-        <item name="list_item_background_color">@color/list_item_pinned_header_color</item>
-        <item name="list_item_header_text_color">@color/people_app_theme_color</item>
-        <item name="list_item_header_text_size">14sp</item>
-        <item name="list_item_header_height">30dip</item>
-        <item name="list_item_header_text_indent">8dip</item>
-        <item name="contact_browser_list_padding_left">0dip</item>
-        <item name="contact_browser_list_padding_right">0dip</item>
-        <item name="contact_browser_background">@color/background_primary</item>
-        <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
-        <item name="list_item_text_offset_top">-2dp</item>
-        <item name="list_item_avatar_offset_top">-1dp</item>
-        <!-- Favorites -->
-        <item name="favorites_padding_bottom">0dip</item>
-        <!-- Popup menu -->
-        <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
-        <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
-        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
+    <style name="PeopleTheme" parent="PeopleBaseTheme">
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/accent</item>
+    <style name="LaunchScreenTheme" parent="LaunchScreenBaseTheme">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:forceDarkAllowed">true</item>
-        <!-- Styles that require AppCompat compatibility, remember to update both sets -->
-        <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
-        <item name="actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
-        <item name="android:actionButtonStyle">@style/ContactsActionButtonStyle</item>
-        <item name="actionButtonStyle">@style/ContactsActionButtonStyle</item>
-        <!-- Style for the overflow button in the actionbar. -->
-        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
-        <item name="actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
-        <item name="toolbarNavigationButtonStyle">@style/ContactToolbarNavigationButtonStyle</item>
-        <item name="android:actionModeCloseDrawable">@drawable/quantum_ic_close_vd_theme_24</item>
-        <item name="android:textColorPrimary">@color/primary_text_color</item>
-        <item name="android:textColorSecondary">@color/secondary_text_color</item>
-        <item name="android:icon">@android:color/transparent</item>
-        <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:windowBackground">@color/background_primary</item>
-        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
-        <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/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>
-        <item name="list_section_header_height">24dip</item>
-        <item name="list_item_padding_top">
-            @dimen/contact_browser_list_item_padding_top_or_bottom
-        </item>
-        <item name="list_item_padding_right">32dp</item>
-        <item name="list_item_padding_bottom">
-            @dimen/contact_browser_list_item_padding_top_or_bottom
-        </item>
-        <item name="list_item_padding_left">0dp</item>
-        <item name="list_item_gap_between_image_and_text">
-            @dimen/contact_browser_list_item_gap_between_image_and_text
-        </item>
-        <item name="list_item_gap_between_indexer_and_image">
-            @dimen/contact_browser_list_item_gap_between_indexer_and_image
-        </item>
-        <item name="list_item_gap_between_label_and_data">5dip</item>
-        <item name="list_item_presence_icon_margin">4dip</item>
-        <item name="list_item_presence_icon_size">16dip</item>
-        <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
-        <item name="list_item_profile_photo_size">70dip</item>
-        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
-        <item name="list_item_background_color">@color/list_item_pinned_header_color</item>
-        <item name="list_item_header_text_color">@color/people_app_theme_color</item>
-        <item name="list_item_header_text_size">14sp</item>
-        <item name="list_item_header_height">30dip</item>
-        <item name="list_item_header_text_indent">8dip</item>
-        <item name="contact_browser_list_padding_left">0dip</item>
-        <item name="contact_browser_list_padding_right">0dip</item>
-        <item name="contact_browser_background">@color/background_primary</item>
-        <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
-        <item name="list_item_text_offset_top">-2dp</item>
-        <item name="list_item_avatar_offset_top">-1dp</item>
-        <!-- Favorites -->
-        <item name="favorites_padding_bottom">0dip</item>
-        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-        <!-- Popup menu -->
-        <item name="android:popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
-        <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
-        <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
-        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
+    <style name="PeopleThemeAppCompat" parent="PeopleBaseThemeAppCompat">
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="ContactsPreferencesTheme" parent="ContactsPreferencesBaseTheme">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 88b4be8f12..ae28353573 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,47 +14,48 @@
      limitations under the License.
 -->
 <resources>
-    <color name="ic_add_contact_shortcut_background">#F5F5F5</color>
+    <color name="ic_add_contact_shortcut_background">@color/primary_color_dark</color>
 
     <!-- 87% black -->
-    <color name="quantum_black_text">#dd000000</color>
+    <color name="quantum_black_text">@color/color_default_primary_text</color>
 
     <!-- 54% black -->
-    <color name="quantum_black_secondary_text">#89000000</color>
+    <color name="quantum_black_secondary_text">@color/color_default_secondary_text</color>
 
     <!-- 38% black -->
-    <color name="quantum_black_hint_text">#61000000</color>
+    <color name="quantum_black_hint_text">@color/color_default_secondary_text</color>
 
-    <color name="quickcontact_entry_sub_header_text_color">#737373</color>
-    <color name="quickcontact_entry_header_text_color">#202020</color>
+    <color name="quickcontact_entry_sub_header_text_color">@color/color_default_secondary_text</color>
+    <color name="quickcontact_entry_header_text_color">@color/color_default_primary_text</color>
 
-    <color name="action_bar_background">#2a56c6</color>
+    <color name="action_bar_background">@color/primary_color_dark</color>
 
-    <color name="nav_item_selected_background">#0f000000</color>
+    <color name="nav_item_selected_background">@color/selection_color</color>
     <color name="action_bar_button_text_color">@color/accent</color>
-    <color name="action_bar_button_menu_color">#ffffff</color>
+    <color name="action_bar_button_menu_color">@color/primary_text_color</color>
 
-    <color name="actionbar_background_color">@color/primary_color</color>
+    <color name="actionbar_background_color">@color/primary_color_dark</color>
 
-    <color name="contextual_selection_bar_color">#f6f6f6</color>
+    <color name="contextual_selection_bar_color">@color/selection_color</color>
     <!-- Color of the status bar above the contextual selection bar. -->
-    <color name="contextual_selection_bar_status_bar_color">#bababa</color>
+    <color name="contextual_selection_bar_status_bar_color">@color/primary_color_dark</color>
 
-    <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>
+    <color name="primary_color_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="primary_color">@lineageos.platform:color/color_default_primary</color>
+    <color name="selection_color">@lineageos.platform:color/color_default_selector</color>
+    <color name="group_primary_color_dark">@color/primary_color_dark</color>
+    <color name="group_primary_color">@color/primary_color</color>
 
     <color name="accent">@lineageos.platform:color/color_default_accent</color>
 
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
     <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
     <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
     <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
     <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
-    <color name="color_default_light_grey">@lineageos.platform:color/color_default_light_grey</color>
 
     <!-- Color of the selected tab underline -->
     <color name="contacts_accent_color">@lineageos.platform:color/color_default_accent</color>
@@ -62,16 +63,16 @@
     <color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
 
     <!-- Horizontal separator line should be 12% dark in the light theme. -->
-    <color name="divider_line_color_light">#e0e0e0</color>
+    <color name="divider_line_color_light">@lineageos.platform:color/color_default_divider</color>
 
     <!-- Color of the text on an ExpandingEntryCard button -->
-    <color name="expanding_entry_card_button_text_color">@android:color/black</color>
+    <color name="expanding_entry_card_button_text_color">@color/primary_text_color</color>
 
     <!-- Background color for an ExpandingEntryCard -->
-    <color name="expanding_entry_card_background_color">#ffffff</color>
+    <color name="expanding_entry_card_background_color">@color/color_default_background</color>
 
     <!-- Color of the margin for cards -->
-    <color name="card_margin_color">#f4f4f4</color>
+    <color name="card_margin_color">@color/divider_line_color_light</color>
 
     <color name="call_arrow_green">#2aad6f</color>
     <color name="call_arrow_red">#ff2e58</color>
@@ -79,23 +80,20 @@
     <!-- Background color of pinned header items. -->
     <color name="list_item_pinned_header_color">@color/background_primary</color>
 
-    <!-- Color of the mime-type icons inside the editor. 50% black. -->
-    <color name="editor_icon_color">#7f7f7f</color>
-
     <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
-    <color name="editor_disabled_text_color">#40000000</color>
+    <color name="editor_disabled_text_color">@color/color_default_secondary_text</color>
 
     <!-- Color of text on disabled link contacts button, 25% black. -->
-    <color name="disabled_button_text">#40000000</color>
+    <color name="disabled_button_text">@color/secondary_text_color</color>
 
     <!-- Color of background of disabled link contacts button, 15% black. -->
-    <color name="disabled_button_background">#26000000</color>
+    <color name="disabled_button_background">@color/secondary_text_color</color>
 
     <!-- Color of text of people names in contact list when item is disabled. 30% black -->
-    <color name="disabled_contact_list_name_text">#4D000000</color>
+    <color name="disabled_contact_list_name_text">@color/secondary_text_color</color>
 
     <!-- Color of background of all empty states. -->
-    <color name="empty_state_background">#efefef</color>
+    <color name="empty_state_background">@color/color_default_background</color>
 
     <!-- Colors of swipeRefreshLayout's spinning circle. -->
     <color name="swipe_refresh_color1">#0f9d58</color>
@@ -107,27 +105,27 @@
     <color name="ripple_material_dark">#a0ffffff</color>
 
     <!-- Divider color for header separator -->
-    <color name="primary_text_color">#363636</color>
+    <color name="primary_text_color">@color/color_default_primary_text</color>
 
-    <color name="secondary_text_color">@color/dialtacts_secondary_text_color</color>
+    <color name="secondary_text_color">@color/color_default_secondary_text</color>
 
     <!-- Text color for section header. -->
-    <color name="section_header_text_color">@color/color_default_gray1</color>
+    <color name="section_header_text_color">@color/color_default_primary_text</color>
 
     <!-- Color of the theme of the People app -->
-    <color name="people_app_theme_color">#363636</color>
+    <color name="people_app_theme_color">@color/primary_color</color>
 
     <!-- Color of the theme of the Dialer app -->
-    <color name="dialtacts_theme_color">#2a56c6</color>
+    <color name="dialtacts_theme_color">@color/accent</color>
 
     <!-- Color of image view placeholder. -->
-    <color name="image_placeholder">#DDDDDD</color>
+    <color name="image_placeholder">@color/color_default_secondary_text</color>
 
     <!-- Primary text color in the Phone app -->
-    <color name="dialtacts_primary_text_color">#333333</color>
+    <color name="dialtacts_primary_text_color">@color/primary_text_color</color>
 
     <!-- Secondary text color in the Phone app -->
-    <color name="dialtacts_secondary_text_color">#737373</color>
+    <color name="dialtacts_secondary_text_color">@color/secondary_text_color</color>
 
     <color name="shortcut_overlay_text_background">#7f000000</color>
 
@@ -190,29 +188,29 @@
     <color name="letter_tile_font_color">#ffffff</color>
 
     <!-- Color for icons in the actionbar -->
-    <color name="actionbar_icon_color">#ffffff</color>
+    <color name="actionbar_icon_color">@color/accent</color>
 
     <!-- Color of the title to the Frequently Contacted section -->
     <color name="frequently_contacted_title_color">@color/actionbar_background_color</color>
 
     <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
     phone_settings_actionbar_text_color-->
-    <color name="actionbar_text_color">#ffffff</color>
+    <color name="actionbar_text_color">@color/color_default_primary_text</color>
     <!-- 54% black for icons -->
     <color name="actionbar_icon_color_grey">#8C000000</color>
     <!-- 87% black for actionbar text -->
-    <color name="actionbar_text_color_black">#DF000000</color>
+    <color name="actionbar_text_color_black">@color/color_default_primary_text</color>
     <!-- Solid grey for status bar overlay-->
     <color name="actionbar_color_grey_solid">#777777</color>
 
     <!-- Text color of the search box text as entered by user  -->
-    <color name="searchbox_text_color">#000000</color>
+    <color name="searchbox_text_color">@color/color_default_primary_text</color>
     <!-- Background color of the search box -->
-    <color name="searchbox_background_color">#ffffff</color>
+    <color name="searchbox_background_color">@color/primary_color_dark</color>
 
-    <color name="searchbox_hint_text_color">#66000000</color>
+    <color name="searchbox_hint_text_color">@color/secondary_text_color</color>
 
-    <color name="search_shortcut_icon_color">@color/dialtacts_theme_color</color>
+    <color name="search_shortcut_icon_color">@color/accent</color>
 
     <!-- Color of the background of the contact detail and editor pages -->
     <color name="background_primary">@lineageos.platform:color/color_default_background</color>
@@ -223,46 +221,46 @@
     <color name="call_subject_limit_exceeded">#d1041c</color>
 
     <!-- Tint color for the call subject history icon. -->
-    <color name="call_subject_history_icon">#000000</color>
+    <color name="call_subject_history_icon">@color/color_default_background</color>
 
     <!-- Divider line on the call subject dialog. -->
-    <color name="call_subject_divider">#d8d8d8</color>
+    <color name="call_subject_divider">@color/divider_line_color_light</color>
 
     <!-- Text color for the SEND & CALL button on the call subject dialog. -->
     <color name="call_subject_button">#00c853</color>
 
     <!-- Background color for the call subject history view. -->
-    <color name="call_subject_history_background">#ffffff</color>
-    <color name="search_video_call_icon_tint">@color/searchbox_hint_text_color</color>
+    <color name="call_subject_history_background">@color/color_default_background</color>
+    <color name="search_video_call_icon_tint">@color/primary_color_dark</color>
 
     <!-- Text color for an action in a snackbar. -->
-    <color name="snackbar_action_text">#ffffff</color>
+    <color name="snackbar_action_text">@color/color_default_primary_text</color>
     <!-- Background color for a snackbar. -->
-    <color name="snackbar_background">#333333</color>
+    <color name="snackbar_background">@color/primary_color_dark</color>
 
     <!-- Color of account/custom filters -->
     <color name="account_filter_text_color">@color/actionbar_text_color_black</color>
-    <color name="custom_filter_divider">#dbdbdb</color>
+    <color name="custom_filter_divider">@color/divider_line_color_light</color>
 
     <color name="material_star_pink">#f50057</color>
 
     <!-- Primary text color in Contacts app -->
-    <color name="contacts_text_color">#333333</color>
+    <color name="contacts_text_color">@color/primary_text_color</color>
 
     <!-- tint color for device account icons -->
-    <color name="device_account_tint_color">#7f7f7f</color>
+    <color name="device_account_tint_color">@color/secondary_text_color</color>
 
     <!-- Background color for sync-off alert. -->
-    <color name="alert_background">#e0e0e0</color>
+    <color name="alert_background">@color/color_default_background</color>
 
     <!-- Divider color in navigation drawer -->
-    <color name="drawer_divider_color">#E5E5E5</color>
+    <color name="drawer_divider_color">@color/divider_line_color_light</color>
 
     <!-- Background color for the navigation drawer -->
-    <color name="navigation_drawer_background_color">@lineageos.platform:color/color_default_background</color>
+    <color name="navigation_drawer_background_color">@color/color_default_foreground</color>
 
     <!-- Background color for the current selected item in the navigation drawer -->
-    <color name="drawer_selected_color">#E8E8E8</color>
+    <color name="drawer_selected_color">@color/selection_color</color>
 
     <!-- Highlight color used in places such as ripples -->
     <color name="control_highlight_color">#1A000000</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0054363f9b..a5d9cf1c52 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2009 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.
@@ -13,8 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-           xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <style name="EditorActivityTheme" parent="@style/PeopleActivityTheme">
         <item name="actionBarStyle">@style/EditorActionBarStyle</item>
@@ -23,7 +21,7 @@
     </style>
 
     <style name="Theme.QuickContact" parent="@style/PeopleTheme">
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -40,7 +38,7 @@
         </item>
     </style>
 
-    <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+    <style name="PeopleBaseTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
         <!-- Style for the overflow button in the actionbar. -->
         <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
@@ -88,14 +86,26 @@
         <item name="favorites_padding_bottom">0dip</item>
         <!-- Popup menu -->
         <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
+        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>
+        <item name="android:navigationBarDividerColor">@color/primary_color_dark</item>
+        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
     </style>
 
-    <style name="LaunchScreenTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="PeopleTheme" parent="PeopleBaseTheme" />
+
+    <style name="LaunchScreenTheme" parent="LaunchScreenBaseTheme" />
+
+    <style name="LaunchScreenBaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
         <item name="colorPrimary">@color/primary_color</item>
         <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
+        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>
+        <item name="android:navigationBarDividerColor">@color/primary_color_dark</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
     </style>
+
     <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
         <item name="android:tint">@color/accent</item>
     </style>
@@ -107,7 +117,7 @@
         <item name="android:listSelector">?android:attr/listChoiceBackgroundIndicator</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="PeopleBaseThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
         <item name="actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -170,14 +180,19 @@
         <!-- Popup menu -->
         <item name="android:popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
         <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
+        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>
+        <item name="android:navigationBarDividerColor">@color/primary_color_dark</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
     </style>
 
+    <style name="PeopleThemeAppCompat" parent="PeopleBaseThemeAppCompat" />
+
     <style name="PopupMenuStyle" parent="@android:style/Widget.PopupMenu">
-        <item name="android:popupBackground">@android:color/white</item>
+        <item name="android:popupBackground">@color/color_default_background</item>
     </style>
 
     <style name="PopupMenuStyleAppCompat" parent="Widget.AppCompat.PopupMenu">
-        <item name="android:popupBackground">@android:color/white</item>
+        <item name="android:popupBackground">@color/primary_color_dark</item>
     </style>
 
     <style name="ContactsActionButtonStyle" parent="Widget.AppCompat.ActionButton">
@@ -193,7 +208,8 @@
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
          Light style, then it is impossible to tint the homeAsUp icon anything other than black -->
-    <style name="ContactsActionBarStyle" parent="@android:style/Widget.Material.ActionBar">
+    <style name="ContactsActionBarStyle" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+        <item name="background">@color/actionbar_background_color</item>
         <item name="android:background">@color/actionbar_background_color</item>
         <item name="android:titleTextStyle">@style/ContactsActionBarTitleText</item>
         <item name="android:backgroundStacked">@color/actionbar_background_color</item>
@@ -201,8 +217,7 @@
         <item name="android:icon">@android:color/transparent</item>
     </style>
 
-    <style name="ContactsActionBarStyleAppCompat"
-        parent="@style/Widget.AppCompat.ActionBar.Solid">
+    <style name="ContactsActionBarStyleAppCompat" parent="@style/Widget.AppCompat.ActionBar.Solid">
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:background">@color/actionbar_background_color</item>
         <item name="background">@color/actionbar_background_color</item>
@@ -248,10 +263,9 @@
     </style>
 
     <!-- Text in the action bar at the top of the screen -->
-    <style name="ContactsActionBarTitleText"
-        parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
+    <style name="ContactsActionBarTitleText" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
         <item name="android:textSize">20dp</item>
-        <item name="android:textColor">@color/accent</item>
+        <item name="android:textColor">@color/primary_text_color</item>
     </style>
 
     <style name="ContactsActionBarTitleTextAppCompat" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
@@ -260,14 +274,13 @@
     </style>
 
     <style name="ContactsActionBarTitleTextBlack" parent="@style/ContactsActionBarTitleTextAppCompat">
-        <item name="android:textColor">@color/accent</item>
+        <item name="android:textColor">@color/primary_text_color</item>
     </style>
 
     <!-- Action bar overflow menu icon. -->
-    <style name="ContactsActionBarOverflowQP"
-        parent="Widget.AppCompat.Light.ActionButton.Overflow">
+    <style name="ContactsActionBarOverflowQP" parent="Widget.AppCompat.Light.ActionButton.Overflow">
         <item name="android:src">@drawable/quantum_ic_more_vert_vd_theme_24</item>
-        <item name="android:tint">@color/action_bar_button_menu_color</item>
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <!-- Toolbar navigation button. -->
@@ -275,29 +288,68 @@
         <item name="android:tint">@color/accent</item>
     </style>
 
-    <style name="ContactPickerTheme" parent="PeopleActivityTheme">
-    </style>
+    <style name="ContactPickerTheme" parent="PeopleActivityTheme"></style>
 
-    <style name="ContactsPreferencesTheme" parent="@style/PeopleThemeAppCompat">
+    <style name="ContactsPreferencesBaseTheme" parent="Theme.AppCompat.DayNight">
+        <item name="android:toolbarStyle">@style/ContactsActionBarStyle</item>
+        <item name="toolbarStyle">@style/ContactsActionBarStyle</item>
+        <item name="actionBarStyle">@style/ContactsActionBarStyle</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
+        <item name="android:navigationBarColor">@color/navigation_drawer_background_color</item>
+        <item name="android:navigationBarDividerColor">@color/primary_color_dark</item>
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
+        <item name="android:statusBarColor">@color/primary_color_dark</item>
+        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
+        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/quantum_ic_arrow_back_vd_theme_24</item>
+        <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
+        <item name="alertDialogTheme">@style/ContactsAlertDialogTheme</item>
+
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:colorPrimary">@color/primary_color</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+    </style>
+
+    <style name="ActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+        <item name="background">@color/primary_color_dark</item>
+        <item name="displayOptions">showTitle</item>
+        <item name="icon">@color/primary_text_color</item>
+        <item name="colorControlNormal">@color/primary_text_color</item>
+        <item name="android:background">@color/primary_color_dark</item>
     </style>
 
+    <style name="ContactsPreferencesTheme" parent="ContactsPreferencesBaseTheme" />
+
     <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/accent</item>
-        <item name="android:textColorSecondary">@color/accent</item>
-
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="android:homeAsUpIndicator">@drawable/quantum_ic_arrow_back_vd_theme_24</item>
     </style>
 
     <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar">
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="android:navigationBarColor">@color/primary_color_dark</item>
+        <item name="android:navigationBarDividerColor">@color/primary_color_dark</item>
+        <item name="android:statusBarColor">@color/primary_color_dark</item>
     </style>
 
     <style name="NonPhoneDialogTheme" parent="@android:Theme.Material.Light.Dialog">
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:background">@color/color_default_foreground</item>
     </style>
 
     <style name="ConfirmAddDetailDialogTheme" parent="@android:style/Theme.Material.Light.Dialog.MinWidth">
         <item name="android:windowCloseOnTouchOutside">true</item>
+        <item name="android:colorAccent">@color/accent</item>
     </style>
 
     <style name="ContactEditorAccountsChangedActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar.MinWidth">
@@ -333,6 +385,19 @@
         <item name="android:gravity">start|center_vertical</item>
     </style>
 
+    <style name="CustomEditTextTheme" parent="@android:style/Theme.Material.Light">
+        <item name="android:background">@color/color_default_background</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
+        <item name="colorControlNormal">@color/accent</item>
+        <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlHighlight">@color/accent</item>
+        <item name="android:colorControlNormal">@color/accent</item>
+        <item name="android:colorControlActivated">@color/accent</item>
+        <item name="android:colorControlHighlight">@color/accent</item>
+    </style>
+
     <style name="EditKindSeparatorTextViewStyle" parent="ContactListSeparatorTextViewStyle">
         <item name="android:textAppearance">@style/EditKindTextAppearanceStyle</item>
     </style>
@@ -347,19 +412,24 @@
 
     <!-- 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">
+    <style name="ContactsAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="android:colorAccent">@color/accent</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:windowBackground">@color/color_default_foreground</item>
+        <item name="android:background">@color/color_default_foreground</item>
     </style>
 
-    <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
+    <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
         <item name="android:colorAccent">@color/accent</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="android:windowBackground">@color/color_default_foreground</item>
+        <item name="android:background">@color/color_default_foreground</item>
     </style>
 
     <style name="EditKindIconStyle">
         <item name="android:layout_width">24dp</item>
         <item name="android:layout_height">24dp</item>
-        <item name="android:tint">@color/editor_icon_color</item>
+        <item name="android:tint">@color/accent</item>
         <item name="android:layout_marginStart">16dp</item>
         <!-- We want 32dp of padding between these icon's and EditText's. Since EditText's have
             4dp of starting padding built in, we set this as 28dp. -->
@@ -397,7 +467,7 @@
     <!-- Text style for empty states (no account view, empty label). -->
     <style name="EmptyStateTextStyle">
         <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#000000</item>
+        <item name="android:textColor">@color/primary_text_color</item>
         <item name="android:alpha">0.54</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
@@ -454,12 +524,12 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
 
     <style name="TextAppearanceMedium" parent="@android:style/TextAppearance.Medium">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#000000</item>
+        <item name="android:textColor">@color/primary_text_color</item>
     </style>
 
     <style name="TextAppearanceSmall" parent="@android:style/TextAppearance.Small">
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#737373</item>
+        <item name="android:textColor">@color/primary_text_color</item>
     </style>
 
     <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
@@ -478,7 +548,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
         <item name="android:layout_height">match_parent</item>
     </style>
 
-    <style name="BackgroundOnlyTheme" parent="@android:style/Theme.Material.Light">
+    <style name="BackgroundOnlyTheme" parent="@style/PeopleActivityTheme">
         <item name="android:windowBackground">@null</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@null</item>
@@ -502,6 +572,8 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowElevation">0dp</item>
+
+        <item name="android:colorAccent">@color/accent</item>
     </style>
 
     <!-- Transparent/blank activity -->
@@ -533,6 +605,11 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
              and exit animations -->
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:statusBarColor">@color/contextual_selection_bar_status_bar_color</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
+        <item name="android:textColorPrimary">@color/primary_text_color</item>
+        <item name="android:textColorSecondary">@color/secondary_text_color</item>
     </style>
 
     <!-- Style for item in navigation drawer -->
@@ -613,4 +690,31 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
         <item name="android:textColor">@color/quantum_black_secondary_text</item>
         <item name="android:layout_width">match_parent</item>
     </style>
+
+    <style name="customDialogNoActionBar" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar" >
+        <item name="android:colorAccent">@color/accent</item>
+    </style>
+
+    <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="tint">@color/accent</item>
+        <item name="android:src">@drawable/quantum_ic_arrow_back_vd_theme_24</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:paddingTop">15dp</item>
+        <item name="android:paddingBottom">10dp</item>
+    </style>
+
+    <style name="Theme.QuickContact.White.TopBar" parent="@style/Theme.QuickContact">
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted.White</item>
+        <item name="android:homeAsUpIndicator">@drawable/quantum_ic_arrow_back_white_vd_theme_24</item>
+        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQPWhite</item>
+    </style>
+
+    <style name="Toolbar.Button.Navigation.Tinted.White" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="tint">@android:color/white</item>
+    </style>
+
+    <style name="ContactsActionBarOverflowQPWhite" parent="Widget.AppCompat.Light.ActionButton.Overflow">
+        <item name="android:src">@drawable/quantum_ic_more_vert_white_vd_theme_24</item>
+        <item name="android:tint">@android:color/white</item>
+    </style>
 </resources>
diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index 3a71f6e501..e86bac1683 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -14,75 +14,105 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android" >
     
-    <Preference
-	android:icon="@null"
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+	    android:icon="@null"
         android:key="contacts_info"
         android:summary="@string/preferences_app_info"
         android:title="@string/preferences_app_info_title" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_build_version_key"
         android:title="@string/about_build_version">
-	    
-        <intent
-            android:action="android.intent.action.VIEW"
-	    android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases" />
+    </com.android.contacts.preference.CustomPreference>
 
-    </Preference>
-
-    <Preference
-	android:icon="@null"
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+	    android:icon="@null"
         android:key="about_app"
         android:title="@string/preferences_about_app">
+    </com.android.contacts.preference.CustomPreference>
 
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/LineageOS/android_packages_apps_Contacts" />
-
-    </Preference>
-
-    <Preference
-	android:icon="@null"
-	android:title="@string/preferences_licence">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE" />
-    </Preference>
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+        android:icon="@null"
+        android:key="license"
+        android:title="@string/preferences_licence" >
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
-	android:icon="@null"   
-	android:title="@string/preferences_authors">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
-    </Preference>
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+        android:icon="@null"
+        android:key="authors"
+        android:title="@string/preferences_authors">
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
-	android:icon="@null"
-	android:title="@string/preferences_source_code">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
-    </Preference>
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+        android:icon="@null"
+        android:key="source_code"
+        android:title="@string/preferences_source_code">
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_open_source_licenses_key"
         android:title="@string/about_open_source_licenses"
         android:summary="@string/about_open_source_licenses_summary"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_privacy_policy_key"
         android:title="@string/about_privacy_policy">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_terms_of_service_key"
         android:title="@string/about_terms_of_service">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 </PreferenceScreen>
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index c969cd24f1..31f2db7e1d 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -14,63 +14,119 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="myInfo"
         android:title="@string/settings_my_info_title"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="accounts"
         android:title="@string/settings_accounts">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.DefaultAccountPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="defaultAccount"
         android:title="@string/default_editor_account"
         android:dialogTitle="@string/default_editor_account" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="customContactsFilter"
         android:title="@string/menu_contacts_filter"/>
 
     <com.android.contacts.preference.SortOrderPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="sortOrder"
         android:title="@string/display_options_sort_list_by"
         android:dialogTitle="@string/display_options_sort_list_by" />
 
     <com.android.contacts.preference.DisplayOrderPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="displayOrder"
         android:title="@string/display_options_view_names_as"
         android:dialogTitle="@string/display_options_view_names_as" />
 
     <com.android.contacts.preference.PhoneticNameDisplayPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="phoneticNameDisplay"
         android:title="@string/display_options_phonetic_name_fields"
         android:dialogTitle="@string/display_options_phonetic_name_fields"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="import"
         android:title="@string/menu_import"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="export"
         android:title="@string/menu_export"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="blockedNumbers"
         android:title="@string/menu_blocked_numbers" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="about"
         android:title="@string/setting_about"
diff --git a/src/com/android/contacts/NonPhoneActivity.java b/src/com/android/contacts/NonPhoneActivity.java
index ba56d70908..6bf7930092 100644
--- a/src/com/android/contacts/NonPhoneActivity.java
+++ b/src/com/android/contacts/NonPhoneActivity.java
@@ -73,7 +73,7 @@ public class NonPhoneActivity extends ContactsActivity {
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final AlertDialog alertDialog;
-            alertDialog = new AlertDialog.Builder(getActivity(), R.style.NonPhoneDialogTheme)
+            alertDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                     .create();
             alertDialog.setTitle(R.string.non_phone_caption);
             alertDialog.setMessage(getArgumentPhoneNumber());
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 3b862e4b8e..fce6659e18 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -466,7 +466,7 @@ public class ActionBarAdapter implements OnCloseListener {
                                         R.color.actionbar_color_grey_solid);
                             } else {
                                 iconColor = mActivity.getResources().getColor(
-                                        R.color.color_default_blue1);
+                                        R.color.accent);
                             }
                             overflow.setImageTintList(ColorStateList.valueOf(iconColor));
                         }
diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index dea134b5f5..f0117eeabe 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -203,7 +203,7 @@ public class ContactEditorAccountsChangedActivity extends Activity
         if (mDialog != null && mDialog.isShowing()) {
             mDialog.dismiss();
         }
-        mDialog = new AlertDialog.Builder(this)
+        mDialog = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                 .setView(view)
                 .setOnCancelListener(new DialogInterface.OnCancelListener() {
                     @Override
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index a2a449f6c9..f079252179 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -386,14 +386,6 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements
         if (Intent.ACTION_INSERT.equals(action)) {
             DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT);
         }
-      //  this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
-
     }
 
     @Override
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 7b66ee040e..a9c56afe6a 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -135,15 +135,6 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
 
         prepareSearchViewAndActionBar(savedState);
         configureActivityTitle();
-
-       // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
     }
 
     public boolean isSelectionMode() {
@@ -701,7 +692,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
         final Drawable searchIcon = searchItem.getIcon();
         if (searchIcon != null) {
             searchIcon.mutate().setColorFilter(ContextCompat.getColor(this,
-                    R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
+                    R.color.accent), PorterDuff.Mode.SRC_ATOP);
         }
         return true;
     }
diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java
index 255420e3ae..4ab02ec0ee 100644
--- a/src/com/android/contacts/activities/LicenseActivity.java
+++ b/src/com/android/contacts/activities/LicenseActivity.java
@@ -15,6 +15,7 @@
  */
 package com.android.contacts.activities;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBar;
@@ -22,6 +23,11 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.webkit.WebView;
+import android.content.res.Configuration;
+import android.widget.TextView;
+
+import androidx.webkit.WebViewFeature;
+import androidx.webkit.WebSettingsCompat;
 
 import com.android.contacts.R;
 
@@ -42,16 +48,15 @@ public class LicenseActivity extends AppCompatActivity {
         mWebView.loadUrl(LICENSE_FILE);
         final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
+            actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+            actionBar.setDisplayShowCustomEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setCustomView(R.layout.custom_settings_toolbar);
+            TextView titleTextView = actionBar.getCustomView().findViewById(R.id.title);
+            titleTextView.setText(R.string.activity_title_licenses);
         }
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
+        handleDayNightMode(mWebView);
     }
 
     @Override
@@ -68,4 +73,23 @@ public class LicenseActivity extends AppCompatActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    private void handleDayNightMode(WebView webView) {
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
+            if (isInDarkMode()) {
+                WebSettingsCompat.setForceDark(webView.getSettings(), WebSettingsCompat.FORCE_DARK_ON);
+            } else {
+                WebSettingsCompat.setForceDark(webView.getSettings(), WebSettingsCompat.FORCE_DARK_AUTO);
+            }
+        }
+    }
+
+
+    private boolean isInDarkMode() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) {
+            int nightModeFlags = getApplication().getApplicationContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            return nightModeFlags == Configuration.UI_MODE_NIGHT_YES;
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index dc6efff619..6915a61a20 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -196,7 +196,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements
     private ContactsActionBarDrawerToggle mToggle;
     private Toolbar mToolbar;
 
-    public static int color_default_blue1;
     public static int color_default_primary_text;
 
 
@@ -392,7 +391,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         mToggle = new ContactsActionBarDrawerToggle(this, mDrawerLayout, mToolbar,
                 R.string.navigation_drawer_open, R.string.navigation_drawer_close);
         mDrawerLayout.setDrawerListener(mToggle);
-        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1));
+        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.accent));
         // Set fallback handler for when drawer is disabled.
         mToggle.setToolbarNavigationClickListener(new View.OnClickListener() {
             @Override
@@ -652,7 +651,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         LocalBroadcastManager.getInstance(this).registerReceiver(mSaveServiceListener,
                 new IntentFilter(ContactSaveService.BROADCAST_GROUP_DELETED));
 
-        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1));
+        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.accent));
     }
 
     public void updateStatusBarBackground() {
@@ -1321,20 +1320,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements
      * */
 
     private int fetchAccentColor() {
-
-       // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
         int color=getResources().getColor(R.color.accent);
 
         color_default_primary_text=getResources().getColor(R.color.color_default_primary_text);
-        color_default_blue1=getResources().getColor(R.color.color_default_blue1);
-        //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent));
         getSupportActionBar().getThemedContext();
 
         mToolbar.setTitleTextColor(color_default_primary_text);
diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java
index 8c943640e0..634dd589c6 100755
--- a/src/com/android/contacts/activities/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java
@@ -219,7 +219,7 @@ public final class ShowOrCreateActivity extends ContactsActivity
                 final CharSequence message = getResources().getString(
                         R.string.add_contact_dlg_message_fmt, mCreateDescrip);
 
-                return new AlertDialog.Builder(this)
+                return new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                         .setMessage(message)
                         .setPositiveButton(android.R.string.ok,
                                 new IntentClickListener(this, createIntent))
diff --git a/src/com/android/contacts/detail/ContactDisplayUtils.java b/src/com/android/contacts/detail/ContactDisplayUtils.java
index ef9124aed2..edf01d4ce8 100644
--- a/src/com/android/contacts/detail/ContactDisplayUtils.java
+++ b/src/com/android/contacts/detail/ContactDisplayUtils.java
@@ -160,8 +160,8 @@ public class ContactDisplayUtils {
         if (!isDirectoryEntry && !isUserProfile) {
             starredMenuItem.setVisible(true);
             final int resId = isStarred
-                    ? R.drawable.quantum_ic_star_vd_theme_24
-                    : R.drawable.quantum_ic_star_border_vd_theme_24;
+                    ? R.drawable.quantum_ic_star_white_vd_theme_24
+                    : R.drawable.quantum_ic_star_border_white_vd_theme_24;
             starredMenuItem.setIcon(resId);
             starredMenuItem.setChecked(isStarred);
             starredMenuItem.setTitle(isStarred ? R.string.menu_removeStar : R.string.menu_addStar);
diff --git a/src/com/android/contacts/dialog/ClearFrequentsDialog.java b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
index 7591de3ff7..bf012e067f 100644
--- a/src/com/android/contacts/dialog/ClearFrequentsDialog.java
+++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
@@ -70,7 +70,7 @@ public class ClearFrequentsDialog extends DialogFragment {
                 task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         };
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
             .setTitle(R.string.clearFrequentsConfirmation_title)
             .setMessage(R.string.clearFrequentsConfirmation)
             .setNegativeButton(android.R.string.cancel, null)
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index 5bb65775a9..f91f07f986 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -17,6 +17,7 @@
 package com.android.contacts.drawer;
 
 import android.app.Activity;
+import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.provider.ContactsContract.DisplayNameSources;
@@ -135,7 +136,7 @@ public class DrawerAdapter extends BaseAdapter {
         // Misc Items
         mMiscItems.add(new DividerItem());
         mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings,
-                lineageos.platform.R.drawable.ic_settings));
+                R.drawable.quantum_ic_settings_vd_theme_24));
         if (HelpUtils.isHelpAndFeedbackAvailable()) {
             mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
                     R.drawable.quantum_ic_help_vd_theme_24));
@@ -387,8 +388,9 @@ public class DrawerAdapter extends BaseAdapter {
         textView.setText(item.text);
         final ImageView iconView = (ImageView) result.findViewById(R.id.icon);
         iconView.setImageResource(item.icon);
-       // iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey));
-        iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey),  android.graphics.PorterDuff.Mode.MULTIPLY);
+        if (item.viewType != VIEW_TYPE_ACCOUNT_ENTRY) {
+            iconView.setColorFilter(mActivity.getResources().getColor(R.color.accent, null), PorterDuff.Mode.SRC_ATOP);
+        }
 
         result.setId(item.id);
         updateSelectedStatus(textView, iconView, false);
diff --git a/src/com/android/contacts/editor/CancelEditDialogFragment.java b/src/com/android/contacts/editor/CancelEditDialogFragment.java
index 7f398577cb..9852267179 100644
--- a/src/com/android/contacts/editor/CancelEditDialogFragment.java
+++ b/src/com/android/contacts/editor/CancelEditDialogFragment.java
@@ -43,7 +43,7 @@ public class CancelEditDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.cancel_confirmation_dialog_message)
                 .setPositiveButton(R.string.cancel_confirmation_dialog_cancel_editing_button,
diff --git a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java
index d238c384c5..3a7bc8907b 100644
--- a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java
@@ -69,7 +69,7 @@ public class JoinContactConfirmationDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         builder.setMessage(R.string.joinConfirmation);
         builder.setPositiveButton(R.string.joinConfirmation_positive_button,
                 new DialogInterface.OnClickListener() {
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index df4c5f9924..00e5187dc1 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -439,7 +439,7 @@ public abstract class LabeledEditorView extends LinearLayout implements Editor,
      * no empty text is allowed in any custom label.
      */
     private Dialog createCustomDialog() {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.ContactsAlertDialogTheme);
         final LayoutInflater layoutInflater = LayoutInflater.from(builder.getContext());
         builder.setTitle(R.string.customLabelPickerTitle);
 
diff --git a/src/com/android/contacts/editor/PhotoSourceDialogFragment.java b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java
index 4ca4d30d03..c2a6b603ee 100644
--- a/src/com/android/contacts/editor/PhotoSourceDialogFragment.java
+++ b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java
@@ -72,30 +72,27 @@ public class PhotoSourceDialogFragment extends DialogFragment {
         for (int i = 0; i < items.length; i++) {
             items[i] = choices.get(i).toString();
         }
-        final OnClickListener clickListener = new OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int which) {
-                final Listener listener = (Listener) getActivity();
-                final ChoiceListItem choice = choices.get(which);
-                switch (choice.getId()) {
-                    case ChoiceListItem.ID_REMOVE:
-                        listener.onRemovePictureChosen();
-                        break;
-                    case ChoiceListItem.ID_TAKE_PHOTO:
-                        listener.onTakePhotoChosen();
-                        break;
-                    case ChoiceListItem.ID_PICK_PHOTO:
-                        listener.onPickFromGalleryChosen();
-                        break;
-                }
-                dismiss();
+        final OnClickListener clickListener = (dialogInterface, which) -> {
+            final Listener listener = (Listener) getActivity();
+            final ChoiceListItem choice = choices.get(which);
+            switch (choice.getId()) {
+                case ChoiceListItem.ID_REMOVE:
+                    listener.onRemovePictureChosen();
+                    break;
+                case ChoiceListItem.ID_TAKE_PHOTO:
+                    listener.onTakePhotoChosen();
+                    break;
+                case ChoiceListItem.ID_PICK_PHOTO:
+                    listener.onPickFromGalleryChosen();
+                    break;
             }
+            dismiss();
         };
 
         // Build the AlertDialog
         final TextView title = (TextView) View.inflate(getActivity(), R.layout.dialog_title, null);
         title.setText(R.string.menu_change_photo);
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         builder.setCustomTitle(title);
         builder.setItems(items, clickListener);
         builder.setNegativeButton(android.R.string.cancel, /* listener =*/ null);
diff --git a/src/com/android/contacts/editor/PickRawContactDialogFragment.java b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
index 5a9c9fd07f..2efd6fbc94 100644
--- a/src/com/android/contacts/editor/PickRawContactDialogFragment.java
+++ b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
@@ -176,7 +176,7 @@ public class PickRawContactDialogFragment extends DialogFragment {
             throw new IllegalArgumentException("Dialog created with null RawContactsMetadata");
         }
 
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         mAdapter = new RawContactAccountListAdapter(getContext(), metadata);
         if (metadata.showReadOnly) {
             builder.setTitle(R.string.contact_editor_pick_linked_contact_dialog_title);
diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
index 3b41c86ade..71e2b6aab0 100644
--- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -90,7 +90,7 @@ public final class SelectAccountDialogFragment extends DialogFragment
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         final Bundle args = getArguments();
 
         mAccountsAdapter = new AccountsListAdapter(builder.getContext());
diff --git a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
index 9b4e2348cc..6bda7f1de4 100644
--- a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
@@ -77,7 +77,7 @@ public class SplitContactConfirmationDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         builder.setMessage(mHasPendingChanges
                 ? R.string.splitConfirmationWithPendingChanges
                 : R.string.splitConfirmation);
diff --git a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
index df2277315a..32b0823f5c 100644
--- a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
@@ -44,7 +44,7 @@ public class SuggestionEditConfirmationDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.aggregation_suggestion_edit_dialog_message)
                 .setPositiveButton(android.R.string.yes,
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 1b51c52080..aa941e893c 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -17,6 +17,7 @@
 package com.android.contacts.editor;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
@@ -279,6 +280,7 @@ public class TextFieldsEditorView extends LabeledEditorView {
                     LayoutParams.WRAP_CONTENT));
             fieldView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                     getResources().getDimension(R.dimen.editor_form_text_size));
+            fieldView.setBackgroundTintList(ColorStateList.valueOf(getContext().getColor(R.color.accent)));
             fieldView.setHintTextColor(mHintTextColorUnfocused);
             mFieldEditTexts[index] = fieldView;
             fieldView.setId(vig.getId(state, kind, entry, index));
diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
index 392bf249c5..498d5fa6e9 100644
--- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java
+++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
@@ -143,7 +143,7 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements
         title.setText(mIsInsert
                 ? R.string.group_name_dialog_insert_title
                 : R.string.group_name_dialog_update_title);
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), getTheme())
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setCustomTitle(title)
                 .setView(R.layout.group_name_edit_dialog)
                 .setNegativeButton(android.R.string.cancel, new OnClickListener() {
@@ -162,48 +162,45 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements
         final AlertDialog alertDialog = builder.create();
         alertDialog.getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialog) {
-                mGroupNameEditText = (EditText) alertDialog.findViewById(android.R.id.text1);
-                mGroupNameTextLayout =
-                        (TextInputLayout) alertDialog.findViewById(R.id.text_input_layout);
-                if (!TextUtils.isEmpty(mGroupName)) {
-                    mGroupNameEditText.setText(mGroupName);
-                    // Guard against already created group names that are longer than the max
-                    final int maxLength = getResources().getInteger(
-                            R.integer.group_name_max_length);
-                    mGroupNameEditText.setSelection(
-                            mGroupName.length() > maxLength ? maxLength : mGroupName.length());
-                }
-                showInputMethod(mGroupNameEditText);
+        alertDialog.setOnShowListener((DialogInterface.OnShowListener) dialog -> {
+            mGroupNameEditText = (EditText) alertDialog.findViewById(android.R.id.text1);
+            mGroupNameTextLayout =
+                    (TextInputLayout) alertDialog.findViewById(R.id.text_input_layout);
+            if (!TextUtils.isEmpty(mGroupName)) {
+                mGroupNameEditText.setText(mGroupName);
+                // Guard against already created group names that are longer than the max
+                final int maxLength = getResources().getInteger(
+                        R.integer.group_name_max_length);
+                mGroupNameEditText.setSelection(
+                        mGroupName.length() > maxLength ? maxLength : mGroupName.length());
+            }
+            showInputMethod(mGroupNameEditText);
 
-                final Button createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
-                createButton.setEnabled(!TextUtils.isEmpty(getGroupName()));
+            final Button createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+            createButton.setEnabled(!TextUtils.isEmpty(getGroupName()));
 
-                // Override the click listener to prevent dismissal if creating a duplicate group.
-                createButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        maybePersistCurrentGroupName(v);
-                    }
-                });
-                mGroupNameEditText.addTextChangedListener(new TextWatcher() {
-                    @Override
-                    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                    }
+            // Override the click listener to prevent dismissal if creating a duplicate group.
+            createButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    maybePersistCurrentGroupName(v);
+                }
+            });
+            mGroupNameEditText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
 
-                    @Override
-                    public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    }
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                }
 
-                    @Override
-                    public void afterTextChanged(Editable s) {
-                        mGroupNameTextLayout.setError(null);
-                        createButton.setEnabled(!TextUtils.isEmpty(s));
-                    }
-                });
-            }
+                @Override
+                public void afterTextChanged(Editable s) {
+                    mGroupNameTextLayout.setError(null);
+                    createButton.setEnabled(!TextUtils.isEmpty(s));
+                }
+            });
         });
 
         return alertDialog;
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 240588bd17..5a8b0543bb 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -302,7 +302,7 @@ public class ContactDeletionInteraction extends Fragment
     }
 
     private void showDialog(int messageId, int positiveButtonId, final Uri contactUri) {
-        mDialog = new AlertDialog.Builder(getActivity())
+        mDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(messageId)
                 .setNegativeButton(android.R.string.cancel, null)
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index efd1f081cd..926ce9acf0 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -270,34 +270,23 @@ public class ContactMultiDeletionInteraction extends Fragment
 
     private void showDialog(int messageId, int positiveButtonId, final long[] contactIds,
             final String[] namesArray) {
-        mDialog = new AlertDialog.Builder(getActivity())
+        mDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(messageId)
                 .setNegativeButton(android.R.string.cancel, null)
                 .setPositiveButton(positiveButtonId,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                            doDeleteContact(contactIds, namesArray);
-                        }
-                    }
+                        (dialog, whichButton) -> doDeleteContact(contactIds, namesArray)
                 )
                 .create();
 
-        mDialog.setOnDismissListener(new OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                mIsLoaderActive = false;
-                mDialog = null;
-            }
+        mDialog.setOnDismissListener(dialog -> {
+            mIsLoaderActive = false;
+            mDialog = null;
         });
 
-        mDialog.setOnShowListener( new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface arg0) {
-                mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
-                mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
-            }
+        mDialog.setOnShowListener(arg0 -> {
+            mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.accent));
+            mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.accent));
         });
 
         mDialog.show();
diff --git a/src/com/android/contacts/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java
index c7ce072302..104b984426 100644
--- a/src/com/android/contacts/interactions/ExportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ExportDialogFragment.java
@@ -160,10 +160,8 @@ public class ExportDialogFragment extends DialogFragment {
                 }
             }
         };
-        final TextView title = (TextView) View.inflate(getActivity(), R.layout.dialog_title, null);
-        title.setText(R.string.dialog_export);
-        return new AlertDialog.Builder(getActivity())
-                .setCustomTitle(title)
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
+                .setTitle(R.string.dialog_export)
                 .setSingleChoiceItems(adapter, -1, clickListener)
                 .create();
     }
diff --git a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
index 01361b2a37..c686da5872 100644
--- a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
@@ -48,7 +48,7 @@ public class GroupDeletionDialogFragment extends DialogFragment {
         String label = getArguments().getString(ARG_LABEL);
         String message = getActivity().getString(R.string.delete_group_dialog_message, label);
 
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(message)
                 .setPositiveButton(android.R.string.ok,
diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index 7f41823a89..bf99f49358 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -207,7 +207,7 @@ public class ImportDialogFragment extends DialogFragment {
             }
         };
 
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), getTheme())
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setTitle(R.string.dialog_import)
                 .setNegativeButton(android.R.string.cancel, null);
         if (adapter.isEmpty()) {
@@ -220,8 +220,8 @@ public class ImportDialogFragment extends DialogFragment {
         dialog.setOnShowListener( new DialogInterface.OnShowListener() {
             @Override
             public void onShow(DialogInterface arg0) {
-                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
-                //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1));
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.accent));
+                //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.accent));
             }
         });
 
diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java
index ab26cb45fa..6b2f755e4a 100644
--- a/src/com/android/contacts/list/AccountFilterActivity.java
+++ b/src/com/android/contacts/list/AccountFilterActivity.java
@@ -74,7 +74,7 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte
             int resINT = getResources().getIdentifier(resName, "drawable", getPackageName());
 
             final Drawable upArrow = getResources().getDrawable(resINT);
-            upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
+            upArrow.setColorFilter(getResources().getColor(R.color.accent), PorterDuff.Mode.SRC_ATOP);
             actionBar.setHomeAsUpIndicator(upArrow);
 
             actionBar.setDisplayHomeAsUpEnabled(true);
@@ -92,14 +92,6 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte
         filters.add(ContactListFilter.createFilterWithType(
                 ContactListFilter.FILTER_TYPE_CUSTOM));
         mListView.setAdapter(new FilterListAdapter(this, filters, mCurrentFilterType));
-      //  this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
     }
 
     @Override
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index aafe5b188d..3575a92cef 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -1157,7 +1157,7 @@ public class ContactListItemView extends ViewGroup
             mNameTextView.setSingleLine(true);
             mNameTextView.setEllipsize(getTextEllipsis());
             mNameTextView.setTextColor(ResourcesCompat.getColorStateList(getResources(),
-                    R.color.contact_list_name_text_color, getContext().getTheme()));
+                    R.color.color_default_primary_text, getContext().getTheme()));
             mNameTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mNameTextViewTextSize);
             // Manually call setActivated() since this view may be added after the first
             // setActivated() call toward this whole item view.
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index e0e60dabf7..4ba748cfc1 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -137,7 +137,7 @@ public class CustomContactListFilterActivity extends Activity implements
             int resINT = getResources().getIdentifier(resName, "drawable", getPackageName());
 
             final Drawable upArrow = getResources().getDrawable(resINT);
-            upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
+            upArrow.setColorFilter(getResources().getColor(R.color.accent), PorterDuff.Mode.SRC_ATOP);
             actionBar.setHomeAsUpIndicator(upArrow);
 
             // android.R.id.home will be triggered in onOptionsItemSelected()
@@ -146,14 +146,6 @@ public class CustomContactListFilterActivity extends Activity implements
 
 
         }
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
     }
 
     public static class CustomFilterConfigurationLoader extends ListenableFutureLoader<AccountSet> {
@@ -816,7 +808,7 @@ public class CustomContactListFilterActivity extends Activity implements
         if (syncMode == SYNC_MODE_EVERYTHING && shouldSyncUngrouped
                 && !child.equals(account.mUngrouped)) {
             // Warn before removing this group when it would cause ungrouped to stop syncing
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme);
             final CharSequence removeMessage = this.getString(
                     R.string.display_warn_remove_ungrouped, title);
             builder.setTitle(R.string.menu_sync_remove);
@@ -1008,7 +1000,7 @@ public class CustomContactListFilterActivity extends Activity implements
 
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
-            return new AlertDialog.Builder(getActivity(), getTheme())
+            return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                     .setMessage(R.string.leave_customize_confirmation_dialog_message)
                     .setNegativeButton(android.R.string.no, null)
                     .setPositiveButton(android.R.string.yes, this)
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index bb553ad66f..f153db74a4 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -1004,7 +1004,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
         if (searchIcon != null) {
 
             searchIcon.mutate().setColorFilter(ContextCompat.getColor(mActivity,
-                    R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
+                    R.color.accent), PorterDuff.Mode.SRC_ATOP);
         }
     }
 
@@ -1036,7 +1036,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
             final Drawable icon = menu.getItem(i).getIcon();
             if (icon != null && !isSearchOrSelectionMode) {
                 icon.mutate().setColorFilter(ContextCompat.getColor(getContext(),
-                        R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
+                        R.color.accent), PorterDuff.Mode.SRC_ATOP);
             }
         }
     }
diff --git a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
index 08822d10c6..7be9fc8899 100644
--- a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
+++ b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
@@ -65,7 +65,7 @@ public class EnableGlobalSyncDialogFragment extends DialogFragment{
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final Listener targetListener = (Listener) getTargetFragment();
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         builder.setTitle(R.string.turn_auto_sync_on_dialog_title)
                 .setMessage(R.string.turn_auto_sync_on_dialog_body)
                 .setPositiveButton(R.string.turn_auto_sync_on_dialog_confirm_btn,
diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
index 62dcd76259..1c9fc0ca82 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -35,6 +35,11 @@ import com.android.contacts.activities.LicenseActivity;
  */
 public class AboutPreferenceFragment extends PreferenceFragment {
 
+    public static final String BUILD_VERSION_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases";
+    public static final String ABOUT_APP_URL = "https://github.com/LineageOS/android_packages_apps_Contacts";
+    public static final String LICENSE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE";
+    public static final String AUTHORS_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String SOURCE_CODE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
     public static final String PRIVACY_POLICY_URL = "https://e.foundation/legal-notice-privacy/";
     public static final String TERMS_OF_SERVICE_URL = "https://e.foundation/legal-notice-privacy/";
 
@@ -60,31 +65,48 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             // Nothing
         }
 
-        final Preference licensePreference = findPreference(
-                getString(R.string.pref_open_source_licenses_key));
-        licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));
-
+        final Preference buildVersionPreference = findPreference("pref_build_version");
+        final Preference aboutAppPreference = findPreference("about_app");
+        final Preference licensePreference = findPreference("license");
+        final Preference authorsPreference = findPreference("authors");
+        final Preference sourceCodePreference = findPreference("source_code");
         final Preference privacyPolicyPreference = findPreference("pref_privacy_policy");
         final Preference termsOfServicePreference = findPreference("pref_terms_of_service");
+        final Preference openSourceLicensePreference = findPreference(getString(R.string.pref_open_source_licenses_key));
 
         final Preference.OnPreferenceClickListener listener =
-                new Preference.OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                try {
-                    if (preference == privacyPolicyPreference) {
-                        startActivityForUrl(PRIVACY_POLICY_URL);
-                    } else if (preference == termsOfServicePreference) {
-                        startActivityForUrl(TERMS_OF_SERVICE_URL);
+                preference -> {
+                    try {
+                        if (preference == privacyPolicyPreference) {
+                            startActivityForUrl(PRIVACY_POLICY_URL);
+                        } else if (preference == termsOfServicePreference) {
+                            startActivityForUrl(TERMS_OF_SERVICE_URL);
+                        } else if (preference == buildVersionPreference) {
+                            startActivityForUrl(BUILD_VERSION_URL);
+                        } else if (preference == aboutAppPreference) {
+                            startActivityForUrl(ABOUT_APP_URL);
+                        } else if (preference == licensePreference) {
+                            startActivityForUrl(LICENSE_URL);
+                        } else if (preference == authorsPreference) {
+                            startActivityForUrl(AUTHORS_URL);
+                        } else if (preference == sourceCodePreference) {
+                            startActivityForUrl(SOURCE_CODE_URL);
+                        } else if (preference == openSourceLicensePreference) {
+                            startActivity(new Intent(getActivity(), LicenseActivity.class));
+                        }
+                    } catch (ActivityNotFoundException ex) {
+                        Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
+                                Toast.LENGTH_SHORT).show();
                     }
-                } catch (ActivityNotFoundException ex) {
-                    Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
-                            Toast.LENGTH_SHORT).show();
-                }
-                return true;
-            }
-        };
-
+                    return true;
+                };
+
+        buildVersionPreference.setOnPreferenceClickListener(listener);
+        aboutAppPreference.setOnPreferenceClickListener(listener);
+        licensePreference.setOnPreferenceClickListener(listener);
+        authorsPreference.setOnPreferenceClickListener(listener);
+        sourceCodePreference.setOnPreferenceClickListener(listener);
+        openSourceLicensePreference.setOnPreferenceClickListener(listener);
         privacyPolicyPreference.setOnPreferenceClickListener(listener);
         termsOfServicePreference.setOnPreferenceClickListener(listener);
     }
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 8d74e387d2..78ac784d1e 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -18,6 +18,7 @@ package com.android.contacts.preference;
 
 import android.content.res.Configuration;
 import android.database.Cursor;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
@@ -36,6 +37,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.android.contacts.R;
 import com.android.contacts.editor.SelectAccountDialogFragment;
@@ -76,7 +78,11 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
 
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
+            actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+            actionBar.setDisplayShowCustomEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setCustomView(R.layout.custom_settings_toolbar);
         }
 
         mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this);
@@ -102,14 +108,6 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
                 setActivityTitle(R.string.activity_title_settings);
             }
         }
-        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-
-        if(Build.VERSION.SDK_INT >= 27) {
-            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |
-                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |
-                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-
     }
 
     @Override
@@ -207,10 +205,9 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
     private void setActivityTitle(@StringRes int res) {
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
-            //actionBar.setTitle(res);
-            String title=this.getResources().getString(res);
-
-            actionBar.setTitle(Html.fromHtml("<font color='#007FFF'>"+title+" </font>"));
+            actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
+            TextView titleTextView = actionBar.getCustomView().findViewById(R.id.title);
+            titleTextView.setText(res);
 
         }
     }
diff --git a/src/com/android/contacts/preference/CustomPreference.java b/src/com/android/contacts/preference/CustomPreference.java
new file mode 100644
index 0000000000..9727ac5e87
--- /dev/null
+++ b/src/com/android/contacts/preference/CustomPreference.java
@@ -0,0 +1,41 @@
+package com.android.contacts.preference;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class CustomPreference extends Preference {
+    public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public CustomPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> {
+            if (getOnPreferenceClickListener() != null) {
+                getOnPreferenceClickListener().onPreferenceClick(this);
+            }
+        });
+        return view;
+    }
+}
diff --git a/src/com/android/contacts/preference/DefaultAccountPreference.java b/src/com/android/contacts/preference/DefaultAccountPreference.java
index d43b8d5748..4160be27a2 100644
--- a/src/com/android/contacts/preference/DefaultAccountPreference.java
+++ b/src/com/android/contacts/preference/DefaultAccountPreference.java
@@ -22,6 +22,7 @@ import android.content.DialogInterface;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.model.account.AccountInfo;
 import com.android.contacts.model.account.AccountWithDataSet;
@@ -109,4 +110,16 @@ public class DefaultAccountPreference extends DialogPreference {
             }
         } // else the user dismissed this dialog so leave the preference unchanged.
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
index 801bb248ad..517793c1ba 100644
--- a/src/com/android/contacts/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -87,4 +89,16 @@ public final class DisplayOrderPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
index 42bbcc3ec0..ab7a3d9d48 100644
--- a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
+++ b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -90,4 +92,16 @@ public final class PhoneticNameDisplayPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
index 387023112b..a6a252f459 100644
--- a/src/com/android/contacts/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -87,4 +89,16 @@ public final class SortOrderPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index a5063d37cd..f83dd925b2 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -17,6 +17,7 @@
 
 package com.android.contacts.quickcontact;
 
+import androidx.core.content.ContextCompat;
 import android.accounts.Account;
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
@@ -1187,6 +1188,8 @@ public class QuickContactActivity extends ContactsActivity {
     private void initializeNoContactDetailCard(boolean areAllRawContactsSimAccounts) {
         final Drawable phoneIcon = ResourcesCompat.getDrawable(getResources(),
                 lineageos.platform.R.drawable.ic_phone, null).mutate();
+        phoneIcon.setColorFilter(ContextCompat.getColor(this, R.color.accent),
+                PorterDuff.Mode.SRC_ATOP);
         final Entry phonePromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT,
                 phoneIcon, getString(R.string.quickcontact_add_phone_number),
                 /* subHeader = */ null, /* subHeaderIcon = */ null, /* text = */ null,
@@ -1209,6 +1212,8 @@ public class QuickContactActivity extends ContactsActivity {
         if (!areAllRawContactsSimAccounts) {
             final Drawable emailIcon = ResourcesCompat.getDrawable(getResources(),
                     R.drawable.quantum_ic_email_vd_theme_24, null).mutate();
+            emailIcon.setColorFilter(ContextCompat.getColor(this, R.color.accent),
+                    PorterDuff.Mode.SRC_ATOP);
             final Entry emailPromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT,
                     emailIcon, getString(R.string.quickcontact_add_email), /* subHeader = */ null,
                     /* subHeaderIcon = */ null,
@@ -1228,8 +1233,10 @@ public class QuickContactActivity extends ContactsActivity {
 
         final int subHeaderTextColor = getResources().getColor(
                 R.color.quickcontact_entry_sub_header_text_color);
-        final PorterDuffColorFilter greyColorFilter =
-                new PorterDuffColorFilter(subHeaderTextColor, PorterDuff.Mode.SRC_ATOP);
+        final int accentColor = getResources().getColor(
+                R.color.accent);
+        final PorterDuffColorFilter accentColorFilter =
+                new PorterDuffColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
         mNoContactDetailsCard.initialize(promptEntries, 2, /* isExpanded = */ true,
                 /* isAlwaysExpanded = */ true, mExpandingEntryCardViewListener, mScroller);
         if (mNoContactDetailsCard.getVisibility() == View.GONE && mShouldLog) {
@@ -1238,7 +1245,7 @@ public class QuickContactActivity extends ContactsActivity {
         }
         mNoContactDetailsCard.setVisibility(View.VISIBLE);
         mNoContactDetailsCard.setEntryHeaderColor(subHeaderTextColor);
-        mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, greyColorFilter);
+        mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, accentColorFilter);
     }
 
     /**
@@ -2047,14 +2054,14 @@ public class QuickContactActivity extends ContactsActivity {
     }
 
     private void setThemeColor(MaterialPalette palette) {
-        // If the color is invalid, use the predefined default
+        // If the color is invalid, use the predefined
         mColorFilterColor = palette.mPrimaryColor;
         mScroller.setHeaderTintColor(mColorFilterColor);
         mStatusBarColor = palette.mSecondaryColor;
         updateStatusBarColor();
-
         mColorFilter =
                 new PorterDuffColorFilter(mColorFilterColor, PorterDuff.Mode.SRC_ATOP);
+
         mContactCard.setColorAndFilter(mColorFilterColor, mColorFilter);
         mAboutCard.setColorAndFilter(mColorFilterColor, mColorFilter);
     }
@@ -2353,10 +2360,10 @@ public class QuickContactActivity extends ContactsActivity {
             editMenuItem.setVisible(true);
             if (DirectoryContactUtil.isDirectoryContact(mContactData) || InvisibleContactUtil
                     .isInvisibleAndAddable(mContactData, this)) {
-                editMenuItem.setIcon(R.drawable.quantum_ic_person_add_vd_theme_24);
+                editMenuItem.setIcon(R.drawable.quantum_ic_person_add_white_vd_theme_24);
                 editMenuItem.setTitle(R.string.menu_add_contact);
             } else if (isContactEditable()) {
-                editMenuItem.setIcon(R.drawable.quantum_ic_create_vd_theme_24);
+                editMenuItem.setIcon(R.drawable.quantum_ic_create_white_vd_theme_24);
                 editMenuItem.setTitle(R.string.menu_editContact);
             } else {
                 editMenuItem.setVisible(false);
@@ -2399,6 +2406,14 @@ public class QuickContactActivity extends ContactsActivity {
             final MenuItem helpMenu = menu.findItem(R.id.menu_help);
             helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());
 
+            for (int i = 0; i < menu.size(); ++i) {
+                final Drawable icon = menu.getItem(i).getIcon();
+                if (icon != null) {
+                    icon.mutate().setColorFilter(ContextCompat.getColor(this,
+                            android.R.color.white), PorterDuff.Mode.SRC_ATOP);
+                }
+            }
+
             return true;
         }
         return false;
diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
index 2b226d0a10..24f9a465fd 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -146,7 +146,7 @@ public class AccountSelectionUtil {
                 }
             };
         }
-        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.ContactsAlertDialogTheme);
         final TextView title = (TextView) View.inflate(activity, R.layout.dialog_title, null);
         title.setText(R.string.dialog_new_contact_account);
         builder.setCustomTitle(title);
diff --git a/src/com/android/contacts/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java
index c1616cec7d..4e4ab5c408 100644
--- a/src/com/android/contacts/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -200,6 +200,6 @@ public class MaterialColorMapUtils {
                 && ((PeopleActivity) activity).isGroupView();
         return isGroupView
                 ? ContextCompat.getColor(activity, R.color.group_primary_color)
-                : ContextCompat.getColor(activity, R.color.primary_color);
+                : ContextCompat.getColor(activity, R.color.primary_color_dark);
     }
 }
diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
index a6b58cc86b..33c65ceb0f 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -89,14 +89,14 @@ public class CancelActivity extends Activity implements ServiceConnection {
             } else {
                 message = getString(R.string.cancel_export_confirmation_message, mDisplayName);
             }
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this)
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                     .setMessage(message)
                     .setPositiveButton(R.string.yes_button, new RequestCancelListener())
                     .setOnCancelListener(mCancelListener)
                     .setNegativeButton(R.string.no_button, mCancelListener);
             return builder.create();
         } else if (id == R.id.dialog_cancel_failed) {
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this)
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                     .setTitle(R.string.cancel_vcard_import_or_export_failed)
                     .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setMessage(getString(R.string.fail_reason_unknown))
diff --git a/src/com/android/contacts/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java
index 690f2070c2..05818603c0 100644
--- a/src/com/android/contacts/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -178,7 +178,7 @@ public class ExportVCardActivity extends Activity implements ServiceConnection,
     protected Dialog onCreateDialog(int id, Bundle bundle) {
         if (id == R.id.dialog_fail_to_export_with_reason) {
             mProcessOngoing = false;
-            return new AlertDialog.Builder(this)
+            return new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                     .setTitle(R.string.exporting_contact_failed_title)
                     .setMessage(getString(R.string.exporting_contact_failed_message,
                             mErrorReason != null ? mErrorReason :
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
index 38367c40f9..b5aa37e35c 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -762,7 +762,7 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr
                 Log.e(LOG_TAG, "Error message is null while it must not.");
                 message = getString(R.string.fail_reason_unknown);
             }
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this)
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                 .setTitle(getString(R.string.reading_vcard_failed_title))
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(message)
diff --git a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
index 521a610dda..339e674160 100644
--- a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
+++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
@@ -65,7 +65,7 @@ public class ImportVCardDialogFragment extends DialogFragment {
         final Uri sourceUri = getArguments().getParcelable(ARG_SOURCE_URI);
         final String sourceDisplayName = getArguments().getString(ARG_SOURCE_DISPLAY_NAME);
 
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.import_from_vcf_file_confirmation_message)
                 .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
diff --git a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
index da2b468da6..242a3e52fb 100644
--- a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
@@ -185,7 +185,7 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment {
             }
         };
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         ListAdapter selectAccountListAdapter = new SelectAccountListAdapter(
                 builder.getContext(),
                 R.layout.select_account_list_item,
diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml
index 51a97a8b95..9568db5459 100644
--- a/tests/res/layout/fill_call_log_test.xml
+++ b/tests/res/layout/fill_call_log_test.xml
@@ -38,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/useRandomNumbers"
-        android:buttonTint="@color/color_default_blue1"
+        android:buttonTint="@color/accent"
     />
     <Button
         android:id="@+id/add"
-- 
GitLab