diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml
index c94d155a5f39464adc9cb70ccb2cd512f5125f2b..538a2d46babdadf9bc951677a5a9f56b9caf9bb6 100644
--- a/res/color/search_chip_background_color.xml
+++ b/res/color/search_chip_background_color.xml
@@ -16,7 +16,8 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>
+    <item android:state_selected="true" android:color="@color/color_default_blue1"/>
     <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
     <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
+
 </selector>
\ No newline at end of file
diff --git a/res/color/search_chip_ripple_color.xml b/res/color/search_chip_ripple_color.xml
index 985b6cc7d046d5c068c6dd9c9bbe29f68a35f900..8d785253cc0059bbce97128daee598c2a2b6f18c 100644
--- a/res/color/search_chip_ripple_color.xml
+++ b/res/color/search_chip_ripple_color.xml
@@ -18,15 +18,15 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Selected. -->
     <item android:state_pressed="true" android:state_selected="true"
-          android:alpha="0.16" android:color="?android:colorPrimary"/>
+          android:alpha="0.16" android:color="@color/color_default_blue1"/>
     <item android:state_focused="true" android:state_hovered="true" android:state_selected="true"
-          android:alpha="0.16" android:color="?android:colorPrimary"/>
+          android:alpha="0.16" android:color="@color/color_default_blue1"/>
     <item android:state_focused="true" android:state_selected="true"
-          android:alpha="0.12" android:color="?android:colorPrimary"/>
+          android:alpha="0.12" android:color="@color/color_default_blue1"/>
     <item android:state_hovered="true" android:state_selected="true"
-          android:alpha="0.04" android:color="?android:colorPrimary"/>
+          android:alpha="0.04" android:color="@color/color_default_blue1"/>
     <item android:state_selected="true"
-          android:alpha="0.00" android:color="?android:colorPrimary"/>
+          android:alpha="0.00" android:color="@color/color_default_blue1"/>
 
     <!-- Unselected. -->
     <item android:state_pressed="true" android:alpha="0.16" android:color="?android:textColorSecondary"/>
diff --git a/res/color/search_chip_stroke_color.xml b/res/color/search_chip_stroke_color.xml
index be169354eb62d3ce6d71250df4561a694b7c4548..2da7363587a1756d2e3dfebd001ece2574547cb4 100644
--- a/res/color/search_chip_stroke_color.xml
+++ b/res/color/search_chip_stroke_color.xml
@@ -18,6 +18,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:color="@android:color/transparent"/>
     <item android:state_pressed="true" android:color="@android:color/transparent"/>
-    <item android:state_enabled="true" android:color="?android:strokeColor"/>
+    <item android:state_enabled="true" android:color="@color/color_default_blue1"/>
     <item android:state_enabled="false" android:color="@android:color/transparent"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml
index 13b45bd8e89a1f6c820e5a38712df050295796dc..192da29e6094719e89c06ee1a5bb14e6e1af0d90 100644
--- a/res/drawable/ic_check_circle.xml
+++ b/res/drawable/ic_check_circle.xml
@@ -17,7 +17,9 @@ Copyright (C) 2016 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+    android:tint="@color/color_default_blue1"
+    >
     <path
         android:fillColor="?android:attr/colorPrimary"
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>
diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index bc273524ba973bce677a3975297e79d28abe813c..70a884f443517baacb721762cb03fcdd97645ac5 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -18,7 +18,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24">
+        android:viewportHeight="24"
+    android:tint="@color/color_default_primary_text"
+    >
     <path
         android:fillColor="?android:attr/colorControlNormal"
         android:pathData="M3,18h18v-2H3V18zM3,13h18v-2H3V13zM3,6v2h18V6H3z"/>
diff --git a/res/drawable/ic_menu_search.xml b/res/drawable/ic_menu_search.xml
index 4d92eeea4f7ba62e06b0a8d41d951dd721931b9f..45a98be0b230bd527355eb25efcf02e91f134622 100644
--- a/res/drawable/ic_menu_search.xml
+++ b/res/drawable/ic_menu_search.xml
@@ -18,7 +18,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24">
+        android:viewportHeight="24"
+    android:tint="@color/color_default_blue1"
+    >
     <path
         android:fillColor="?android:attr/colorControlNormal"
         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"/>
