diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
index eb3a909a4..8b94966b7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
@@ -2,13 +2,11 @@
 
 package eu.kanade.tachiyomi.util.view
 
-import android.graphics.Color
 import android.graphics.Point
 import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.TextView
 import androidx.annotation.MenuRes
 import androidx.appcompat.widget.PopupMenu
 import androidx.recyclerview.widget.RecyclerView
@@ -35,8 +33,6 @@ fun View.getCoordinates() = Point((left + right) / 2, (top + bottom) / 2)
  */
 inline fun View.snack(message: String, length: Int = Snackbar.LENGTH_LONG, f: Snackbar.() -> Unit = {}): Snackbar {
     val snack = Snackbar.make(this, message, length)
-    val textView: TextView = snack.view.findViewById(com.google.android.material.R.id.snackbar_text)
-    textView.setTextColor(Color.WHITE)
     snack.f()
     snack.show()
     return snack
diff --git a/app/src/main/res/layout/download_custom_amount.xml b/app/src/main/res/layout/download_custom_amount.xml
index d0877334a..4d19941e8 100644
--- a/app/src/main/res/layout/download_custom_amount.xml
+++ b/app/src/main/res/layout/download_custom_amount.xml
@@ -24,7 +24,7 @@
         android:tint="?attr/colorAccent"
         app:srcCompat="@drawable/ic_chevron_left_black_24dp" />
 
-    <EditText
+    <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/myNumber"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 140fd91c0..19c42f8ac 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -181,9 +181,11 @@
 
     <style name="Theme.Widget.Snackbar" parent="Widget.MaterialComponents.Snackbar">
         <item name="android:background">@drawable/snackbar_bg</item>
-        <item name="android:textAppearance">@style/TextAppearance.Widget.Menu</item>
         <item name="actionTextColorAlpha">1</item>
     </style>
+    <style name="Theme.Widget.Snackbar.TextView" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+    </style>
 
 
     <style name="Theme.Widget.Chip" parent="Widget.MaterialComponents.Chip.Action">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 11bb3c63b..23fdb3cff 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -54,7 +54,9 @@
         <item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
         <item name="chipStyle">@style/Theme.Widget.Chip</item>
         <item name="buttonStyle">@style/Theme.Widget.Button</item>
+        <item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
         <item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
+        <item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
         <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
         <item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
         <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
@@ -138,6 +140,7 @@
         <item name="buttonStyle">@style/Theme.Widget.Button</item>
         <item name="snackbarStyle">@style/Theme.Widget.Snackbar</item>
         <item name="snackbarButtonStyle">@style/Theme.Widget.Button</item>
+        <item name="snackbarTextViewStyle">@style/Theme.Widget.Snackbar.TextView</item>
         <item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
         <item name="textInputStyle">@style/Theme.Widget.TextInputLayout.OutlinedBox</item>
         <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>