diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98d7677463a49fa519f8cfbeea3c8825d4bd3f7b..f91df2770e072c934ea14bcfbe7b98d250e27251 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,6 +71,7 @@
         android:appCategory="social"
         android:supportsRtl="true"
         android:taskAffinity="android.task.contacts"
+
         android:usesCleartextTraffic="false">
         <!-- The main Contacts activity with the contact list, favorites, and groups. -->
         <activity
diff --git a/res/drawable/fab_bg.xml b/res/drawable/fab_bg.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9dfd9699b612b71a7a7473fea5bb09d2ffe0bde2
--- /dev/null
+++ b/res/drawable/fab_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="#ffffff"/>
+
+    <size
+        android:width="120dp"
+        android:height="120dp"/>
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_work_profile.xml b/res/drawable/ic_work_profile.xml
index d30e8e1c10fa6e87ea0b91b9bc1fef782686c8a1..47b2f9b3c486cc231192ab751b6271bb581e35f3 100644
--- a/res/drawable/ic_work_profile.xml
+++ b/res/drawable/ic_work_profile.xml
@@ -2,7 +2,8 @@
         android:width="16dp"
         android:height="16dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        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"/>
diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml
index 167dafee63d448a9416732563a79d07356a4c8a5..3ceffde2d9acbdef41c9e7ff073c2c94ce99c159 100644
--- a/res/drawable/quantum_ic_add_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_add_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_blue1"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml
index 0aafe4b5a158bb6b305b33557ac6872204e275e5..955f7912485b489357222a9081800bc13b92bf6f 100644
--- a/res/drawable/quantum_ic_close_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_close_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_blue1"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml
index ba6adcbc427f13b4ac3065852c03972de4f6d666..fdb88f3b93c7dd2d96d64daf38cd8dd7033ffc96 100644
--- a/res/drawable/quantum_ic_menu_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_blue1"
         android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml
index 5c5632a84b629c1d87230358289726f5eef5e832..6e9da640e287a26d99e812ea7a0c390938211a6e 100644
--- a/res/drawable/quantum_ic_search_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_search_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/color_default_blue1"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
diff --git a/res/layout/account_selector_list_item_condensed.xml b/res/layout/account_selector_list_item_condensed.xml
index ae9172603327a82d53e80620c9330ca3e5a8e7ba..d43a3af37d144b75e428476f644efaa2896bbe5a 100644
--- a/res/layout/account_selector_list_item_condensed.xml
+++ b/res/layout/account_selector_list_item_condensed.xml
@@ -52,5 +52,7 @@
             android:textColor="?android:attr/textColorSecondary"
             android:singleLine="true"
             android:ellipsize="end"/>
+
+
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml
index 36fc64aa168482c521e6a9482e3aa85631b26462..fc30c121f0869adbe2b53d5512dd7d34b9419d8b 100644
--- a/res/layout/contact_editor_activity.xml
+++ b/res/layout/contact_editor_activity.xml
@@ -30,6 +30,7 @@
         android:background="?android:attr/colorPrimary"
         android:elevation="4dp"
         app:navigationContentDescription="@string/cancel_button_content_description"
+        app:theme="@style/ThemeOverlay.AppCompat.Light"
         app:navigationIcon="@drawable/quantum_ic_close_vd_theme_24"
         app:title="@string/contact_editor_title_existing_contact" />
 
diff --git a/res/layout/contact_list_filter_item.xml b/res/layout/contact_list_filter_item.xml
index 4d1fbca70f91f4964edae1c25d1746b64eb414d2..637b2246ab851f3544323c19e5aa837696e16643 100644
--- a/res/layout/contact_list_filter_item.xml
+++ b/res/layout/contact_list_filter_item.xml
@@ -61,6 +61,7 @@
     </LinearLayout>
 
     <RadioButton
+        android:buttonTint="@color/color_default_blue1"
         android:id="@+id/radioButton"
         android:clickable="false"
         android:layout_width="wrap_content"
diff --git a/res/layout/custom_contact_list_filter_group.xml b/res/layout/custom_contact_list_filter_group.xml
index c67ce163c842397a9569f9d3055a9bcf910fe5ea..9fb473ae3d6451c25b7239fc6b67a6259e8db5c2 100644
--- a/res/layout/custom_contact_list_filter_group.xml
+++ b/res/layout/custom_contact_list_filter_group.xml
@@ -77,7 +77,8 @@
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:duplicateParentState="true"
-        />
+            android:buttonTint="@color/color_default_blue1"
+            />
 
     </LinearLayout>
 