diff --git a/res/layout/search_chip_item.xml b/res/layout/search_chip_item.xml
index cb679931384cf507951b71b57a13e24501bd1966..592cf63f9f02e4b2654c378c547986c676ab12e7 100644
--- a/res/layout/search_chip_item.xml
+++ b/res/layout/search_chip_item.xml
@@ -31,4 +31,5 @@
     app:iconStartPadding="@dimen/search_chip_icon_padding"
     app:rippleColor="@color/search_chip_ripple_color"
     app:chipMinTouchTargetSize="@dimen/button_touch_size"
+    app:chipIconTint="@color/color_default_blue1"
 />
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 519632ed7c35a1e0d7f940467bb7695b652f2eda..adf888683e70f943aa9ad4d4018a7c833d554aa5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -23,7 +23,7 @@
     <color name="background_floating">@android:color/white</color>
     <color name="nav_bar_translucent">#99FFFFFF</color>
 
-    <color name="primary">#1E88E5</color> <!-- Blue 600 -->
+    <color name="primary">@color/color_default_foreground</color> <!-- Blue 600 -->
     <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
     <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
 
@@ -46,4 +46,15 @@
     <color name="item_doc_background_selected">#4d3367d6</color>
     <color name="item_title">#ff333333</color>
 
+
+
+    <color name="accent">@color/color_default_blue1</color>
+
+    <color name="color_default_blue1">#007FFF</color>
+    <!--white-->
+    <color name="color_default_foreground">#FFFFFF</color>
+    <!--black 80%-->
+    <color name="color_default_primary_text">#000000</color>
+
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 67afcbbd466d225c9e944428c276a0822645cea4..77e7cd97db306a11e469c2582f7c0bc09602e09e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -110,7 +110,7 @@
     <dimen name="search_bar_radius">8dp</dimen>
     <dimen name="search_bar_background_margin_start">0dp</dimen>
     <dimen name="search_bar_background_margin_end">0dp</dimen>
-    <dimen name="search_bar_margin">8dp</dimen>
+    <dimen name="search_bar_margin">0dp</dimen>
     <dimen name="search_bar_text_size">16dp</dimen>
     <dimen name="action_bar_size">48dp</dimen>
     <!--This value should equal actionBarSize + (2 x search_bar_margin)-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2409ed6be4f9aef4b5144f5ed2e0fb5be74cf476..032997df961fa67091364099570df6a72b5863d8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">?android:textColorSecondary</item>
+        <item name="colorControlNormal">@color/color_default_blue1</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
@@ -40,7 +40,7 @@
     </style>
 
     <style name="SnackbarButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
-        <item name="android:textColor">?android:colorPrimary</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
     <style name="AutoCompleteTextViewStyle" parent="@style/Widget.AppCompat.AutoCompleteTextView">
@@ -58,7 +58,7 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?android:colorControlNormal</item>
+        <item name="android:tint">@color/color_default_blue1</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
     </style>
 
@@ -66,6 +66,7 @@
         <item name="android:popupBackground">@drawable/menu_dropdown_panel</item>
         <item name="android:dropDownWidth">wrap_content</item>
         <item name="android:overlapAnchor">false</item>
+
     </style>
 
     <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text.CenterStacked">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 971fa1f0da3dc2d95cf563606786d9c439de2080..51ef4a56f941b71ef302274be0e49ea0bd75da8e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,11 +22,11 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
 
         <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
+        <item name="android:colorAccent">@color/color_default_blue1</item>
         <item name="android:colorBackground">@android:color/white</item>
         <item name="android:colorBackgroundFloating">@color/background_floating</item>
         <item name="android:colorControlHighlight">@color/ripple_material_light</item>
-        <item name="android:colorControlActivated">@color/primary</item>
+        <item name="android:colorControlActivated">@color/color_default_blue1</item>
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorSecondary">@color/secondary</item>
         <item name="android:strokeColor">@color/hairline</item>
@@ -53,7 +53,7 @@
 
         <!-- For material design widget, chips, buttons, not support attr-->
         <item name="colorPrimary">@color/primary</item>
