diff --git a/app/src/main/java/com/dragons/aurora/AuroraSuggestionProvider.java b/app/src/main/java/com/dragons/aurora/AuroraSuggestionProvider.java
index f44b61c39..d1e47abb6 100644
--- a/app/src/main/java/com/dragons/aurora/AuroraSuggestionProvider.java
+++ b/app/src/main/java/com/dragons/aurora/AuroraSuggestionProvider.java
@@ -7,6 +7,7 @@ import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -27,12 +28,13 @@ public class AuroraSuggestionProvider extends ContentProvider {
     }
 
     @Override
-    public String getType(Uri uri) {
+    public String getType(@NonNull Uri uri) {
         return SearchManager.SUGGEST_MIME_TYPE;
     }
 
     @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+    public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+
         MatrixCursor cursor = new MatrixCursor(new String[]{
                 BaseColumns._ID,
                 SearchManager.SUGGEST_COLUMN_TEXT_1,
@@ -56,17 +58,17 @@ public class AuroraSuggestionProvider extends ContentProvider {
     }
 
     @Override
-    public Uri insert(Uri uri, ContentValues values) {
+    public Uri insert(@NonNull Uri uri, ContentValues values) {
         return null;
     }
 
     @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
+    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
         return 0;
     }
 
     @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         return 0;
     }
 
@@ -100,6 +102,6 @@ public class AuroraSuggestionProvider extends ContentProvider {
     }
 
     private Object[] constructSuggestionRow(SearchSuggestEntry entry, int id) {
-        return new Object[]{id, entry.getSuggestedQuery(), entry.getSuggestedQuery(), R.drawable.ic_placeholder};
+        return new Object[]{id, entry.getSuggestedQuery(), entry.getSuggestedQuery(), R.drawable.ic_update};
     }
 }
diff --git a/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java b/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java
index 5bc3c17a6..f9dc979ba 100644
--- a/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java
+++ b/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java
@@ -9,7 +9,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -21,6 +20,11 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.dragons.aurora.R;
+import com.dragons.aurora.RecyclerItemTouchHelper;
+import com.dragons.aurora.activities.SearchActivity;
+import com.dragons.aurora.adapters.SearchHistoryAdapter;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -28,11 +32,6 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
-import com.dragons.aurora.R;
-import com.dragons.aurora.RecyclerItemTouchHelper;
-import com.dragons.aurora.activities.SearchActivity;
-import com.dragons.aurora.adapters.SearchHistoryAdapter;
-
 public class SearchFragment extends UtilFragment implements RecyclerItemTouchHelper.RecyclerItemTouchHelperListener {
 
     SearchView searchToolbar;
@@ -49,6 +48,9 @@ public class SearchFragment extends UtilFragment implements RecyclerItemTouchHel
         recyclerView = view.findViewById(R.id.searchHistory);
         emptyView = view.findViewById(R.id.emptyView);
 
+        TextView clearAll = view.findViewById(R.id.clearAll);
+        clearAll.setOnClickListener(v -> clearAll());
+
         RelativeLayout search_layout = view.findViewById(R.id.search_layout);
         search_layout.setOnClickListener(v -> {
             searchToolbar.setFocusable(true);
@@ -140,7 +142,7 @@ public class SearchFragment extends UtilFragment implements RecyclerItemTouchHel
             emptyView.setVisibility(View.GONE);
             recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
             recyclerView.setItemAnimator(new DefaultItemAnimator());
-            recyclerView.setAdapter(new SearchHistoryAdapter(listHistory,getActivity()));
+            recyclerView.setAdapter(new SearchHistoryAdapter(listHistory, getActivity()));
             new ItemTouchHelper(
                     new RecyclerItemTouchHelper(0, ItemTouchHelper.LEFT, this))
                     .attachToRecyclerView(recyclerView);
@@ -171,6 +173,15 @@ public class SearchFragment extends UtilFragment implements RecyclerItemTouchHel
         return listHistory;
     }
 
+    private void clearAll() {
+        setHistory.clear();
+        PreferenceManager.getDefaultSharedPreferences(getActivity())
+                .edit()
+                .putStringSet("SEARCH_HISTORY", setHistory)
+                .apply();
+        setupSearchHistory();
+    }
+
     @Override
     public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction, int position) {
         if (viewHolder instanceof SearchHistoryAdapter.MyViewHolder) {
diff --git a/app/src/main/res/drawable/outline_bg.xml b/app/src/main/res/drawable/outline_bg.xml
index fa8d7142d..7d24623af 100644
--- a/app/src/main/res/drawable/outline_bg.xml
+++ b/app/src/main/res/drawable/outline_bg.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <corners android:radius="8dp" />
     <size android:width="115dp" />
-    <solid android:color="@color/white" />
+    <solid android:color="?android:attr/colorPrimary" />
     <stroke
         android:width="1dp"
         android:color="#33545454" />
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 78b0240f2..5217418c4 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -13,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/appbar_bar_height"
+        android:animateLayoutChanges="true"
         android:orientation="vertical">
 
         <TextView
@@ -25,58 +25,71 @@
             android:layout_marginTop="24dp"
             android:fontFamily="@font/google_sans_bold"
             android:text="@string/action_search_title"
-            android:textSize="22sp" />
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="18sp" />
 
-        <android.support.v7.widget.CardView
+        <RelativeLayout
+            android:id="@+id/search_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="4dp"
-            app:cardBackgroundColor="?android:attr/colorAccent"
-            app:cardCornerRadius="5dp">
+            android:layout_margin="12dp"
+            android:background="@drawable/outline_bg"
+            android:clickable="true"
+            android:focusable="true"
+            android:nestedScrollingEnabled="false">
 
-            <RelativeLayout
-                android:id="@+id/search_layout"
+            <android.support.v7.widget.SearchView
+                android:id="@+id/search_apps"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?android:attr/selectableItemBackground"
-                android:nestedScrollingEnabled="false"
-                android:clickable="true"
-                android:focusable="true">
+                android:layout_height="wrap_content"
+                app:closeIcon="@null"
+                app:queryBackground="@android:color/transparent"
+                app:queryHint="Search Apps"
+                app:searchIcon="@drawable/ic_search" />
+        </RelativeLayout>
 
-                <android.support.v7.widget.SearchView
-                    android:id="@+id/search_apps"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:closeIcon="@null"
-                    app:divider="@null"
-                    app:queryHint="Search Apps"
-                    app:searchHintIcon="@null"
-                    app:searchIcon="@drawable/ic_search" />
-            </RelativeLayout>
-        </android.support.v7.widget.CardView>
-
-        <TextView
-            android:id="@+id/textView4"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="24dp"
-            android:fontFamily="@font/google_sans_bold"
-            android:text="@string/action_search_history"
-            android:textSize="22sp" />
+            android:orientation="horizontal"
+            android:weightSum="10">
 
-        <android.support.v7.widget.CardView
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="8"
+                android:fontFamily="@font/google_sans_bold"
+                android:text="@string/action_search_history"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/clearAll"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:clickable="true"
+                android:focusable="true"
+                android:fontFamily="@font/google_sans"
+                android:gravity="center|end"
+                android:singleLine="true"
+                android:text="@string/action_search_clearHistory"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <RelativeLayout
             android:id="@+id/searchcard"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="14dp"
-            app:cardCornerRadius="5dp"
-            android:elevation="5dp"
-            app:cardPreventCornerOverlap="false"
-            app:cardUseCompatPadding="true">
+            android:layout_margin="12dp"
+            android:animateLayoutChanges="true"
+            android:background="@drawable/outline_bg"
+            android:padding="5dp">
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/searchHistory"
@@ -94,6 +107,8 @@
                 android:padding="15dp"
                 android:text="@string/list_empty_query"
                 android:textSize="18sp" />
-        </android.support.v7.widget.CardView>
+        </RelativeLayout>
+
     </LinearLayout>
+
 </android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/history_item.xml b/app/src/main/res/layout/history_item.xml
index e2c352a78..84d76243f 100644
--- a/app/src/main/res/layout/history_item.xml
+++ b/app/src/main/res/layout/history_item.xml
@@ -7,9 +7,9 @@
     <RelativeLayout
         android:id="@+id/view_background"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:padding="5dp"
-        android:background="@color/colorRed">
+        android:layout_height="50dp"
+        android:background="@color/colorRed"
+        android:padding="5dp">
 
         <ImageView
             android:id="@+id/delete_icon"
@@ -36,21 +36,20 @@
     <RelativeLayout
         android:id="@+id/view_foreground"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/white"
-        android:paddingEnd="15dp"
-        android:paddingStart="15dp"
-        android:paddingTop="10dp">
+        android:layout_height="50dp"
+        android:background="?android:attr/colorPrimary"
+        android:paddingEnd="5dp"
+        android:paddingStart="5dp"
+        android:paddingTop="5dp">
 
         <ImageView
             android:id="@+id/searchIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
+            android:layout_marginTop="5dp"
             android:layout_marginStart="2dp"
-            android:src="@drawable/ic_search"
-            android:tint="@color/darkGray" />
+            android:src="@drawable/ic_search" />
 
         <TextView
             android:id="@+id/query"
@@ -59,11 +58,10 @@
             android:layout_toEndOf="@id/searchIcon"
             android:ellipsize="end"
             android:fontFamily="@font/google_sans"
-
             android:maxLines="1"
             android:paddingEnd="10dp"
             android:paddingStart="10dp"
-            android:text="Insta"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="14sp" />
 
         <TextView
@@ -78,7 +76,7 @@
             android:maxLines="1"
             android:paddingEnd="10dp"
             android:paddingStart="10dp"
-            android:text="Today"
+            android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp" />
     </RelativeLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/style.xml b/app/src/main/res/values-v23/style.xml
index e102d362c..397f3faa4 100755
--- a/app/src/main/res/values-v23/style.xml
+++ b/app/src/main/res/values-v23/style.xml
@@ -4,9 +4,6 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@style/CustomActivityAnimation</item>
         <item name="android:windowDisablePreview">true</item>
-        <item name="android:editTextColor">@color/lightGray</item>
-        <item name="android:textColorHint">@color/lightGray</item>
-        <item name="android:textCursorDrawable">@color/lightGray</item>
         <item name="android:colorPrimary">@color/colorPrimary</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:colorAccent">@color/colorAccent</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bac71dafd..9098c1730 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="action_refresh">Refresh Token</string>
     <string name="action_remove">Remove</string>
     <string name="action_search_history">Your Search History</string>
+    <string name="action_search_clearHistory">Clear all</string>
     <string name="action_search_title">Search Apps &amp; Games</string>
     <string name="action_select">Select an account to login</string>
     <string name="action_settings">Settings</string>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 6db295250..f8aefb90e 100755
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -4,9 +4,6 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@style/CustomActivityAnimation</item>
         <item name="android:windowDisablePreview">true</item>
-        <item name="android:editTextColor">@color/lightGray</item>
-        <item name="android:textColorHint">@color/lightGray</item>
-        <item name="android:textCursorDrawable">@color/lightGray</item>
         <item name="android:colorPrimary">@color/colorPrimary</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:colorAccent">@color/colorAccent</item>