diff --git a/res/layout/date_picker.xml b/res/layout/date_picker.xml
index c700f9e643c024616b234dfc99e9e8f1c8a2c819..9bfb8de996e8cc3a969c7e39fe8f9b5f56dfbe5c 100644
--- a/res/layout/date_picker.xml
+++ b/res/layout/date_picker.xml
@@ -36,7 +36,9 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_gravity="center_horizontal"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:buttonTint="@color/color_default_blue1"
+        />
     <!-- Warning: everything within the parent is removed and re-ordered depending
          on the date format selected by the user. -->
     <LinearLayout
diff --git a/res/layout/default_account_checkbox.xml b/res/layout/default_account_checkbox.xml
index 9a1a45040788fae6c8ffe3e87ec45e6c3abdf583..635f90e504e4c9277d6549bc6b61124a04bf4a38 100644
--- a/res/layout/default_account_checkbox.xml
+++ b/res/layout/default_account_checkbox.xml
@@ -32,5 +32,6 @@
         android:textAlignment="viewStart"
         android:text="@string/set_default_account"
         android:textColor="@color/dialtacts_secondary_text_color"
+        android:buttonTint="@color/color_default_blue1"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/floating_action_button.xml b/res/layout/floating_action_button.xml
index a31512f19f7e3c65ea740aea63ec3057291a7a8f..9dcf9f64fa1d80ff384c887048d9971dd85d0f86 100644
--- a/res/layout/floating_action_button.xml
+++ b/res/layout/floating_action_button.xml
@@ -26,7 +26,7 @@
     android:layout_gravity="bottom|end"
     android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
     android:layout_marginEnd="@dimen/floating_action_button_margin_right"
-    android:background="@drawable/fab_pink"
+    android:background="@drawable/fab_bg"
     android:elevation="@dimen/design_fab_elevation"
     app:layout_dodgeInsetEdges="bottom" >
 
@@ -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/floating_action_button_icon_color"/>
+        android:tint="@color/color_default_blue1" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/people_activity_toolbar.xml b/res/layout/people_activity_toolbar.xml
index 3599f0c607a771dbdf8946bb23da94dba3edd418..89f10e7d2d1b20b645bfbb86d00bdb4ce0f41eea 100644
--- a/res/layout/people_activity_toolbar.xml
+++ b/res/layout/people_activity_toolbar.xml
@@ -33,7 +33,9 @@
             android:layout_height="?attr/actionBarSize"
             android:id="@+id/toolbar"
             android:padding="0dp"
-            style="@style/ContactsToolbarStyle" />
+            style="@style/ContactsToolbarStyle"
+             />
 
+        <!---->
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index 9f90bc7d09167b31edee4da587fc80538a86e0d8..58294a3b3c994726df857e56181e44946b8fad18 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -28,9 +28,10 @@
         android:layout_height="@dimen/search_box_icon_size"
         android:layout_marginEnd="@dimen/search_box_navigation_icon_margin"
         android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
+        android:tint="@color/color_default_blue1"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
-        android:tint="@color/actionbar_background_color" />
+         />
 
     <android.widget.AutoCompleteTextView
         android:id="@+id/search_view"
@@ -54,7 +55,7 @@
         android:layout_width="@dimen/search_box_close_icon_size"
         android:padding="@dimen/search_box_close_icon_padding"
         android:src="@drawable/quantum_ic_close_vd_theme_24"
-        android:tint="@color/quantum_black_secondary_text"
+        android:tint="@color/color_default_blue1"
         android:clickable="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_clear_search" />
diff --git a/res/menu/edit_contact.xml b/res/menu/edit_contact.xml
index 039c6570eb694742dda92bd3b993cd1389c205cf..b30934e67c525a42ede3c406a5b28b3c81106098 100644
--- a/res/menu/edit_contact.xml
+++ b/res/menu/edit_contact.xml
@@ -17,12 +17,15 @@
 <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"
         android:id="@+id/menu_save"
         app:showAsAction="always"
         app:actionLayout="@layout/editor_save_button"
         android:title="@string/menu_save" />
 
     <item
+
         android:id="@+id/menu_split"
         android:title="@string/menu_splitAggregate" />
 
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index 5fb0f2eb62fcb07618f96b73ff3acaa98f466829..86be2d61c20c551a18b9f71f964f8e5a442f0085 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -14,11 +14,14 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:contacts="http://schemas.android.com/apk/res-auto">
+    xmlns:contacts="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools">
     <item
+        app:itemIconTint="@color/color_default_blue1"
         android:id="@+id/menu_search"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
+        app:iconTint="@color/color_default_blue1"
         contacts:showAsAction="ifRoom" />
 
     <item
