diff --git a/Android.mk b/Android.mk
index b5657741fa3219c8e747f0c41d5e11aae28bb2b3..3b1b18df84678cb1dbecb5394b445bd842b39865 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,9 +20,12 @@ LOCAL_PACKAGE_NAME := SettingsIntelligence
 LOCAL_MODULE_TAGS := optional
 LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
 
-LOCAL_SDK_VERSION := system_current
 LOCAL_PRIVILEGED_MODULE := true
 
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v13 \
diff --git a/res/drawable/ic_back.xml b/res/drawable/ic_back.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7cf3a8ca48ad2dd562973783ab2c5bf5470f20e
--- /dev/null
+++ b/res/drawable/ic_back.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/color_default_primary_text"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/res/drawable/ic_close_24dp.xml b/res/drawable/ic_close_24dp.xml
index 17451d398a755d232a08b1350aff48d4fd0d75bd..c66e97689da3d6ac286c86c9bd48a20e3fecd335 100644
--- a/res/drawable/ic_close_24dp.xml
+++ b/res/drawable/ic_close_24dp.xml
@@ -20,9 +20,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportHeight="24.0"
-        android:viewportWidth="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportWidth="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/color_default_primary_text"
         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/ic_overflow.xml b/res/drawable/ic_overflow.xml
new file mode 100644
index 0000000000000000000000000000000000000000..28720a6beae53c97f4dabb2e1fd52442a922f5ff
--- /dev/null
+++ b/res/drawable/ic_overflow.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/color_default_primary_text"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/res/drawable/ic_search_24dp.xml b/res/drawable/ic_search_24dp.xml
index 8f14e888f717fbbc3c47cb5499466df71ff39096..b8982870cd9df652c7f1bbee40ac8e1a931ae759 100644
--- a/res/drawable/ic_search_24dp.xml
+++ b/res/drawable/ic_search_24dp.xml
@@ -19,11 +19,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="@color/color_default_primary_text"
         android:pathData="M15.5,14h-0.79l-0.28-0.27c1.2-1.4,1.82-3.31,1.48-5.34c-0.47-2.78-2.79-5-5.59-5.34c-4.23-0.52-7.79,3.04-7.27,7.27
 c0.34,2.8,2.56,5.12,5.34,5.59c2.03,0.34,3.94-0.28,5.34-1.48L14,14.71v0.79l5.2,5.19c0.41,0.41,1.07,0.41,1.48,0l0.01-0.01
 c0.41-0.41,0.41-1.07,0-1.48L15.5,14z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5S11.99,14,9.5,14z" />
diff --git a/res/layout/search_intent_item.xml b/res/layout/search_intent_item.xml
index 6bc00ad06b9100da72d21ba1f927041745714331..e188182ad48ac128045c36823a66abcb690f05a1 100644
--- a/res/layout/search_intent_item.xml
+++ b/res/layout/search_intent_item.xml
@@ -22,7 +22,6 @@
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">
 
     <include layout="@layout/search_icon_view"/>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 8abc2bda4e15d6889c356fea496f32aa0823ce07..9fa282392e5ba97f5f3adaf9e973fefdd7b6ce50 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -25,7 +25,7 @@
         android:id="@+id/search_bar_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/colorPrimary"
+        android:background="?android:attr/colorPrimaryDark"
         android:elevation="4dp">
         <android.support.v7.widget.CardView
             android:id="@+id/search_bar"
@@ -39,7 +39,6 @@
                 android:id="@+id/search_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/search_bar_height"
-                android:background="?android:attr/selectableItemBackground"
                 android:contentInsetStart="0dp"
                 android:contentInsetStartWithNavigation="0dp"
                 android:theme="?android:attr/actionBarTheme">
@@ -49,7 +48,8 @@
                     android:layout_height="match_parent"
                     android:iconifiedByDefault="false"
                     android:imeOptions="actionSearch|flagNoExtractUi"
-                    android:searchIcon="@null"/>
+                    android:searchIcon="@null"
+                    app:theme="@style/AppSearchView"/>
             </Toolbar>
         </android.support.v7.widget.CardView>
     </FrameLayout>
diff --git a/res/layout/search_saved_query_item.xml b/res/layout/search_saved_query_item.xml
index f8c239a9f04f170be38159b10a1815b8c57b0fef..44d46e0de5ce8a9bc1e7204c5dd0c38b3a8d81f7 100644
--- a/res/layout/search_saved_query_item.xml
+++ b/res/layout/search_saved_query_item.xml
@@ -21,7 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical">
 
