diff --git a/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java b/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java
index bd363724b6..a1f808dbe0 100644
--- a/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java
+++ b/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java
@@ -66,6 +66,7 @@
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import androidx.appcompat.widget.AppCompatButton;
@@ -99,7 +100,8 @@ public class SearchView {
 
   private final AppCompatTextView recentHintTV;
   private final AppCompatTextView searchResultsHintTV;
-  private final AppCompatTextView deepSearchTV;
+  private final AppCompatButton deepSearchButton;
+  private final LinearLayout deepSearchContainer;
 
   private final ChipGroup recentChipGroup;
   private final RecyclerView recyclerView;
@@ -143,7 +145,8 @@ public SearchView(final AppBar appbar, MainActivity mainActivity) {
     recentChipGroup = mainActivity.findViewById(R.id.searchRecentItemsChipGroup);
     recentHintTV = mainActivity.findViewById(R.id.searchRecentHintTV);
     searchResultsHintTV = mainActivity.findViewById(R.id.searchResultsHintTV);
-    deepSearchTV = mainActivity.findViewById(R.id.searchDeepSearchTV);
+    deepSearchButton = mainActivity.findViewById(R.id.tryDeepSearchButton);
+    deepSearchContainer = mainActivity.findViewById(R.id.deepSearchContainer);
     recyclerView = mainActivity.findViewById(R.id.searchRecyclerView);
     searchResultsSortHintTV = mainActivity.findViewById(R.id.searchResultsSortHintTV);
     searchResultsSortButton = mainActivity.findViewById(R.id.searchResultsSortButton);
@@ -205,7 +208,7 @@ public void afterTextChanged(Editable s) {}
           return false;
         });
 
-    deepSearchTV.setOnClickListener(
+    deepSearchButton.setOnClickListener(
         v -> {
           String s = getSearchTerm();
 
@@ -225,10 +228,7 @@ public void afterTextChanged(Editable s) {}
 
             searchMode = 2;
 
-            deepSearchTV.setText(
-                getSpannableText(
-                    mainActivity.getString(R.string.not_finding_what_you_re_looking_for),
-                    mainActivity.getString(R.string.try_deep_search)));
+            deepSearchButton.setText(mainActivity.getString(R.string.try_deep_search));
 
           } else if (searchMode == 2) {
 
@@ -240,7 +240,7 @@ public void afterTextChanged(Editable s) {}
                     mainActivity.getCurrentMainFragment().getViewLifecycleOwner(),
                     hybridFileParcelables -> updateResultList(hybridFileParcelables, s));
 
-            deepSearchTV.setVisibility(View.GONE);
+            deepSearchContainer.setVisibility(View.GONE);
           }
         });
 