diff --git a/res/menu/search_menu.xml b/res/menu/search_menu.xml
index bf4b5ddc43d50aee2c6df80f8bb49a732f05b6d5..c715c16ad4cb76c7a182b868d7d92a220de194a8 100644
--- a/res/menu/search_menu.xml
+++ b/res/menu/search_menu.xml
@@ -14,9 +14,12 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:contacts="http://schemas.android.com/apk/res-auto">
+    xmlns:contacts="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools">
     <item
+        app:itemIconTint="@color/color_default_blue1"
         android:id="@+id/menu_search"
+        app:iconTint="@color/color_default_blue1"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
         contacts:showAsAction="always" />
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index ca71d406fd713987b96b7e277c23afae27f0ee0a..3cd5eaf6781ccfeefa07c7907cb3f50e01cf7d62 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -61,6 +61,13 @@
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
         <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@color/color_default_blue1</item>
     </style>
 
     <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -76,6 +83,7 @@
         <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:icon">@android:color/transparent</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:windowBackground">@color/background_primary</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e25af79a084d0d812997776c345d18e366a76118..67c37e2a524a96af0ffb9d3044ede7660e3ef972 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,8 @@
 
     <color name="nav_item_selected_background">#0f000000</color>
 
-    <color name="action_bar_button_text_color">#FFFFFF</color>
+    <color name="action_bar_button_text_color">@color/color_default_blue1</color>
+    <color name="action_bar_button_menu_color">#ffffff</color>
 
     <color name="actionbar_background_color">@color/primary_color</color>
 
@@ -42,14 +43,21 @@
 
  <!--   <color name="primary_color_dark">#1c3aa9</color>
     <color name="primary_color">#2a56c6</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="primary_color_dark">@lineageos.platform:color/color_default_foreground</color>
+    <color name="primary_color">@lineageos.platform:color/color_default_foreground</color>
 
     <color name="group_primary_color_dark">#546E7A</color>
     <color name="group_primary_color">#607D8B</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_blue1">@lineageos.platform:color/color_default_blue1</color>
+    <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
+
     <!-- Color of the selected tab underline -->
-    <color name="contacts_accent_color">#FFFFFF</color>
+    <color name="contacts_accent_color">@lineageos.platform:color/color_default_accent</color>
 
     <color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
 
@@ -104,7 +112,7 @@
     <color name="secondary_text_color">@color/dialtacts_secondary_text_color</color>
 
     <!-- Text color for section header. -->
-    <color name="section_header_text_color">@color/dialtacts_theme_color</color>
+    <color name="section_header_text_color">#A1A1A1</color>
 
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#363636</color>
@@ -258,5 +266,5 @@
     <!-- Highlight color used in places such as ripples -->
     <color name="control_highlight_color">#1A000000</color>
 
-
+    <color name="black">#000000</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dc45bcb61b4db750130401a448b4c555e45c08de..ea3386efa3cdf21a50f2f20d97ccdb71ec6f87df 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,19 @@
         <item name="actionBarStyle">@style/EditorActionBarStyle</item>
         <item name="colorButtonNormal">@color/background_primary</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:editTextStyle">@style/myEditText</item>
     </style>
+    <style name="myEditText" parent="@android:style/Widget.Holo.Light.EditText">
+        <item name="android:textCursorDrawable">@color/color_default_blue1</item>
+        <item name="android:colorControlNormal">@color/color_default_secondary_text</item>
+        <item name="colorControlNormal">@color/color_default_secondary_text</item>
+        <item name="android:colorControlActivated">@color/color_default_blue1</item>
+        <item name="colorControlActivated">@color/color_default_blue1</item>
+        <item name="android:colorControlHighlight">@color/color_default_blue1</item>
+        <item name="colorControlHighlight">@color/color_default_blue1</item>
+    </style>
+
 
     <style name="Theme.QuickContact" parent="@style/PeopleTheme">
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -32,6 +44,7 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
+        <item name="android:colorAccent">@color/color_default_blue1</item>
         <!-- We need to use a light ripple behind ActionBar items in order for them to
              be visible when using some of the darker ActionBar tints -->
         <item name="android:actionBarItemBackground">
@@ -40,18 +53,23 @@
     </style>
 
     <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:navigationBarColor">@android:color/black</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="toolbarNavigationButtonStyle">@style/ContactToolbarNavigationButtonStyle</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:windowLightStatusBar" tools:targetApi="27">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
         <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/color_default_blue1</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>
@@ -93,7 +111,14 @@
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <!-- Ensure the status bar color matches the background (grey 500) -->
         <!-- TODO(yaolu): Switch to use quantum_grey if in Google3 -->
