diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
index 433468c69b..354b57d437 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.ui.library.filter
 
 import android.content.Context
-import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Parcelable
 import android.util.AttributeSet
 import android.view.View
@@ -9,6 +8,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -233,14 +233,15 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri
             }
         )
         if (animated) {
-            binding.expandCategories.setIconResource(
+            binding.expandCategories.icon = AnimatedVectorDrawableCompat.create(
+                binding.expandCategories.context,
                 if (!allExpanded) {
                     R.drawable.anim_expand_less_to_more
                 } else {
                     R.drawable.anim_expand_more_to_less
                 }
             )
-            (binding.expandCategories.icon as? AnimatedVectorDrawable)?.start()
+            (binding.expandCategories.icon as? AnimatedVectorDrawableCompat)?.start()
         } else {
             binding.expandCategories.setIconResource(
                 if (!allExpanded) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/OverflowDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/OverflowDialog.kt
index a496a83867..ff6a1768b4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/OverflowDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/OverflowDialog.kt
@@ -2,9 +2,9 @@ package eu.kanade.tachiyomi.ui.main
 
 import android.app.Dialog
 import android.graphics.Color
-import android.graphics.drawable.AnimatedVectorDrawable
 import android.view.View
 import android.view.ViewGroup
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -49,11 +49,13 @@ class OverflowDialog(activity: MainActivity) : Dialog(activity, R.style.Overflow
                     incogText
                 )
                 text = newTitle.withSubtitle(context, subtitleText)
-                setIcon(
+                val drawable = AnimatedVectorDrawableCompat.create(
+                    context,
                     if (incog) R.drawable.anim_read_to_incog
                     else R.drawable.anim_incog_to_read
                 )
-                (getIcon() as? AnimatedVectorDrawable)?.start()
+                setIcon(drawable)
+                (getIcon() as? AnimatedVectorDrawableCompat)?.start()
             }
         }
         binding.settingsItem.setOnClickListener {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 8647f19eee..05c4707b0d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -9,7 +9,6 @@ import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.Color
-import android.graphics.drawable.AnimatedVectorDrawable
 import android.graphics.drawable.LayerDrawable
 import android.os.Build
 import android.os.Bundle
@@ -33,6 +32,7 @@ import androidx.core.view.isVisible
 import androidx.core.view.GestureDetectorCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.forEach
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -419,9 +419,9 @@ class ReaderActivity :
                 R.drawable.anim_crop_to_free
             }
             if (lastCropRes != drawableRes) {
-                setImageResource(drawableRes)
-                val animDrawable = drawable as AnimatedVectorDrawable
-                animDrawable.start()
+                val drawable = AnimatedVectorDrawableCompat.create(context, drawableRes)
+                setImageDrawable(drawable)
+                drawable?.start()
                 lastCropRes = drawableRes
             }
             compatToolTipText =