diff --git a/app/build.gradle b/app/build.gradle
index 58d2b7b72..6ec9d8ce8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 35
-		versionCode = 1004
-		versionName = '8.0'
+		versionCode = 1005
+		versionName = '8.1'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
index d51a22430..2216af06e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
@@ -24,7 +24,7 @@ import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.splitTwoParts
 import java.util.Locale
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 data object LocalMangaSource : MangaSource {
 	override val name = "LOCAL"
@@ -103,7 +103,7 @@ fun MangaSource.getTitle(context: Context): String = when (val source = unwrap()
 }
 
 fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
-	ForegroundColorSpan(context.getThemeColor(materialR.attr.colorError, Color.RED)),
+	ForegroundColorSpan(context.getThemeColor(appcompatR.attr.colorError, Color.RED)),
 	RelativeSizeSpan(0.74f),
 	SuperscriptSpan(),
 ) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt
index 60e17d0bf..9dc72c577 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt
@@ -106,7 +106,7 @@ import org.koitharu.kotatsu.stats.ui.sheet.MangaStatsSheet
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
 import org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity
 import java.io.File
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 class AppRouter private constructor(
 	private val activity: FragmentActivity?,
@@ -414,7 +414,7 @@ class AppRouter private constructor(
 			return
 		}
 		buildAlertDialog(contextOrNull() ?: return) {
-			setIcon(context.getThemeDrawable(materialR.attr.actionModeShareDrawable))
+			setIcon(context.getThemeDrawable(appcompatR.attr.actionModeShareDrawable))
 			setTitle(R.string.share)
 			setItems(
 				arrayOf(
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
index 883afdc0b..9b2c9a618 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
@@ -103,7 +103,7 @@ abstract class BaseActivity<B : ViewBinding> :
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(isEnabled)
 			if (showUpAsClose) {
-				setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
+				setHomeAsUpIndicator(materialR.drawable.ic_clear_black_24)
 			}
 		}
 	}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt
index 1514fc6a9..4af5ce6e9 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt
@@ -36,6 +36,7 @@ import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.isLayoutReversed
 import org.koitharu.kotatsu.databinding.FastScrollerBinding
 import kotlin.math.roundToInt
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 private const val SCROLLBAR_HIDE_DELAY = 1000L
@@ -132,7 +133,7 @@ class FastScroller @JvmOverloads constructor(
 		clipChildren = false
 		orientation = HORIZONTAL
 
-		@ColorInt var bubbleColor = context.getThemeColor(materialR.attr.colorControlNormal, Color.DKGRAY)
+		@ColorInt var bubbleColor = context.getThemeColor(appcompatR.attr.colorControlNormal, Color.DKGRAY)
 		@ColorInt var handleColor = bubbleColor
 		@ColorInt var trackColor = context.getThemeColor(materialR.attr.colorOutline, Color.LTGRAY)
 		@ColorInt var textColor = context.getThemeColor(android.R.attr.textColorPrimaryInverse, Color.WHITE)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt
index 763df98a1..4256bae0b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt
@@ -34,6 +34,7 @@ import org.koitharu.kotatsu.core.ui.image.AnimatedPlaceholderDrawable
 import org.koitharu.kotatsu.core.util.progress.ImageRequestIndicatorListener
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 fun ImageView.newImageRequest(lifecycleOwner: LifecycleOwner, data: Any?): ImageRequest.Builder? {
@@ -112,7 +113,7 @@ fun ImageRequest.Builder.bookmarkExtra(bookmark: Bookmark): ImageRequest.Builder
 fun ImageRequest.Builder.defaultPlaceholders(context: Context): ImageRequest.Builder {
 	val errorColor = ColorUtils.blendARGB(
 		context.getThemeColor(materialR.attr.colorErrorContainer),
-		context.getThemeColor(materialR.attr.colorBackgroundFloating),
+		context.getThemeColor(appcompatR.attr.colorBackgroundFloating),
 		0.25f,
 	)
 	return placeholder(AnimatedPlaceholderDrawable(context))
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
index f4cbadfb1..d732579cb 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
@@ -15,16 +15,17 @@ import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
 import org.koitharu.kotatsu.core.util.ext.getItem
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-	private val radius = context.resources.getDimension(materialR.dimen.abc_control_corner_material)
+	private val radius = context.resources.getDimension(appcompatR.dimen.abc_control_corner_material)
 	private val checkIcon = ContextCompat.getDrawable(context, materialR.drawable.ic_mtrl_checked_circle)
 	private val iconOffset = context.resources.getDimensionPixelOffset(R.dimen.chapter_check_offset)
 	private val iconSize = context.resources.getDimensionPixelOffset(R.dimen.chapter_check_size)
-	private val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
+	private val strokeColor = context.getThemeColor(appcompatR.attr.colorPrimary, Color.RED)
 	private val fillColor = ColorUtils.setAlphaComponent(
 		ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
 		0x74,
@@ -32,7 +33,7 @@ class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecor
 
 	init {
 		paint.color = ColorUtils.setAlphaComponent(
-			context.getThemeColor(materialR.attr.colorPrimary, Color.DKGRAY),
+			context.getThemeColor(appcompatR.attr.colorPrimary, Color.DKGRAY),
 			98,
 		)
 		paint.style = Paint.Style.FILL
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt
index 44b5c7f2d..a0843d55e 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt
@@ -16,7 +16,7 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import java.time.Instant
 import java.util.UUID
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 data class DownloadItemModel(
 	val id: UUID,
@@ -62,7 +62,7 @@ data class DownloadItemModel(
 	fun getErrorMessage(context: Context): CharSequence? = if (error != null) {
 		buildSpannedString {
 			bold {
-				color(context.getThemeColor(materialR.attr.colorError, Color.RED)) {
+				color(context.getThemeColor(appcompatR.attr.colorError, Color.RED)) {
 					append(error)
 				}
 			}
@@ -72,7 +72,7 @@ data class DownloadItemModel(
 	}
 
 	override fun compareTo(other: DownloadItemModel): Int {
-		return timestamp.compareTo(other.timestamp)
+		return timestamp compareTo other.timestamp
 	}
 
 	override fun areItemsTheSame(other: ListModel): Boolean {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsSelectionDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsSelectionDecoration.kt
index eb47bc515..c2e38925c 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsSelectionDecoration.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsSelectionDecoration.kt
@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
 import org.koitharu.kotatsu.core.util.ext.getItem
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 class DownloadsSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
@@ -23,7 +24,7 @@ class DownloadsSelectionDecoration(context: Context) : AbstractSelectionItemDeco
 	private val checkIcon = ContextCompat.getDrawable(context, materialR.drawable.ic_mtrl_checked_circle)
 	private val iconOffset = context.resources.getDimensionPixelOffset(R.dimen.card_indicator_offset)
 	private val iconSize = context.resources.getDimensionPixelOffset(R.dimen.card_indicator_size)
-	private val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
+	private val strokeColor = context.getThemeColor(appcompatR.attr.colorPrimary, Color.RED)
 	private val fillColor = ColorUtils.setAlphaComponent(
 		ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
 		0x74,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/SourceSelectionDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/SourceSelectionDecoration.kt
index 07671cd98..3c725f4ce 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/SourceSelectionDecoration.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/SourceSelectionDecoration.kt
@@ -14,12 +14,13 @@ import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
 import org.koitharu.kotatsu.core.util.ext.getItem
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 class SourceSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-	private val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
+	private val strokeColor = context.getThemeColor(appcompatR.attr.colorPrimary, Color.RED)
 	private val fillColor = ColorUtils.setAlphaComponent(
 		ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
 		0x74,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionDecoration.kt
index 3ee6833f0..16e897fcb 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionDecoration.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionDecoration.kt
@@ -13,13 +13,14 @@ import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
 import org.koitharu.kotatsu.core.util.ext.getItem
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 class CategoriesSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
 
 	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val radius = context.resources.getDimension(R.dimen.list_selector_corner)
-	private val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
+	private val strokeColor = context.getThemeColor(appcompatR.attr.colorPrimary, Color.RED)
 	private val fillColor = ColorUtils.setAlphaComponent(
 		ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
 		0x74,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterFieldLayout.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterFieldLayout.kt
index 1fa9ed7a8..3e827be77 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterFieldLayout.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterFieldLayout.kt
@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.core.util.ext.setThemeTextAppearance
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ViewFilterFieldBinding
 import java.util.LinkedList
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 class FilterFieldLayout @JvmOverloads constructor(
@@ -100,7 +101,7 @@ class FilterFieldLayout @JvmOverloads constructor(
 		label.drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_error_small)
 		TextViewCompat.setCompoundDrawableTintList(
 			label,
-			context.getThemeColorStateList(materialR.attr.colorControlNormal),
+			context.getThemeColorStateList(appcompatR.attr.colorControlNormal),
 		)
 		addView(label)
 		errorView = label
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterHeaderProducer.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterHeaderProducer.kt
index 5f8d6d6dd..317ba6813 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterHeaderProducer.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterHeaderProducer.kt
@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
 import javax.inject.Inject
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 class FilterHeaderProducer @Inject constructor(
 	private val searchRepository: MangaSearchRepository,
@@ -129,7 +129,7 @@ class FilterHeaderProducer @Inject constructor(
 			result.addFirst(
 				ChipsView.ChipModel(
 					title = snapshot.query,
-					icon = materialR.drawable.abc_ic_search_api_material,
+					icon = appcompatR.drawable.abc_ic_search_api_material,
 					isCloseable = true,
 					data = snapshot.query,
 				),
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/image/ui/ImageActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/image/ui/ImageActivity.kt
index 245fe256a..f35e9a0b6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/image/ui/ImageActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/image/ui/ImageActivity.kt
@@ -44,7 +44,7 @@ import org.koitharu.kotatsu.core.util.ext.start
 import org.koitharu.kotatsu.databinding.ActivityImageBinding
 import org.koitharu.kotatsu.databinding.ItemErrorStateBinding
 import javax.inject.Inject
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 @AndroidEntryPoint
 class ImageActivity : BaseActivity<ActivityImageBinding>(),
@@ -147,12 +147,12 @@ class ImageActivity : BaseActivity<ActivityImageBinding>(),
 			button.setImageDrawable(
 				CircularProgressDrawable(this).also {
 					it.setStyle(CircularProgressDrawable.LARGE)
-					it.setColorSchemeColors(getThemeColor(materialR.attr.colorControlNormal))
+					it.setColorSchemeColors(getThemeColor(appcompatR.attr.colorControlNormal))
 					it.start()
 				},
 			)
 		} else {
-			button.setImageResource(materialR.drawable.abc_ic_menu_overflow_material)
+			button.setImageResource(appcompatR.drawable.abc_ic_menu_overflow_material)
 		}
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
index 81aec7a3a..c938a38aa 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
@@ -15,12 +15,13 @@ import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
 import org.koitharu.kotatsu.core.util.ext.getItem
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.list.ui.model.MangaListModel
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 open class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
 
 	protected val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-	protected val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
+	protected val strokeColor = context.getThemeColor(appcompatR.attr.colorPrimary, Color.RED)
 	protected val fillColor = ColorUtils.setAlphaComponent(
 		ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
 		0x74,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/info/LocalInfoDialog.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/info/LocalInfoDialog.kt
index 126913b7d..0fa40af16 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/info/LocalInfoDialog.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/ui/info/LocalInfoDialog.kt
@@ -21,7 +21,7 @@ import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.setProgressIcon
 import org.koitharu.kotatsu.databinding.DialogLocalInfoBinding
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 @AndroidEntryPoint
 class LocalInfoDialog : AlertDialogFragment<DialogLocalInfoBinding>(), View.OnClickListener {
@@ -86,7 +86,7 @@ class LocalInfoDialog : AlertDialogFragment<DialogLocalInfoBinding>(), View.OnCl
 		val total = size + available
 		val segment = SegmentedBarView.Segment(
 			percent = (size.toDouble() / total.toDouble()).toFloat(),
-			color = KotatsuColors.segmentColor(view.context, materialR.attr.colorPrimary),
+			color = KotatsuColors.segmentColor(view.context, appcompatR.attr.colorPrimary),
 		)
 		requireViewBinding().labelUsed.text = view.context.getString(
 			R.string.memory_usage_pattern,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 3e5a394a9..b2a95e303 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -429,9 +429,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 		supportActionBar?.apply {
 			setHomeAsUpIndicator(
 				if (isOpened) {
-					materialR.drawable.abc_ic_ab_back_material
+					materialR.drawable.ic_arrow_back_black_24
 				} else {
-					materialR.drawable.abc_ic_search_api_material
+					materialR.drawable.ic_search_black_24
 				},
 			)
 			setHomeActionContentDescription(
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt
index 647828d32..cacfa6b04 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/config/ScrobblerConfigActivity.kt
@@ -31,7 +31,7 @@ import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerUser
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
 import org.koitharu.kotatsu.scrobbling.common.ui.config.adapter.ScrobblingMangaAdapter
 import javax.inject.Inject
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 @AndroidEntryPoint
 class ScrobblerConfigActivity : BaseActivity<ActivityScrobblerConfigBinding>(),
@@ -114,7 +114,7 @@ class ScrobblerConfigActivity : BaseActivity<ActivityScrobblerConfigBinding>(),
 	private fun onUserChanged(user: ScrobblerUser?) {
 		if (user == null) {
 			viewBinding.imageViewAvatar.disposeImageRequest()
-			viewBinding.imageViewAvatar.setImageResource(materialR.drawable.abc_ic_menu_overflow_material)
+			viewBinding.imageViewAvatar.setImageResource(appcompatR.drawable.abc_ic_menu_overflow_material)
 			return
 		}
 		viewBinding.imageViewAvatar.newImageRequest(this, user.avatar)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
index 1950674de..4a34becdd 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
@@ -23,19 +23,19 @@ import org.koitharu.kotatsu.core.util.ext.drawableEnd
 import org.koitharu.kotatsu.core.util.ext.drawableStart
 import org.koitharu.kotatsu.search.domain.SearchKind
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 private const val DRAWABLE_END = 2
 
 class SearchEditText @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = materialR.attr.editTextStyle,
+	@AttrRes defStyleAttr: Int = appcompatR.attr.editTextStyle,
 ) : AppCompatEditText(context, attrs, defStyleAttr) {
 
 	var searchSuggestionListener: SearchSuggestionListener? = null
 	private val clearIcon =
-		ContextCompat.getDrawable(context, materialR.drawable.abc_ic_clear_material)
+		ContextCompat.getDrawable(context, appcompatR.drawable.abc_ic_clear_material)
 	private var isEmpty = text.isNullOrEmpty()
 
 	init {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchToolbar.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchToolbar.kt
index b5a8729d4..e45040610 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchToolbar.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchToolbar.kt
@@ -4,14 +4,14 @@ import android.content.Context
 import android.graphics.Color
 import android.util.AttributeSet
 import androidx.annotation.AttrRes
-import com.google.android.material.R
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.shape.MaterialShapeDrawable
+import androidx.appcompat.R as appcompatR
 
 class SearchToolbar @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = R.attr.toolbarStyle,
+	@AttrRes defStyleAttr: Int = appcompatR.attr.toolbarStyle,
 ) : MaterialToolbar(context, attrs, defStyleAttr) {
 
 	private val bgDrawable = MaterialShapeDrawable(context, attrs, defStyleAttr, 0)
@@ -21,4 +21,4 @@ class SearchToolbar @JvmOverloads constructor(
 		bgDrawable.setShadowColor(Color.DKGRAY)
 		background = bgDrawable
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/reader/ReaderTapGridConfigActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/reader/ReaderTapGridConfigActivity.kt
index 75f13524d..e0adfb4a6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/reader/ReaderTapGridConfigActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/reader/ReaderTapGridConfigActivity.kt
@@ -27,7 +27,7 @@ import org.koitharu.kotatsu.databinding.ActivityReaderTapActionsBinding
 import org.koitharu.kotatsu.reader.domain.TapGridArea
 import org.koitharu.kotatsu.reader.ui.tapgrid.TapAction
 import java.util.EnumMap
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 @AndroidEntryPoint
 class ReaderTapGridConfigActivity : BaseActivity<ActivityReaderTapActionsBinding>(), View.OnClickListener,
@@ -157,7 +157,7 @@ class ReaderTapGridConfigActivity : BaseActivity<ActivityReaderTapActionsBinding
 	}
 
 	private fun createBackground(action: TapAction?): Drawable? {
-		val ripple = getThemeDrawable(materialR.attr.selectableItemBackground)
+		val ripple = getThemeDrawable(appcompatR.attr.selectableItemBackground)
 		return if (action == null) {
 			ripple
 		} else {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt
index 09fb7ab92..4cb75e40d 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt
@@ -27,7 +27,7 @@ import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
 import org.koitharu.kotatsu.databinding.ItemEmptyHintBinding
 import org.koitharu.kotatsu.databinding.ItemSourceCatalogBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 fun sourceCatalogItemSourceAD(
 	coil: ImageLoader,
@@ -46,7 +46,7 @@ fun sourceCatalogItemSourceAD(
 		listener.onItemClick(item, v)
 	}
 	val basePadding = context.getThemeDimensionPixelOffset(
-		materialR.attr.listPreferredItemPaddingEnd,
+		appcompatR.attr.listPreferredItemPaddingEnd,
 		binding.root.paddingStart,
 	)
 	binding.root.updatePaddingRelative(
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/views/BarChartView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/views/BarChartView.kt
index f413eadfd..99b24f8d8 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/views/BarChartView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/views/BarChartView.kt
@@ -14,6 +14,7 @@ import org.koitharu.kotatsu.parsers.util.replaceWith
 import org.koitharu.kotatsu.parsers.util.toIntUp
 import kotlin.math.roundToInt
 import kotlin.random.Random
+import androidx.appcompat.R as appcompatR
 import com.google.android.material.R as materialR
 
 class BarChartView @JvmOverloads constructor(
@@ -38,7 +39,7 @@ class BarChartView @JvmOverloads constructor(
 	private val chartBounds = RectF()
 
 	@ColorInt
-	var barColor: Int = context.getThemeColor(materialR.attr.colorAccent)
+	var barColor: Int = context.getThemeColor(appcompatR.attr.colorAccent)
 		set(value) {
 			field = value
 			invalidate()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt
index 9a9c589aa..33e146b62 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt
@@ -20,7 +20,7 @@ import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.databinding.ItemTrackDebugBinding
 import org.koitharu.kotatsu.tracker.data.TrackEntity
-import com.google.android.material.R as materialR
+import androidx.appcompat.R as appcompatR
 
 fun trackDebugAD(
 	lifecycleOwner: LifecycleOwner,
@@ -58,7 +58,7 @@ fun trackDebugAD(
 			if (item.lastResult == TrackEntity.RESULT_FAILED) {
 				append(" - ")
 				bold {
-					color(context.getThemeColor(materialR.attr.colorError, Color.RED)) {
+					color(context.getThemeColor(appcompatR.attr.colorError, Color.RED)) {
 						append(item.lastError ?: getString(R.string.error))
 					}
 				}
diff --git a/app/src/main/res/layout/layout_page_info.xml b/app/src/main/res/layout/layout_page_info.xml
index f1d30b81c..01d04d46b 100644
--- a/app/src/main/res/layout/layout_page_info.xml
+++ b/app/src/main/res/layout/layout_page_info.xml
@@ -13,7 +13,7 @@
 		android:indeterminate="true"
 		android:max="100"
 		app:hideAnimationBehavior="escape"
-		app:showAnimationBehavior="outward" />
+		app:showAnimationBehavior="none" />
 
 	<LinearLayout
 		android:id="@+id/layout_error"
@@ -40,7 +40,7 @@
 
 		<Button
 			android:id="@+id/button_retry"
-			style="@style/Widget.Material3.Button.TonalButton"
+			style="?materialButtonTonalStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
@@ -48,7 +48,7 @@
 
 		<Button
 			android:id="@+id/button_error_details"
-			style="@style/Widget.Material3.Button.TextButton"
+			style="?borderlessButtonStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="@string/details" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c65cf8c1f..cc549fbca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,9 +15,9 @@ coroutines = "1.10.1"
 desugar = "2.1.5"
 diskLruCache = "1.5"
 fragment = "1.8.6"
-gradle = "8.9.0"
-guava = "33.4.5-android"
-dagger = "2.56"
+gradle = "8.9.1"
+guava = "33.4.6-android"
+dagger = "2.56.1"
 hilt = "1.2.0"
 json = "20250107"
 junit = "4.13.2"
@@ -27,11 +27,11 @@ ksp = "2.1.20-1.0.31"
 leakcanary = "3.0-alpha-8"
 lifecycle = "2.8.7"
 markwon = "4.6.2"
-material = "1.13.0-alpha11"
+material = "1.13.0-alpha12"
 moshi = "1.15.2"
 okhttp = "4.12.0"
 okio = "3.10.2"
-parsers = "5fa7590550"
+parsers = "dbb04d2051"
 preference = "1.2.1"
 recyclerview = "1.4.0"
 room = "2.6.1"