-        <item name="android:colorPrimaryDark">#9e9e9e</item>
+        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
+        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
+
+    </style>
+
+    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@color/color_default_blue1</item>
     </style>
 
     <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -102,7 +127,9 @@
         <item name="android:listSelector">?android:attr/listChoiceBackgroundIndicator</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="PeopleThemeAppCompat" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:navigationBarColor">@android:color/black</item>
+        <!--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>
@@ -119,11 +146,13 @@
         <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:windowLightStatusBar" tools:targetApi="27">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</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/primary_color</item>
-        <item name="colorAccent">@color/primary_color</item>
+        <item name="colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/color_default_blue1</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>
@@ -182,8 +211,8 @@
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
-        <item name="color">@android:color/white</item>
-        <item name="android:color">@android:color/white</item>
+        <item name="color">@color/color_default_blue1</item>
+        <item name="android:color">@color/color_default_blue1</item>
     </style>
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
@@ -214,14 +243,20 @@
         <item name="android:contentInsetStart">72dp</item>
         <item name="android:contentInsetStartWithNavigation">72dp</item>
         <item name="android:titleTextAppearance">@style/ContactsActionBarTitleText</item>
+        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
+
     </style>
 
+
     <!-- When this style was added, android:toolbarStyle was private. Therefore, this style
          must be directly applied to every toolbar -->
     <style name="ContactsToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:titleTextAppearance">@style/ContactsActionBarTitleTextAppCompat</item>
         <item name="titleTextAppearance">@style/ContactsActionBarTitleTextAppCompat</item>
+        <!--<item name="android:textColorSecondary">@color/color_default_primary_text</item>-->
+        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
+        <item name="android:tint">@color/color_default_blue1</item>
     </style>
 
     <style name="LightToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
@@ -243,28 +278,28 @@
     <style name="ContactsActionBarTitleText"
         parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
         <item name="android:textSize">20dp</item>
-        <item name="android:textColor">@color/actionbar_text_color</item>
+        <item name="android:textColor">@color/color_default_blue1</item>
     </style>
 
     <style name="ContactsActionBarTitleTextAppCompat" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:textSize">20dp</item>
-        <item name="android:textColor">@color/actionbar_text_color</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="ContactsActionBarTitleTextBlack" parent="@style/ContactsActionBarTitleTextAppCompat">
-        <item name="android:textColor">@color/actionbar_text_color_black</item>
+        <item name="android:textColor">@color/color_default_blue1</item>
     </style>
 
     <!-- Action bar overflow menu icon. -->
     <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_text_color</item>
+        <item name="android:tint">@color/action_bar_button_menu_color</item>
     </style>
 
     <!-- Toolbar navigation button. -->
     <style name="ContactToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="android:tint">@color/action_bar_button_text_color</item>
+        <item name="android:tint">@color/color_default_blue1</item>
     </style>
 
     <style name="ContactPickerTheme" parent="PeopleActivityTheme">
@@ -272,11 +307,16 @@
 
     <style name="ContactsPreferencesTheme" parent="@style/PeopleThemeAppCompat">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
+
     </style>
 
+
     <style name="ContactListFilterTheme" parent="@style/PeopleTheme">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>
+        <item name="android:colorControlNormal">@color/color_default_blue1</item>
+        <item name="android:textColorSecondary">@color/color_default_blue1</item>
+
     </style>
 
     <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar">
@@ -294,7 +334,7 @@
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/color_default_blue1</item>
     </style>
 
     <style name="SelectableItem" parent="@android:style/Theme.Material.Light">
@@ -337,12 +377,13 @@
     <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
         since the Alert dialog is private. They are identical anyway. -->
     <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/color_default_blue1</item>
+
     </style>
 
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="android:colorAccent">@color/primary_color</item>
-        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="colorAccent">@color/color_default_blue1</item>
     </style>
 
     <style name="EditKindIconStyle">
@@ -394,7 +435,7 @@
     <!-- Button style for main contacts no account empty view. -->
     <style name="NoAccountViewButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/primary_color</item>
+        <item name="android:textColor">@color/color_default_blue1</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -402,7 +443,7 @@
     <!-- Add contacts button style for empty states. -->
     <style name="AddContactsButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/primary_color</item>
+        <item name="android:textColor">@color/color_default_blue1</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -459,7 +500,8 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
      make margin between the button and screen edge 16dp -->
     <style name="FilterActionButtonStyle" parent="@android:Widget.ActionButton">
         <item name="android:minWidth">@dimen/contact_filter_action_button_width</item>
