diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt
index 9310c5eb16..8321540ad8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt
@@ -8,6 +8,7 @@ import androidx.appcompat.graphics.drawable.DrawerArrowDrawable
 import androidx.core.view.updateLayoutParams
 import com.google.android.material.textview.MaterialTextView
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.system.contextCompatDrawable
 import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.getResourceColor
 
@@ -20,6 +21,9 @@ class CenteredToolbar@JvmOverloads constructor(context: Context, attrs: Attribut
         toolbarTitle = findViewById<MaterialTextView>(R.id.toolbar_title)
         toolbarTitle.setTextAppearance(titleTextAppeance)
         toolbarTitle.setTextColor(context.getResourceColor(R.attr.actionBarTintColor))
+        collapseIcon = context.contextCompatDrawable(R.drawable.ic_arrow_back_24dp)?.apply {
+            setTint(context.getResourceColor(R.attr.actionBarTintColor))
+        }
     }
 
     override fun setCustomTitle(title: CharSequence?) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt
index d45c69f4dd..4146a7da35 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt
@@ -11,6 +11,7 @@ import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.google.android.material.textview.MaterialTextView
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.system.contextCompatDrawable
 import eu.kanade.tachiyomi.util.system.getResourceColor
 
 class FloatingToolbar @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
@@ -48,6 +49,9 @@ class FloatingToolbar @JvmOverloads constructor(context: Context, attrs: Attribu
         cardIncogImage = findViewById(R.id.card_incog_image)
 
         setNavigationIconTint(actionColorAlpha)
+        collapseIcon = context.contextCompatDrawable(R.drawable.ic_arrow_back_24dp)?.apply {
+            setTint(actionColorAlpha)
+        }
     }
 
     override fun setSubtitle(resId: Int) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MiniSearchView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MiniSearchView.kt
index 7a24e013e9..7a6f6bb880 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MiniSearchView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MiniSearchView.kt
@@ -1,8 +1,10 @@
 package eu.kanade.tachiyomi.ui.base
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.util.TypedValue
+import android.widget.ImageView
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.ColorUtils
 import eu.kanade.tachiyomi.R
@@ -20,5 +22,8 @@ class MiniSearchView @JvmOverloads constructor(context: Context, attrs: Attribut
         searchTextView?.setTextColor(actionColorAlpha)
         searchTextView?.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
         searchTextView?.setHintTextColor(actionColorAlpha)
+
+        val clearButton = findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
+        clearButton?.imageTintList = ColorStateList.valueOf(context.getResourceColor(R.attr.actionBarTintColor))
     }
 }
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 81fda3c012..cbe4b98a49 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -36,6 +36,7 @@
             android:layout_width="match_parent"
             app:titleTextColor="?actionBarTintColor"
             android:layout_height="?attr/actionBarSize"
+            app:collapseIcon="@drawable/ic_arrow_back_24dp"
             android:background="?attr/colorSecondary">
 
             <com.google.android.material.textview.MaterialTextView
@@ -81,6 +82,7 @@
                     app:navigationIcon="@drawable/ic_search_24dp"
                     app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
                     app:subtitleTextAppearance="@style/TextAppearance.MaterialComponents.Caption"
+                    app:collapseIcon="@drawable/ic_arrow_back_24dp"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" >