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/values-v27/styles.xml b/res/values-v27/styles.xml
index 60f2ec582a17480f10b05c0aee44f53f6202085d..3cd5eaf6781ccfeefa07c7907cb3f50e01cf7d62 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -63,6 +63,7 @@
         <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">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 72403a6ae5c596ed5fbb60a79cd8281aa65cb82f..e15389016b069f57327f3c14a27a1c5577378197 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -266,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 26cd793817c742c1cd41a6817b084a0a1489fd48..1103dca268c1b680010e486c229999e4534a20d6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,8 +20,20 @@
         <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>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -47,10 +59,13 @@
         <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/color_default_blue1</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
@@ -96,7 +111,8 @@
         <!-- TODO(yaolu): Switch to use quantum_grey if in Google3 -->
         <item name="android:colorPrimaryDark">#9e9e9e</item>
         <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
-
+        <item name="android:windowLightStatusBar" tools:targetApi="27">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
 
     </style>
 
@@ -128,11 +144,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/color_default_blue1</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>
@@ -294,6 +312,8 @@
     <style name="ContactListFilterTheme" parent="@style/PeopleTheme">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>
+        <item name="android:colorControlNormal">@color/color_default_blue1</item>
+        <item name="android:textColorSecondary">@color/color_default_blue1</item>
 
     </style>
 
@@ -479,6 +499,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
     <style name="FilterActionButtonStyle" parent="@android:Widget.ActionButton">
         <item name="android:minWidth">@dimen/contact_filter_action_button_width</item>
         <item name="android:textColor">@color/color_default_blue1</item>
+
     </style>
 
     <style name="CustomContactListFilterView" parent="ContactListFilterTheme">
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 346de34a0a40ab2015e7084260d1e4a55fe0f234..f15da653858d7f84f0607dfa5f9b6e67f22fce6a 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -30,6 +30,7 @@ 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;
@@ -393,6 +394,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements
         }
 
         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);
 
     }
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 492bed5c7a058f5ae9d96bb830ed951492ef886b..635350278f2bd1383d48a3869d948e8c66395780 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -34,6 +34,7 @@ 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;
@@ -136,6 +137,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen
         configureActivityTitle();
 
         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);
 
     }
diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java
index 5225e826125ca7c77b384aade1421bb10c068eb0..0acb39af3585de004dcdc0c5582889e1f14fe5e1 100644
--- a/src/com/android/contacts/activities/LicenseActivity.java
+++ b/src/com/android/contacts/activities/LicenseActivity.java
@@ -20,6 +20,7 @@ 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;
@@ -44,6 +45,7 @@ public class LicenseActivity extends AppCompatActivity {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
         }
         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);
 
     }
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 5bfad99b9a2925f1810dbcf3b8b8ea5d3151511f..ab559a3664a3c8853e36bd101119395b9f851075 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1326,8 +1326,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
 
     private int fetchAccentColor() {
         this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-       // this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
-        this.getWindow().getDecorView().setSystemUiVisibility(SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
         int color=getResources().getColor(R.color.accent);
 
         color_default_primary_text=getResources().getColor(R.color.color_default_primary_text);
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/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java
index f6033934adec0f7c8d5b8657f1cd07b4a751e597..9e9be925f4d4e552ae6796b2cab71bc54ebbd2d0 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;
@@ -67,6 +72,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);
         }
 
@@ -83,6 +95,7 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte
                 ContactListFilter.FILTER_TYPE_CUSTOM));
         mListView.setAdapter(new FilterListAdapter(this, filters, mCurrentFilterType));
         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);
 
     }
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 4a1d6d421a4cee622c0db9eb72fa3cc5a36cdc32..4b0fca23cc9db95d3a3c06955cb7c8f76b9ee481 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;
@@ -131,9 +135,21 @@ 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);
+       // this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
         //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);
 
     }
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 1c65ceeb1d0764ef9b518b4b106eb3d218f9f8c5..68b29832c9a5eb6856d250120109376bd6c8fd91 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -40,6 +40,7 @@ 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;
@@ -109,6 +110,7 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
         }
 
         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);
     }