-        <item name="android:textColor">@color/actionbar_text_color</item>
+        <item name="android:textColor">@color/color_default_blue1</item>
+
     </style>
 
     <style name="CustomContactListFilterView" parent="ContactListFilterTheme">
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 3d6876ebcdc1afe285bc26eca22c5809944ee568..bfa403f76e0c84be6f7b40186590a97da0f8fdfb 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -17,7 +17,7 @@
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
     android:label="@string/contactsList"
     android:hint="@string/searchHint"
-    android:searchMode="queryRewriteFromText"
+       android:searchMode="queryRewriteFromText"
 
     android:includeInGlobalSearch="true"
     android:queryAfterZeroResults="true"
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 1507ace31d705446d3d03621f19b6cea2d5d2761..dc47172060b6791a7e455f21b8177e568abedaf5 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -16,14 +16,17 @@
 
 package com.android.contacts;
 
+import android.app.Activity;
 import android.app.Application;
 import android.app.FragmentManager;
 import android.app.LoaderManager;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract.Contacts;
@@ -118,7 +121,16 @@ public class ContactsApplication extends Application {
         }
 
         AnalyticsUtil.initialize(this);
+
+
+
     }
+    public void setNavBarColor(int Color, Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            activity.getWindow().setNavigationBarColor(Color);
+        }
+    }
+
 
     private class DelayedInitializer extends AsyncTask<Void, Void, Void> {
         @Override
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 27bcc7a35132bc5ab59037fdc4634b50e959ff7a..af5d9f29ecaa6a1309891b36c5923bd2f3e61d35 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -155,6 +155,7 @@ public class ActionBarAdapter implements OnCloseListener {
         mSearchView.addTextChangedListener(new SearchTextWatcher());
         final ImageButton searchBackButton = (ImageButton) mSearchContainer
                 .findViewById(R.id.search_back_button);
+
         searchBackButton.setOnClickListener(
                 new OnClickListener() {
             @Override
@@ -336,6 +337,7 @@ public class ActionBarAdapter implements OnCloseListener {
             mToolbar.setContentInsetsRelative(mMaxToolbarContentInsetStart,
                     mToolbar.getContentInsetEnd());
             mToolbar.setNavigationIcon(R.drawable.quantum_ic_menu_vd_theme_24);
+
         } else {
             mToolbar.setNavigationIcon(null);
         }
@@ -466,7 +468,7 @@ public class ActionBarAdapter implements OnCloseListener {
                                         R.color.actionbar_color_grey_solid);
                             } else {
                                 iconColor = mActivity.getResources().getColor(
-                                        R.color.actionbar_text_color);
+                                        R.color.color_default_blue1);
                             }
                             overflow.setImageTintList(ColorStateList.valueOf(iconColor));
                         }
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index ec49d48b564e4c9a8a32c8c75e85c3df67bb1bc4..299f2470fb24b24a72e5c2207751c8cfa874cd04 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -21,12 +21,17 @@ import android.app.FragmentTransaction;
 import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract.QuickContact;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 
 import com.android.contacts.AppCompatContactsActivity;
@@ -45,6 +50,9 @@ import com.android.contacts.util.ImplicitIntentsUtil;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+
 /**
  * Contact editor with only the most important fields displayed initially.
  */
@@ -352,6 +360,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements
             mActionBarTitleResId = R.string.contact_editor_title_new_contact;
         }
         mToolbar.setTitle(mActionBarTitleResId);
+        mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_blue1));
         // Set activity title for Talkback
         setTitle(mActionBarTitleResId);
 
@@ -385,6 +394,18 @@ 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);
+        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
+
+        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 eaa89a1ea0ab275de9f594cb6b64a113d4caf32a..9e92830f0468e2323d3228878182ba7c99c341f6 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract.Contacts;
 import android.support.v4.content.ContextCompat;