-        <item name="colorAccent">@color/primary</item>
+        <item name="colorAccent">@color/color_default_blue1</item>
 
         <!-- TODO need to solve the error handle in GridItemThumbnail -->
         <item name="gridItemTint">@color/item_doc_grid_tint</item>
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 9d5126d790bec039ecb943177be05fc1a1f496f8..460e582a1d9a5541039cd7159f6f21f66ec4d432 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -902,32 +902,9 @@ public abstract class BaseActivity
      * */
 
     private int fetchAccentColor() {
-        TypedValue typedValue = new TypedValue();
-
-        ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this,  android.R.style.Theme_DeviceDefault_Light);
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true);
-        int color = typedValue.data;
-
-
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-        //toolbar change color to accent color
-        toolbar.setBackgroundColor(color);
-        //change status bar color
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(darkenColor(color));
-        }
-
+        int color=getResources().getColor(R.color.color_default_blue1);
         return color;
     }
 
-    int darkenColor(int color) {
-        float[] hsv = new float[3];
-        android.graphics.Color.colorToHSV(color, hsv);
-        hsv[2] *= 0.8f;
-        return android.graphics.Color.HSVToColor(hsv);
-    }
 
 }
diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java
index feda5e60c23417e3543ed21b40d76c0b0d36578b..15692482b4e92524350cfb4cee2bf1a164cd0cd9 100644
--- a/src/com/android/documentsui/DrawerController.java
+++ b/src/com/android/documentsui/DrawerController.java
@@ -52,7 +52,7 @@ public abstract class DrawerController implements DrawerListener {
      * Returns a controller suitable for {@code Layout}.
      */
     public static DrawerController create(Activity activity, ActivityConfig activityConfig) {
-        accentColor=fetchAccentColor(activity);
+      //  accentColor=fetchAccentColor(activity);
         DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout);
 
         if (layout == null) {
@@ -62,10 +62,10 @@ public abstract class DrawerController implements DrawerListener {
         View drawer = activity.findViewById(R.id.drawer_roots);
         Toolbar toolbar = (Toolbar) activity.findViewById(R.id.roots_toolbar);
 
-        if(accentColor!=0){
+       /* if(accentColor!=0){
             toolbar.setBackgroundColor(accentColor);
         }
-
+*/
         drawer.getLayoutParams().width = calculateDrawerWidth(activity);
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
@@ -75,6 +75,9 @@ public abstract class DrawerController implements DrawerListener {
                 R.string.drawer_open,
                 R.string.drawer_close);
 
+
+        accentColor=fetchAccentColor(activity, toolbar, toggle);
+
         return new RuntimeDrawerController(layout, drawer, toggle, toolbar, activityConfig);
     }
 
@@ -141,11 +144,11 @@ public abstract class DrawerController implements DrawerListener {
 
             if(accentColor!=0){
                 @ColorRes int id = highlight ? accentColor : android.R.color.transparent;
-                v.setBackgroundColor(id);
+               // v.setBackgroundColor(id);
             }
             else {
                 @ColorRes int id = highlight ? R.color.item_doc_background_selected : android.R.color.transparent;
-                v.setBackgroundColor(id);
+               // v.setBackgroundColor(id);
             }
 
         }
@@ -259,19 +262,15 @@ public abstract class DrawerController implements DrawerListener {
         public void onDrawerStateChanged(int newState) {}
     }
 
-    /*
-     * get Accent color from OS
-     * */
-
-    private static int fetchAccentColor(Activity activity) {
-        TypedValue typedValue = new TypedValue();
-        ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(activity,  android.R.style.Theme_DeviceDefault_Light);
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true);
-        int color = typedValue.data;
-
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-        //toolbar change color to accent color
+
+
+    private static int fetchAccentColor(Activity activity, Toolbar toolbar, ActionBarDrawerToggle toggle) {
+
+        int color=activity.getResources().getColor(R.color.accent);
+
+        toolbar.setBackgroundColor(color);
+        toolbar.setTitleTextColor(activity.getResources().getColor(R.color.color_default_foreground));
+
         return color;
     }
 
diff --git a/src/com/android/documentsui/files/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java
index c55f9f657f99b1d13a364e0a45bd295aa09ecdb3..dc51d731786d95372ab812567b7b25a11fe64f32 100644
--- a/src/com/android/documentsui/files/LauncherActivity.java
+++ b/src/com/android/documentsui/files/LauncherActivity.java
@@ -180,15 +180,7 @@ public class LauncherActivity extends Activity {
      * */
 
     private int fetchAccentColor() {
-        TypedValue typedValue = new TypedValue();
-        ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this,  android.R.style.Theme_DeviceDefault_Light);
-        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
-                typedValue, true);
-        int color = typedValue.data;
-
-        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));
-        //toolbar change color to accent color
-
+        int color=getResources().getColor(R.color.accent);
         return color;
     }