diff --git a/res/values-night/bools.xml b/res/values-night/bools.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69f56b11402826b2e2a7027bdce883a788da1ae0
--- /dev/null
+++ b/res/values-night/bools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <bool name="is_in_light_mode">false</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values/bools.xml b/res/values/bools.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ea9457bc273446b22744f8f4e508247c232b645
--- /dev/null
+++ b/res/values/bools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <bool name="is_in_light_mode">true</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a2105f0339b47cc7028fd944e2015d3a0c829a3a..6f28967a4ce60a00f2ccf36bb8a2d1278098e293 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,7 +16,14 @@
   -->
 
 <resources>
-    <color name="launcher_background_color">#ff008577</color>
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</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="search_panel_background">#f2f2f2</color>
+    <color name="launcher_background_color">@color/color_default_accent</color>
+
+    <color name="search_panel_background">@color/color_default_background</color>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4e8ae4e0e8f2ff48c677c47b9f3449f4cdd917f1..bda7b3c2058596b187789be3fa3aa7bff8ad6a8c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2017 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +15,62 @@
   -->
 
 <resources>
-    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings"/>
+
+    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings">
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:editTextColor">@color/color_default_primary_text</item>
+        <item name="android:textColorHint">@color/color_default_secondary_text</item>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightStatusBar">@bool/is_in_light_mode</item>
+        <item name="android:windowLightNavigationBar">@bool/is_in_light_mode</item>
+        <item name="android:actionOverflowButtonStyle">@style/CustomOverflowStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_back</item>
+        <item name="android:actionModeCloseDrawable">@drawable/ic_close_24dp</item>
+    </style>
+
+    <style name="CustomOverflowStyle" parent="Widget.AppCompat.Light.ActionButton.Overflow">
+        <item name="android:src">@drawable/ic_overflow</item>
+    </style>
 
     <style name="Theme.Settings.NoActionBar">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:editTextColor">@color/color_default_primary_text</item>
+        <item name="android:textColorHint">@color/color_default_secondary_text</item>
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowLightStatusBar">@bool/is_in_light_mode</item>
+        <item name="android:windowLightNavigationBar">@bool/is_in_light_mode</item>
+        <item name="android:actionOverflowButtonStyle">@style/CustomOverflowStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_back</item>
+        <item name="android:actionModeCloseDrawable">@drawable/ic_close_24dp</item>
+    </style>
+
+    <style name="AppSearchView">
+        <!-- Query Text Color -->
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <!-- Hint Color -->
+        <item name="android:textColorHint">@color/color_default_secondary_text</item>
+        <!-- Icon Color -->
+        <item name="android:tint">@color/color_default_primary_text</item>
+        <item name="android:closeIcon">@drawable/ic_close_24dp</item>
     </style>
+
 </resources>
\ No newline at end of file
diff --git a/src/com/android/settings/intelligence/search/SearchFragment.java b/src/com/android/settings/intelligence/search/SearchFragment.java
index 1f6a6c8c2e6558154d96a6d05425895b21b09111..04c647d86b42e04c4be5307374f5f71e9e787caf 100644
--- a/src/com/android/settings/intelligence/search/SearchFragment.java
+++ b/src/com/android/settings/intelligence/search/SearchFragment.java
@@ -24,6 +24,7 @@ import android.app.Fragment;
 import android.app.LoaderManager;
 import android.content.Context;
 import android.content.Loader;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.LinearLayoutManager;
@@ -37,6 +38,7 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SearchView;
 import android.widget.Toolbar;
@@ -169,6 +171,11 @@ public class SearchFragment extends Fragment implements SearchView.OnQueryTextLi
         activity.getActionBar().setDisplayHomeAsUpEnabled(true);
 
         mSearchView = toolbar.findViewById(R.id.search_view);
+
+        int id = Resources.getSystem().getIdentifier("search_close_btn", "id", "android");
+        ImageView closeIcon = mSearchView.findViewById(id);
+        closeIcon.setImageResource(R.drawable.ic_close_24dp);
+
         mSearchView.setQuery(mQuery, false /* submitQuery */);
         mSearchView.setOnQueryTextListener(this);
         mSearchView.requestFocus();