@@ -34,6 +35,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
+import android.view.WindowManager;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -66,6 +69,9 @@ import com.android.contacts.util.ViewUtil;
 
 import java.util.ArrayList;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+
 /**
  * Displays a list of contacts (or phone numbers or postal addresses) for the
  * purposes of selecting one.
@@ -131,6 +137,18 @@ 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);
+        }
+
+        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
+
     }
 
     public boolean isSelectionMode() {
@@ -161,8 +179,12 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
                 && mRequest.getActionCode() != ContactsRequest.ACTION_PICK_PHONES
                 && !mRequest.isLegacyCompatibilityMode();
         configureSearchMode();
+
+
     }
 
+
+
     private void configureSearchMode() {
         mActionBarAdapter.setSearchMode(mIsSearchMode);
         invalidateOptionsMenu();
@@ -685,11 +707,15 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
         final MenuItem searchItem = menu.findItem(R.id.menu_search);
         searchItem.setVisible(!mIsSearchMode && mIsSearchSupported);
 
+
         final Drawable searchIcon = searchItem.getIcon();
         if (searchIcon != null) {
+
             searchIcon.mutate().setColorFilter(ContextCompat.getColor(this,
-                    R.color.actionbar_icon_color), PorterDuff.Mode.SRC_ATOP);
+                    R.color.color_default_blue1), 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 4ccaa93f6b9f87f8778bcd1671a599d68f0c109c..be7ece18ec5fcf3fb4ec837c1ac71877340b541c 100644
--- a/src/com/android/contacts/activities/LicenseActivity.java
+++ b/src/com/android/contacts/activities/LicenseActivity.java
@@ -15,14 +15,20 @@
  */
 package com.android.contacts.activities;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
 import android.webkit.WebView;
 
 import com.android.contacts.R;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+
 /**
  * Displays the licenses for all open source libraries.
  */
@@ -40,6 +46,16 @@ public class LicenseActivity extends AppCompatActivity {
         if (actionBar != null) {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
         }
+        //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);
+        }
+
+        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
+
     }
 
     @Override
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 92eb5be0711aad5796873a7c79e8eb60c75297cd..1f30d14ae156b956a4b2e5da4db4d29efc722404 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -30,7 +30,9 @@ import android.content.SyncStatusObserver;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -110,6 +112,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+
 /**
  * Displays a list to browse contacts.
  */
@@ -194,6 +199,9 @@ 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;
+
     // The account the new group will be created under.
     private AccountWithDataSet mNewGroupAccount;
 
@@ -387,6 +395,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements
                 R.string.navigation_drawer_open, R.string.navigation_drawer_close);
         mDrawerLayout.setDrawerListener(mToggle);
         // Set fallback handler for when drawer is disabled.
+
+        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1));
+
         mToggle.setToolbarNavigationClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -422,7 +433,12 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         }
         getWindow().setBackgroundDrawable(null);
 
+
+
+        getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, Color.rgb(50, 50, 50)));
+        getSupportActionBar().getThemedContext();
         ACCENT_COLOR=fetchAccentColor();
+
     }
 
     @Override
@@ -640,6 +656,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         mSaveServiceListener = new SaveServiceListener();
         LocalBroadcastManager.getInstance(this).registerReceiver(mSaveServiceListener,
                 new IntentFilter(ContactSaveService.BROADCAST_GROUP_DELETED));
+
+        mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1));
+
     }
 
     public void updateStatusBarBackground() {
@@ -1240,8 +1259,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
      */
     @Override
     public void onEmergencyViewSelected() {
-        ImplicitIntentsUtil.startActivityOutsideApp(this,
-                ImplicitIntentsUtil.getIntentForEmergencyInfo(this));
+        ImplicitIntentsUtil.startActivityOutsideApp(this, ImplicitIntentsUtil.getIntentForEmergencyInfo(this));
     }
 
     public boolean isGroupView() {
@@ -1301,23 +1319,48 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         return intent;
     }
 
-    /*
+
+
+    /*›
      * get Accent color from OS
      * */
 
     private int fetchAccentColor() {
+
+        //SYSTEM_UI_FLAG_LIGHT_STATUS_BAR and SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+        //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+
+        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);
-//        TypedValue typedValue = new TypedValue();
-//        TypedArray a = this.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
-//        int color = a.getColor(0, 0);
-//        a.recycle();
-//        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-//        getSupportActionBar().setBackgroundDrawable(
-//                new ColorDrawable(color));
 
+        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);
         return color;
     }
 
+    public static Drawable changeBackArrowColor(Context context, int color) {
+        String resName;
+        int res;
+
+        resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
+        res = context.getResources().getIdentifier(resName, "drawable", context.getPackageName());
+
+        final Drawable upArrow = context.getResources().getDrawable(res);
+        upArrow.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+
+        return upArrow;
+    }
+
 
 }
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index 0988eabdcd0f530b0121103fbe3202c21226645f..b8516592a412dd40a7748ce7db44aac0e275006d 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -378,6 +378,7 @@ public class DrawerAdapter extends BaseAdapter {
         result.setActivated(activated);
         result.setContentDescription(
                 displayableAccount.getTypeLabel() + " " + item.account.accountName);
+        updateSelectedStatus(textView, icon, activated);
         return result;
     }
 
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 2abd50977167b32169469ddc006bc54ae4dc67e3..6f8655f22f7a421a61ce1f248ed76177cf9d5c45 100755
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -29,6 +29,8 @@ import android.content.Intent;
 import android.content.Loader;
 import android.database.Cursor;
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -720,6 +722,8 @@ public class ContactEditorFragment extends Fragment implements
     @Override
     public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
         inflater.inflate(R.menu.edit_contact, menu);