@@ -272,12 +272,9 @@ private void basicSearch(String s) {
     searchResultsHintTV.setVisibility(View.VISIBLE);
     searchResultsSortButton.setVisibility(View.VISIBLE);
     searchResultsSortHintTV.setVisibility(View.VISIBLE);
-    deepSearchTV.setVisibility(View.VISIBLE);
+    deepSearchContainer.setVisibility(View.VISIBLE);
     searchMode = 1;
-    deepSearchTV.setText(
-        getSpannableText(
-            mainActivity.getString(R.string.not_finding_what_you_re_looking_for),
-            mainActivity.getString(R.string.try_indexed_search)));
+    deepSearchButton.setText(mainActivity.getString(R.string.try_indexed_search));
 
     mainActivity
         .getCurrentMainFragment()
@@ -356,11 +353,8 @@ private void initRecentSearches(Context context) {
 
   private void resetSearchMode() {
     searchMode = 0;
-    deepSearchTV.setText(
-        getSpannableText(
-            mainActivity.getString(R.string.not_finding_what_you_re_looking_for),
-            mainActivity.getString(R.string.try_indexed_search)));
-    deepSearchTV.setVisibility(View.GONE);
+    deepSearchButton.setText(mainActivity.getString(R.string.try_indexed_search));
+    deepSearchContainer.setVisibility(View.GONE);
   }
 
   /**
@@ -616,7 +610,7 @@ private void initSearchViewColor(MainActivity a) {
   private void clearRecyclerView() {
     searchRecyclerViewAdapter.submitList(Collections.emptyList());
 
-    deepSearchTV.setVisibility(View.GONE);
+    deepSearchContainer.setVisibility(View.GONE);
 
     searchResultsHintTV.setVisibility(View.GONE);
     searchResultsSortHintTV.setVisibility(View.GONE);
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
new file mode 100644
index 0000000000..ecca43508e
--- /dev/null
+++ b/app/src/main/res/drawable/button_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/primary_pink" />
+    <corners android:radius="24dp" />
+    <padding
+        android:bottom="4dp"
+        android:left="2dp"
+        android:right="2dp"
+        android:top="4dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ripple_button_background.xml b/app/src/main/res/drawable/ripple_button_background.xml
new file mode 100644
index 0000000000..ec6e955999
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_button_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+
+    <!-- This item defines the ripple mask shape -->
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFF" />
+            <corners android:radius="24dp" />
+        </shape>
+    </item>
+
+    <item android:drawable="@drawable/button_background" />
+</ripple>
diff --git a/app/src/main/res/layout-v21/layout_search.xml b/app/src/main/res/layout-v21/layout_search.xml
index 17f265bb15..772dc3bfe3 100644
--- a/app/src/main/res/layout-v21/layout_search.xml
+++ b/app/src/main/res/layout-v21/layout_search.xml
@@ -85,7 +85,7 @@
             android:paddingTop="8dp"
             android:paddingEnd="8dp"
             android:scrollbars="none"
-            app:layout_constraintBottom_toTopOf="@id/searchDeepSearchTV"
+            app:layout_constraintBottom_toTopOf="@+id/deepSearchContainer"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/searchRecentHintTV">
@@ -97,27 +97,48 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
                 app:chipSpacing="4dp"
                 app:singleLine="true" />
 
         </HorizontalScrollView>
 
-        <TextView
-            android:id="@+id/searchDeepSearchTV"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/deepSearchContainer"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:padding="8dp"
-            android:textSize="16sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="12dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingVertical="12dp"
             android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/searchResultsHintTV"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView" />
+            app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView">
+
+            <TextView
+                android:id="@+id/notFindingTextView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.4"
+                android:text="@string/not_finding_what_you_re_looking_for"
+                android:textSize="15sp" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/tryDeepSearchButton"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.6"
+                android:padding="1dp"
+                android:background="@drawable/ripple_button_background"
+                android:text="@string/try_indexed_search"
+                android:textAllCaps="false"
+                android:textColor="@color/primary_pink"
+                android:textSize="14sp" />
+
+        </LinearLayout>
 
         <TextView
             android:id="@+id/searchResultsHintTV"
@@ -134,7 +155,7 @@
             app:layout_constraintEnd_toStartOf="@+id/searchResultsSortHintTV"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV" />
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
         <TextView
             android:id="@+id/searchResultsSortHintTV"
@@ -148,27 +169,27 @@
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/searchRecyclerView"
             app:layout_constraintEnd_toStartOf="@+id/searchResultsSortButton"
+            app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toEndOf="@+id/searchResultsHintTV"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
-            app:layout_constraintHorizontal_bias="1" />
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
         <Button
             android:id="@+id/searchResultsSortButton"
+            style="@style/SearchSortButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
             android:textColor="@color/accent_material_light"
             android:textSize="12sp"
             android:visibility="gone"
-            android:minHeight="0dp"
-            android:minWidth="0dp"
             app:layout_constraintBottom_toTopOf="@+id/searchRecyclerView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
             app:layout_constraintHorizontal_bias="1"
-            style="@style/SearchSortButton" />
+            app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/searchRecyclerView"
@@ -179,7 +200,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchResultsHintTV" />
+            app:layout_constraintTop_toBottomOf="@+id/searchResultsHintTV" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w720dp/layout_search.xml b/app/src/main/res/layout-w720dp/layout_search.xml
index 82da103193..c933960fff 100644
--- a/app/src/main/res/layout-w720dp/layout_search.xml
+++ b/app/src/main/res/layout-w720dp/layout_search.xml
@@ -57,7 +57,7 @@
             app:layout_constraintTop_toTopOf="@id/search_edit_text"
             app:srcCompat="@drawable/ic_close_black_24dp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/searchRecentHintTV"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
             android:paddingTop="8dp"
             android:paddingEnd="8dp"
             android:scrollbars="none"
-            app:layout_constraintBottom_toTopOf="@id/searchDeepSearchTV"
+            app:layout_constraintBottom_toTopOf="@+id/deepSearchContainer"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/searchRecentHintTV">
@@ -101,23 +101,46 @@
 
         </HorizontalScrollView>
 
-        <TextView
-            android:id="@+id/searchDeepSearchTV"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/deepSearchContainer"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:padding="8dp"
-            android:textSize="16sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
             android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/searchResultsHintTV"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
+            android:paddingVertical="16dp"
+            android:paddingHorizontal="12dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView" />
+            app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/notFindingTextView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/not_finding_what_you_re_looking_for"
+                android:textSize="18sp" />
 
-        <TextView
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/tryDeepSearchButton"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAllCaps="false"
+                android:textSize="16sp"
+                android:padding="8dp"
+                android:background="@drawable/button_background"
+                android:text="@string/try_indexed_search"
+                android:textColor="@color/primary_pink" />
+
+
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/searchResultsHintTV"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -132,9 +155,9 @@
             app:layout_constraintEnd_toStartOf="@+id/searchResultsSortHintTV"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV" />
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/searchResultsSortHintTV"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -146,27 +169,27 @@
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/searchRecyclerView"
             app:layout_constraintEnd_toStartOf="@+id/searchResultsSortButton"
+            app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toEndOf="@+id/searchResultsHintTV"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
-            app:layout_constraintHorizontal_bias="1" />
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/searchResultsSortButton"
+            style="@style/SearchSortButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
             android:textColor="@color/accent_material_light"
             android:textSize="12sp"
             android:visibility="gone"
-            android:minHeight="0dp"
-            android:minWidth="0dp"
             app:layout_constraintBottom_toTopOf="@+id/searchRecyclerView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
             app:layout_constraintHorizontal_bias="1"
-            style="@style/SearchSortButton" />
+            app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/searchRecyclerView"
@@ -176,7 +199,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchResultsHintTV" />
+            app:layout_constraintTop_toBottomOf="@+id/searchResultsHintTV" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_search.xml b/app/src/main/res/layout/layout_search.xml
index 1a7b97f196..e4db449380 100644
--- a/app/src/main/res/layout/layout_search.xml
+++ b/app/src/main/res/layout/layout_search.xml
@@ -82,7 +82,7 @@
             android:paddingTop="8dp"
             android:paddingEnd="8dp"
             android:scrollbars="none"
-            app:layout_constraintBottom_toTopOf="@id/searchDeepSearchTV"
+            app:layout_constraintBottom_toTopOf="@+id/deepSearchContainer"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/searchRecentHintTV">
@@ -94,27 +94,47 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
                 app:chipSpacing="4dp"
                 app:singleLine="true" />
 
         </HorizontalScrollView>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/searchDeepSearchTV"
+        <LinearLayout
+            android:id="@+id/deepSearchContainer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            android:padding="8dp"
-            android:textSize="16sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
             android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/searchResultsHintTV"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView" />
+            app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/notFindingTextView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.4"
+                android:text="@string/not_finding_what_you_re_looking_for"
+                android:textSize="15sp" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/tryDeepSearchButton"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.6"
+                android:background="@drawable/button_background"
+                android:padding="1dp"
+                android:text="@string/try_indexed_search"
+                android:textAllCaps="false"
+                android:textColor="@color/primary_pink"
+                android:textSize="14sp" />
+
+        </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/searchResultsHintTV"
@@ -131,7 +151,7 @@
             app:layout_constraintEnd_toStartOf="@+id/searchResultsSortHintTV"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV" />
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/searchResultsSortHintTV"
@@ -145,27 +165,27 @@
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/searchRecyclerView"
             app:layout_constraintEnd_toStartOf="@+id/searchResultsSortButton"
+            app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toEndOf="@+id/searchResultsHintTV"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
-            app:layout_constraintHorizontal_bias="1" />
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/searchResultsSortButton"
+            style="@style/SearchSortButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
             android:textColor="@color/accent_material_light"
             android:textSize="12sp"
             android:visibility="gone"
-            android:minHeight="0dp"
-            android:minWidth="0dp"
             app:layout_constraintBottom_toTopOf="@+id/searchRecyclerView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
-            app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
             app:layout_constraintHorizontal_bias="1"
-            style="@style/SearchSortButton" />
+            app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
+            app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/searchRecyclerView"
@@ -175,7 +195,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/searchResultsHintTV" />
+            app:layout_constraintTop_toBottomOf="@+id/searchResultsHintTV" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file