+
+
     }
 
     @Override
diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index 9aa5c8e16a8e2aeeb594b990c097ed182e1fa5ac..7f221cd6ad8fcff57f5fc8b42d6f8982e31791d7 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -157,7 +157,7 @@ public class EditorUiUtils {
         switch (mimeType) {
             case StructuredName.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
-                        R.drawable.quantum_ic_person_vd_theme_24, null);
+                        lineageos.platform.R.drawable.ic_people, null);
             case StructuredPostal.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
                         R.drawable.quantum_ic_place_vd_theme_24, null);
@@ -166,10 +166,10 @@ public class EditorUiUtils {
                         R.drawable.quantum_ic_dialer_sip_vd_theme_24, null);
             case Phone.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
-                        R.drawable.quantum_ic_phone_vd_theme_24, null);
+                        lineageos.platform.R.drawable.ic_phone, null);
             case Im.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
-                        R.drawable.quantum_ic_message_vd_theme_24, null);
+                        lineageos.platform.R.drawable.ic_message, null);
             case Event.CONTENT_ITEM_TYPE:
                 return ResourcesCompat.getDrawable(context.getResources(),
                         R.drawable.quantum_ic_event_vd_theme_24, null);
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 28fe87fc6e4228c4d68434c9ef775cfcf2890663..957ae1bc3f4cb104cef96b723f30ae5d84f2cc1c 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -29,6 +29,8 @@ import android.text.Spannable;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.style.CharacterStyle;
+import android.text.style.MetricAffectingSpan;
 import android.text.style.TtsSpan;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -344,6 +346,14 @@ public class TextFieldsEditorView extends LabeledEditorView {
                         mFixedPhonetic = getPhonetic(column);
                         mFixedDisplayName = displayNameField;
                     }
+
+                    CharacterStyle[] toBeRemovedSpans = s.getSpans(0, s.length(),
+                            MetricAffectingSpan.class);
+                    for (int index = 0; index < toBeRemovedSpans.length; index++)
+                        s.removeSpan(toBeRemovedSpans[index]);
+
+                    Log.e("TAG", "line 356 ....afterTextChanged...................removeSpan");
+
                 }
 
                 @Override
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index 47b76a5399fe6739ad6f5447bf9327a51e5d202f..0ae239ee3ba786312c85c89440a3b3660bf911ba 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -31,6 +31,7 @@ import android.os.Bundle;
 import android.provider.ContactsContract.RawContacts;
 import android.text.TextUtils;
 import android.util.Log;
+import android.widget.Button;
 
 import com.android.contacts.ContactSaveService;
 import com.android.contacts.R;
@@ -291,6 +292,15 @@ public class ContactMultiDeletionInteraction extends Fragment
                 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.show();
     }
 
diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index 5d27086da35efb8f74b241859f942cbb34b0f5e5..f45d64ee5bd7327e04d436a7b2259b43f4ed6362 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -216,8 +216,17 @@ public class ImportDialogFragment extends DialogFragment {
         } else {
             builder.setSingleChoiceItems(adapter, -1, clickListener);
         }
+        AlertDialog dialog=builder.create();
+        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));
+            }
+        });
+
 
-        return builder.create();
+        return dialog;
     }
 
     private int getSimContactCount(SimCard sim) {
diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java
index 6559489fd6f49f16b29809adf9b8ec0a41214436..4517c513c4d9621d00b3f91fb036d06da06c9e54 100644
--- a/src/com/android/contacts/list/AccountFilterActivity.java
+++ b/src/com/android/contacts/list/AccountFilterActivity.java
@@ -20,11 +20,16 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
@@ -35,6 +40,9 @@ import com.android.contacts.model.AccountTypeManager;
 import java.util.ArrayList;
 import java.util.List;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+
 /**
  * Shows a list of all available accounts, letting the user select under which account to view
  * contacts.
@@ -65,6 +73,13 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte
 
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
+
+            String resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
+            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);
+            actionBar.setHomeAsUpIndicator(upArrow);
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -80,6 +95,16 @@ 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);
+        }
+
+        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
+
     }
 
     @Override
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index aa06eb37401840ad3fcdb55c65befc36a7146cbb..cb0317309a7d2882f7e1942470fc0e7b79a60c4e 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -34,8 +34,11 @@ import android.content.Loader;
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.provider.ContactsContract;
@@ -49,6 +52,7 @@ import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.CheckBox;
 import android.widget.ExpandableListAdapter;
@@ -80,6 +84,8 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
 import static com.android.contacts.activities.PeopleActivity.ACCENT_COLOR;
 
 /**
@@ -130,8 +136,29 @@ public class CustomContactListFilterActivity extends Activity implements
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             // android.R.id.home will be triggered in onOptionsItemSelected()
-            actionBar.setDisplayHomeAsUpEnabled(true);
+
+            if (actionBar != null) {
+
+                String resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";
+                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);
+                actionBar.setHomeAsUpIndicator(upArrow);
+                actionBar.setDisplayHomeAsUpEnabled(true);
+            }
+
+        }
+      //  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);
         }
+
+        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
+
     }
 
     public static class CustomFilterConfigurationLoader extends ListenableFutureLoader<AccountSet> {
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index f07c4a5a5924b2bf3f3e8902b6edf9413d096d3f..1c873bb642b775bf5052903fcc9d3b14312f15b2 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -998,6 +998,15 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
         }
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.people_options, menu);
+
+        final MenuItem searchItem = menu.findItem(R.id.menu_search);
+        final Drawable searchIcon = searchItem.getIcon();
+        if (searchIcon != null) {
+
+            searchIcon.mutate().setColorFilter(ContextCompat.getColor(mActivity,
+                    R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
+
+        }
     }
 
     @Override
@@ -1028,7 +1037,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.actionbar_icon_color), PorterDuff.Mode.SRC_ATOP);
+                        R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP);
             }
         }
     }
diff --git a/src/com/android/contacts/list/GroupMemberPickerFragment.java b/src/com/android/contacts/list/GroupMemberPickerFragment.java
index e94d73b1c496f9ae3ae9f02ac3f899a867c8eb32..4567827d04d587de79dbe93ace5929738a9ae56e 100644
--- a/src/com/android/contacts/list/GroupMemberPickerFragment.java
+++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java
@@ -270,6 +270,8 @@ public class GroupMemberPickerFragment extends
     public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
         super.onCreateOptionsMenu(menu, menuInflater);
         menuInflater.inflate(R.menu.group_member_picker, menu);
+
+
     }
 
     @Override
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 1c7469f1dc32b35f4acf1239a3679de14de18102..f1ff3c057b5cd7a96e2c0fba12cb130669aba98b 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -18,6 +18,10 @@ package com.android.contacts.preference;
 
 import android.content.res.Configuration;
 import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.provider.ContactsContract.DisplayNameSources;
@@ -28,13 +32,20 @@ import android.support.annotation.StringRes;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.Toolbar;
+import android.text.Html;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 
 import com.android.contacts.R;
+import com.android.contacts.activities.PeopleActivity;
+import com.android.contacts.drawer.DrawerFragment;
 import com.android.contacts.editor.SelectAccountDialogFragment;
 import com.android.contacts.interactions.ImportDialogFragment;
 import com.android.contacts.list.ProviderStatusWatcher;
@@ -43,6 +54,8 @@ import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileL
 import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileQuery;
 import com.android.contacts.util.AccountSelectionUtil;
 
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+
 /**
  * Contacts settings.
  */
@@ -72,6 +85,7 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+
         }
 
         mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this);
@@ -97,6 +111,16 @@ 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);
+        }
+
+        // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
     }
 
     @Override
@@ -194,8 +218,12 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
     private void setActivityTitle(@StringRes int res) {
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setTitle(res);
+            //actionBar.setTitle(res);
+            String title=this.getResources().getString(res);
+
+            actionBar.setTitle(Html.fromHtml("<font color='#007FFF'>"+title+" </font>"));
         }
+
     }
 
     @Override
diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
index 82e90b31765163c269c6204807773653e5d085f1..16d90492702ad96d354a39f9049a9035acc134fa 100644
--- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
@@ -27,6 +27,8 @@ import android.content.IntentFilter;
 import android.content.Loader;
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -191,6 +193,7 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment
         mRootView = new FrameLayout(getActivity());
         final View list = super.onCreateView(inflater, mRootView, savedInstanceState);
         mRootView.addView(list);
+
         return mRootView;
     }
 
diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml
index 01ade3ea331dc32352a7ed8cb250fb5a03f17196..51a97a8b95ac2c9780b4e01570fe0e174a0fd193 100644
--- a/tests/res/layout/fill_call_log_test.xml
+++ b/tests/res/layout/fill_call_log_test.xml
@@ -38,6 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/useRandomNumbers"
+        android:buttonTint="@color/color_default_blue1"
     />
     <Button
         android:id="@+id/add"