diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt
index 0f2093d69a44..f22833bb5aca 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt
@@ -10,12 +10,12 @@ import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.dialogs.NoteTypeFieldEditorContextMenu.NoteTypeFieldEditorContextMenuAction
 import com.ichi2.anki.tests.InstrumentedTest
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 /** Tests [NoteTypeFieldEditorContextMenu] */
 @RunWith(AndroidJUnit4::class)
@@ -27,7 +27,7 @@ class NoteTypeFieldEditorContextMenuTest : InstrumentedTest() {
     fun showsAllOptions() {
         launchFragment(
             fragmentArgs = Bundle().apply { putString(NoteTypeFieldEditorContextMenu.ARG_LABEL, testDialogTitle) },
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ) { NoteTypeFieldEditorContextMenu() }
         onView(withText(testDialogTitle))
             .inRoot(isDialog())
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
index 493ec5298b52..22b293965cea 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
@@ -26,6 +26,7 @@ import com.ichi2.anki.AnkiDroidApp.Companion.sharedPreferencesTestingOverride
 import com.ichi2.anki.analytics.initializeAnalytics
 import com.ichi2.anki.analytics.launchPreviousAnrReporting
 import com.ichi2.anki.ankiquest.Ankiquest
+import com.ichi2.anki.browser.IdsFile
 import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
 import com.ichi2.anki.common.android.AdaptionUtil
 import com.ichi2.anki.common.android.Animations
@@ -41,6 +42,7 @@ import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper
 import com.ichi2.anki.common.storage.StorageDecision
 import com.ichi2.anki.common.utils.android.SdCard
+import com.ichi2.anki.common.utils.android.isRobolectric
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.compat.CompatHelper
@@ -56,6 +58,7 @@ import com.ichi2.anki.logging.RobolectricDebugTree
 import com.ichi2.anki.logging.logActivityCreation
 import com.ichi2.anki.model.FieldFilters.NoSuggestFilter
 import com.ichi2.anki.multimedia.MultimediaArgsStorage
+import com.ichi2.anki.multiprofile.ProfileContextWrapper
 import com.ichi2.anki.multiprofile.ProfileManager
 import com.ichi2.anki.multiprofile.isPhoenixProcess
 import com.ichi2.anki.navigation.initializeNavigator
@@ -137,7 +140,7 @@ open class AnkiDroidApp :
     @set:VisibleForTesting
     var profileManager: ProfileManager? = null
 
-    private val profileContext: Context?
+    private val profileContext: ProfileContextWrapper?
         get() = profileManager?.activeProfileContext
 
     /**
@@ -206,7 +209,7 @@ open class AnkiDroidApp :
             LogType.PRODUCTION -> Timber.plant(ProductionCrashReportingTree())
         }
         Timber.plant(ReminderLogTree(this))
-        if (BuildConfig.ENABLE_LEAK_CANARY) {
+        if (BuildConfig.ENABLE_LEAK_CANARY && !isRobolectric) {
             LeakCanaryConfiguration.setInitialConfigFor(this)
         } else {
             LeakCanaryConfiguration.disable()
@@ -280,17 +283,31 @@ open class AnkiDroidApp :
         super.onTerminate()
     }
 
-    /** Schedules cache maintenance and logs its duration without delaying startup. */
-    private fun launchCacheCleanup() =
+    /** Schedules temporary-file maintenance and logs its duration without delaying startup. */
+    @VisibleForTesting
+    internal fun launchCacheCleanup() =
         applicationScope.launch(Dispatchers.IO) {
-            runCatching {
-                measureTime("cacheCleanup") {
+            measureTime("cacheCleanup") {
+                runCacheCleanup("multimediaArgsCleanup") {
                     MultimediaArgsStorage.create(this@AnkiDroidApp).removeExpiredFiles()
+                }
+                runCacheCleanup("voiceRecordingsCleanup") {
                     VoiceRecorder.removeExpiredRecordings(VoiceRecorder.recordingsDirectory(this@AnkiDroidApp))
                 }
-            }.onFailure { Timber.w(it, "Unable to clean up expired cache files") }
+                runCacheCleanup("idsFileCleanup") {
+                    IdsFile.deleteStaleFiles(this@AnkiDroidApp)
+                }
+            }
         }
 
+    private inline fun runCacheCleanup(
+        name: String,
+        block: () -> Unit,
+    ) {
+        runCatching { measureTime(name, block) }
+            .onFailure { Timber.w(it, "Unable to run %s", name) }
+    }
+
     /**
      * @param debugTraceSqlCalls Log all SQL statements executed by the backend.
      * **Warning** The log may be delayed by 100ms, so you should not assume than a given SQL
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index b562c562a452..021ba39983fd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -653,7 +653,7 @@ open class CardBrowser :
         viewModelStore,
         CardBrowserViewModel.factory(
             lastDeckIdRepository = AnkiDroidApp.instance.sharedPrefsLastDeckIdRepository,
-            idsFileDirectory = IdsFile.getDirectory(this),
+            idsFileDirectory = IdsFile.getDirectory(),
             options = launchOptions,
             isFragmented = fragmented,
             initialDeckId = intent?.getLongExtra(CardBrowserViewModel.EXTRA_DECK_ID),
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt b/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt
index 140b54924908..9d65e768b71e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt
@@ -234,7 +234,7 @@ private fun ensureBrowserViewModel() {
         deckPicker.viewModelStore,
         CardBrowserViewModel.factory(
             lastDeckIdRepository = AnkiDroidApp.instance.sharedPrefsLastDeckIdRepository,
-            idsFileDirectory = IdsFile.getDirectory(deckPicker),
+            idsFileDirectory = IdsFile.getDirectory(),
             options = null,
             isFragmented = false,
             initialDeckId = null,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
index b6eb5313e5f7..98f9c5a0dbf3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
@@ -20,6 +20,7 @@ import android.widget.ScrollView
 import android.widget.TextView
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
 import androidx.constraintlayout.widget.Group
 import androidx.core.text.HtmlCompat
@@ -48,6 +49,7 @@ import com.ichi2.anki.filtered.FilteredDeckOptionsFragment
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.Decks
 import com.ichi2.anki.observability.ChangeManager
+import com.ichi2.anki.progress.observeProgress
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.utils.doOnApplyWindowInsets
@@ -114,6 +116,7 @@ class StudyOptionsFragment :
         displayedDeckId = savedInstanceState?.getLong(STATE_DISPLAYED_DECK_ID)?.takeIf { it != 0L }
         // Subscribe once per fragment: returning from another panel can recreate its view.
         ChangeManager.subscribe(this)
+        observeProgress(viewModel) { progress -> getString(progress.messageRes) }
     }
 
     override fun onCreateView(
@@ -289,20 +292,12 @@ class StudyOptionsFragment :
             }
             R.id.action_rebuild -> {
                 Timber.i("StudyOptionsFragment:: rebuild cram deck button pressed")
-                launchCatchingTask {
-                    withProgress(CommonString.rebuild_filtered_deck) {
-                        viewModel.rebuildCram()
-                    }
-                }
+                launchCatchingTask { viewModel.rebuildCram() }
                 return true
             }
             R.id.action_empty -> {
                 Timber.i("StudyOptionsFragment:: empty cram deck button pressed")
-                launchCatchingTask {
-                    withProgress(CommonString.empty_filtered_deck) {
-                        viewModel.emptyCram()
-                    }
-                }
+                launchCatchingTask { viewModel.emptyCram() }
                 return true
             }
             else -> return false
@@ -571,3 +566,11 @@ class StudyOptionsFragment :
         }
     }
 }
+
+@get:StringRes
+private val StudyOptionsProgress.messageRes: Int
+    get() =
+        when (this) {
+            StudyOptionsProgress.REBUILDING_FILTERED_DECK -> CommonString.rebuild_filtered_deck
+            StudyOptionsProgress.EMPTYING_FILTERED_DECK -> CommonString.empty_filtered_deck
+        }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt
index bbefbe85112f..5b175cab7653 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt
@@ -10,6 +10,8 @@ import com.ichi2.anki.CollectionManager.withOpenColOrNull
 import com.ichi2.anki.libanki.Collection
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.observability.undoableOp
+import com.ichi2.anki.progress.HasProgress
+import com.ichi2.anki.progress.ProgressManager
 import com.ichi2.anki.study.DeckKind
 import com.ichi2.anki.study.StudyAvailability
 import com.ichi2.anki.study.currentDeckStudyState
@@ -20,7 +22,11 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.io.File
 
-class StudyOptionsViewModel : ViewModel() {
+class StudyOptionsViewModel :
+    ViewModel(),
+    HasProgress<StudyOptionsProgress> {
+    override val progressManager = ProgressManager<StudyOptionsProgress>()
+
     val flowOfState: StateFlow<StudyOptionsState>
         field = MutableStateFlow<StudyOptionsState>(StudyOptionsState.Loading)
     val state: StudyOptionsState get() = flowOfState.value
@@ -52,14 +58,18 @@ class StudyOptionsViewModel : ViewModel() {
 
     suspend fun rebuildCram() {
         Timber.d("doInBackground - RebuildCram")
-        undoableOp { sched.rebuildFilteredDeck(decks.selected()) }
-        withCol { updateStateFromCollection() }
+        progressManager.withProgress(message = StudyOptionsProgress.REBUILDING_FILTERED_DECK) {
+            undoableOp { sched.rebuildFilteredDeck(decks.selected()) }
+            withCol { updateStateFromCollection() }
+        }
     }
 
     suspend fun emptyCram() {
         Timber.d("doInBackgroundEmptyCram")
-        undoableOp { sched.emptyFilteredDeck(decks.selected()) }
-        withCol { updateStateFromCollection() }
+        progressManager.withProgress(message = StudyOptionsProgress.EMPTYING_FILTERED_DECK) {
+            undoableOp { sched.emptyFilteredDeck(decks.selected()) }
+            withCol { updateStateFromCollection() }
+        }
     }
 
     fun unbury(): Job =
@@ -138,6 +148,11 @@ class StudyOptionsViewModel : ViewModel() {
     }
 }
 
+enum class StudyOptionsProgress {
+    REBUILDING_FILTERED_DECK,
+    EMPTYING_FILTERED_DECK,
+}
+
 class DeckStudyData(
     val newCardsToday: Int,
     val lrnCardsToday: Int,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionAdapter.kt
index 385032dfec40..13d0e34321ec 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionAdapter.kt
@@ -125,7 +125,7 @@ class BrowserColumnSelectionAdapter(
             binding.buttonToggleColumn.apply {
                 // NICE_TO_HAVE: animate between + and -
                 val isExclude = absoluteAdapterPosition < positionOfAvailableHeading
-                setImageResource(if (isExclude) R.drawable.ic_remove else CommonR.drawable.ic_add)
+                setImageResource(if (isExclude) CommonR.drawable.ic_remove else CommonR.drawable.ic_add)
 
                 val label = context.getString(if (isExclude) CommonString.exclude_column else CommonString.include_column)
                 contentDescription = label
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
index dc7e34e8ee99..04e5290c5497 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
@@ -1702,7 +1702,7 @@ class CardBrowserFragment :
         val (type, selectedIds) = activityViewModel.querySelectionExportData() ?: return
         ExportDialogFragment
             .newInstance(
-                IdsFile.getDirectory(requireContext()),
+                IdsFile.getDirectory(),
                 type,
                 selectedIds,
             ).show(parentFragmentManager, "exportDialog")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
index ad107ed857e3..d2214ff93a9a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -556,13 +556,12 @@ class CardBrowserViewModel(
         multiselectStateFile = idsFile
         pendingSelectionRestore =
             try {
-                idsFile?.getIds()?.map { CardOrNoteId(it) }
+                idsFile?.getIdsOrNull()?.map { CardOrNoteId(it) }
             } catch (e: Exception) {
-                // #19572: I suspect we have a startup bug here, so continue reporting the exception
                 Timber.w(e, "failed to read STATE_MULTISELECT_VALUES")
                 CrashReportService.sendExceptionReport(
                     e = e,
-                    origin = "19572: STATE_MULTISELECT_VALUES",
+                    origin = "CardBrowserViewModel",
                     onlyIfSilent = true,
                 )
                 // fallback to no selections, but still in multiselect mode
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
index 85bbd31be294..30dc458793a5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
@@ -99,9 +99,8 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
             (dialog as? AlertDialog)?.positiveButton?.isEnabled = false
             binding.contentViewsGroup.isVisible = false
             binding.loadingViewsGroup.isVisible = true
-            val fetchNoteIdsResult = runCatching { idsFile.getIds() }
-            val noteIds = fetchNoteIdsResult.getOrNull()
-            if (fetchNoteIdsResult.isFailure || noteIds == null) {
+            val noteIds = runCatching { idsFile.getIdsOrNull() }.getOrNull()
+            if (noteIds == null) {
                 requireActivity().showSnackbar(CommonString.something_wrong)
                 dismiss()
                 return@launch
@@ -190,7 +189,7 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
             context: Context,
             noteIds: List<NoteId>,
         ): FindAndReplaceDialogFragment {
-            val file = IdsFile(IdsFile.getDirectory(context), noteIds, IdsFile.Purpose.FIND_AND_REPLACE)
+            val file = IdsFile(IdsFile.getDirectory(), noteIds, IdsFile.Purpose.FIND_AND_REPLACE)
             return FindAndReplaceDialogFragment().apply {
                 arguments =
                     Bundle().apply {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/IdsFile.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/IdsFile.kt
index dfbaffd6afba..d83e2abfff0b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/IdsFile.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/IdsFile.kt
@@ -5,13 +5,19 @@ package com.ichi2.anki.browser
 import android.content.Context
 import android.os.Parcel
 import android.os.Parcelable
+import androidx.annotation.VisibleForTesting
+import com.ichi2.anki.common.android.appContext
+import com.ichi2.anki.common.time.TimeManager
+import com.ichi2.utils.FileUtil
 import timber.log.Timber
 import java.io.DataInputStream
 import java.io.DataOutputStream
 import java.io.File
 import java.io.FileInputStream
+import java.io.FileNotFoundException
 import java.io.FileOutputStream
 import java.io.IOException
+import kotlin.time.Duration.Companion.days
 
 /**
  * Temporary file containing cards or note IDs to be passed in a Bundle.
@@ -31,7 +37,9 @@ class IdsFile(
      * @param directory parent directory of the file. Generally it should be [getDirectory]
      * @param ids ids to store
      */
-    constructor(directory: File, ids: List<Long>, purpose: Purpose) : this(path = createTempFile(purpose.prefix, ".tmp", directory).path) {
+    constructor(directory: File, ids: List<Long>, purpose: Purpose) : this(
+        path = createTempFile(purpose.prefix, ".tmp", ensureDirectory(directory)).path,
+    ) {
         DataOutputStream(FileOutputStream(this)).use { outputStream ->
             outputStream.writeInt(ids.size)
             for (id in ids) {
@@ -45,7 +53,7 @@ class IdsFile(
      *
      * @throws IOException if the file is missing or corrupt.
      */
-    fun getIds(): List<Long> =
+    private fun readIds(): List<Long> =
         FileInputStream(this).use { fileStream ->
             val inputStream = DataInputStream(fileStream.buffered())
             val size = inputStream.readInt()
@@ -57,6 +65,20 @@ class IdsFile(
             List(size) { inputStream.readLong() }
         }
 
+    /**
+     * Reads the IDs, or returns null if the snapshot is no longer available.
+     * An empty snapshot returns an empty list.
+     *
+     * @throws IOException if the file is corrupt or reading fails after opening it.
+     */
+    fun getIdsOrNull(): List<Long>? =
+        try {
+            readIds()
+        } catch (_: FileNotFoundException) {
+            Timber.w("ID snapshot is no longer available: %s", this)
+            null
+        }
+
     override fun describeContents(): Int = 0
 
     override fun writeToParcel(
@@ -79,7 +101,66 @@ class IdsFile(
     }
 
     companion object {
-        fun getDirectory(context: Context): File = context.cacheDir
+        private const val DIRECTORY_NAME = "idsfiles"
+
+        /** Maximum age of a saved selection, including files still referenced by saved state. */
+        private val FILE_RETENTION = 7.days
+
+        /**
+         * Deletes snapshots older than [FILE_RETENTION], mostly files abandoned after process death.
+         *
+         * Called at startup on an IO dispatcher.
+         *
+         * Note: There is a slim chance that this will clear active snapshots, so downstream code
+         * must handle this possibility.
+         */
+        fun deleteStaleFiles(context: Context = appContext) {
+            // Do not create the snapshot directory just to clean it.
+            deleteStaleFiles(File(context.cacheDir, DIRECTORY_NAME))
+        }
+
+        @VisibleForTesting
+        internal fun deleteStaleFiles(directory: File) {
+            val cutoff = TimeManager.time.intTimeMS() - FILE_RETENTION.inWholeMilliseconds
+            val deleteCount =
+                FileUtil.listFilesOrEmpty(directory).count { file ->
+                    file.withCleanupErrorHandling {
+                        file.isStale(cutoff) && file.deleteWithLogging()
+                    }
+                }
+            Timber.i("Deleted %d expired ID snapshot(s)", deleteCount)
+        }
+
+        private fun File.isStale(cutoff: Long): Boolean {
+            val modified = lastModified()
+            return isFile && modified > 0 && modified < cutoff
+        }
+
+        private fun File.deleteWithLogging(): Boolean =
+            delete().also { deleted ->
+                if (!deleted) Timber.w("Unable to delete expired ID snapshot: %s", this)
+            }
+
+        private inline fun File.withCleanupErrorHandling(block: () -> Boolean): Boolean =
+            try {
+                block()
+            } catch (e: SecurityException) {
+                Timber.w(e, "Unable to access ID snapshot path: %s", this)
+                false
+            }
+
+        /**
+         * Returns the cache path for saved selections. The directory is created when writing a snapshot.
+         * Android may evict these files at any age; callers must continue handling missing snapshots.
+         */
+        fun getDirectory(context: Context = appContext): File = File(context.cacheDir, DIRECTORY_NAME)
+
+        private fun ensureDirectory(directory: File): File {
+            if (!directory.isDirectory && !directory.mkdirs() && !directory.isDirectory) {
+                throw IOException("Unable to create ID snapshot directory: $directory")
+            }
+            return directory
+        }
 
         @JvmField
         @Suppress("unused")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt
index 1a131aa6ed40..0ed094a1d78c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt
@@ -23,6 +23,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.browser.SearchHistory.SearchHistoryEntry
 import com.ichi2.anki.browser.search.CardBrowserSearchViewModel.SearchHistoryItems
 import com.ichi2.anki.browser.toUserSpannable
+import com.ichi2.anki.common.utils.ellipsize
 import com.ichi2.anki.databinding.FragmentStandardSearchBinding
 import com.ichi2.anki.databinding.ViewSavedSearchItemBinding
 import com.ichi2.anki.databinding.ViewSearchHistoryItemBinding
@@ -263,8 +264,9 @@ class StandardSearchFragment :
                     }
 
                 val item = getItem(position)!!
-                binding.title.text = item.name
-                binding.content.text = item.query
+                // Bound the preview before layout to avoid ANRs on very large saved searches.
+                binding.title.text = item.name.ellipsize(MAX_SAVED_SEARCH_PREVIEW_LENGTH)
+                binding.content.text = item.query.ellipsize(MAX_SAVED_SEARCH_PREVIEW_LENGTH)
 
                 binding.root.setOnClickListener { viewModel.submitSavedSearch(item) }
                 binding.insertSavedSearch.setOnClickListener { viewModel.applySavedSearch(item) }
@@ -302,6 +304,8 @@ class StandardSearchFragment :
 
     companion object {
         const val TAG = "STANDARD"
+
+        private const val MAX_SAVED_SEARCH_PREVIEW_LENGTH = 500
     }
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
index 64a2a7c96c21..4d87a66c39c7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
@@ -62,12 +62,12 @@ import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.requireActivity
 import com.ichi2.anki.snackbar.showSnackbar
-import com.ichi2.anki.ui.NonLeadingZeroInputFilter
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
 import com.ichi2.anki.utils.ext.getIntOrNull
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.withProgress
+import com.ichi2.utils.NonLeadingZeroInputFilter
 import com.ichi2.utils.coMeasureTime
 import com.ichi2.utils.customView
 import com.ichi2.utils.moveCursorToEnd
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
index 4684cd0f6de8..23133ea096a0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
@@ -106,7 +106,7 @@ class TagsDialog : AnalyticsDialogFragment {
         viewModelFactory {
             initializer {
                 val idsFile = requireArguments().requireParcelable<IdsFile>(ARG_TAGS_FILE)
-                val noteIds = idsFile.getIds()
+                val noteIds = idsFile.getIdsOrNull() ?: throw IOException("Tag selection is no longer available")
                 val checkedTags =
                     requireNotNull(requireArguments().getStringArrayList(ARG_CHECKED_TAGS)) {
                         "$ARG_CHECKED_TAGS is required"
@@ -151,7 +151,7 @@ class TagsDialog : AnalyticsDialogFragment {
         checkedTags: ArrayList<String> = arrayListOf(),
     ): TagsDialog {
         // TODO: checkedTags is unbounded and could exceed the bundle size
-        val file = IdsFile(IdsFile.getDirectory(context), noteIds, IdsFile.Purpose.TAGS)
+        val file = IdsFile(IdsFile.getDirectory(), noteIds, IdsFile.Purpose.TAGS)
         arguments = this.arguments ?: Bundle().apply {
             putParcelable(ARG_TAGS_FILE, file)
             putParcelable(ARG_DIALOG_TYPE, type)
@@ -389,8 +389,6 @@ class TagsDialog : AnalyticsDialogFragment {
      * @param prefixTag: The tag to be prefilled into the EditText section. A trailing '::' will be appended.
      */
     @NeedsTest("The prefixTag should be prefilled properly")
-    @NeedsTest("Entering an existing tag should show an error and disable the OK button")
-    @NeedsTest("Entering a new valid tag should clear the error and enable the OK button")
     private fun createAddTagDialog(prefixTag: String?) {
         val addTagDialog =
             AlertDialog
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/export/ExportDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/export/ExportDialogFragment.kt
index fba99888aa88..417432dfbfa2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/export/ExportDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/export/ExportDialogFragment.kt
@@ -271,9 +271,12 @@ class ExportDialogFragment : AnalyticsDialogFragment() {
                 buildExportLimit()
             } catch (e: IOException) {
                 Timber.w(e, "Failed to read export IDs")
-                showThemedToast(requireContext(), CommonString.something_wrong, false)
-                return
+                null
             }
+        if (exportLimit == null) {
+            showThemedToast(requireContext(), CommonString.something_wrong, false)
+            return
+        }
         export(exportLimit)
     }
 
@@ -345,18 +348,18 @@ class ExportDialogFragment : AnalyticsDialogFragment() {
      * the selected notes/cards or, if those are not present, to the selected
      * deck(or all decks).
      *
-     * @return an [ExportLimit] with the export constraints
+     * @return an [ExportLimit] with the export constraints, or null if the selection is unavailable
      */
-    private fun buildExportLimit(): ExportLimit =
-        when (arguments?.getSerializableCompat<ExportType>(ARG_TYPE)) {
+    private fun buildExportLimit(): ExportLimit? {
+        return when (arguments?.getSerializableCompat<ExportType>(ARG_TYPE)) {
             ExportType.Notes -> {
-                val ids = requireArguments().requireParcelable<IdsFile>(ARG_IDS_FILE).getIds()
+                val ids = requireArguments().requireParcelable<IdsFile>(ARG_IDS_FILE).getIdsOrNull() ?: return null
 
                 exportLimit { noteIds = noteIds { this.noteIds.addAll(ids) } }
             }
 
             ExportType.Cards -> {
-                val ids = requireArguments().requireParcelable<IdsFile>(ARG_IDS_FILE).getIds()
+                val ids = requireArguments().requireParcelable<IdsFile>(ARG_IDS_FILE).getIdsOrNull() ?: return null
 
                 exportLimit { cardIds = cardIds { this.cids.addAll(ids) } }
             }
@@ -372,6 +375,7 @@ class ExportDialogFragment : AnalyticsDialogFragment() {
                 }
             }
         }
+    }
 
     /** Attempt to delete the associated [IdsFile] and logs the result */
     private fun removeIdsFile() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt
index 1ab9b041c851..f3a383d15c44 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt
@@ -31,7 +31,7 @@ class ProfileManager private constructor(
 ) {
     private val profileContext = context.applicationContext ?: context
 
-    lateinit var activeProfileContext: Context
+    lateinit var activeProfileContext: ProfileContextWrapper
         private set
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
index 874b9e43b0bb..8068fea2fa13 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
@@ -51,6 +51,7 @@ import com.ichi2.utils.title
 import timber.log.Timber
 import java.util.Objects
 import kotlin.math.ceil
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Handles the toolbar inside [com.ichi2.anki.NoteEditorFragment]
@@ -189,7 +190,7 @@ class Toolbar : FrameLayout {
     ): AppCompatImageButton {
         // we use the light theme here to ensure the tint is black on both
         // A null theme can be passed after colorControlNormal is defined (API 25)
-        val themeContext: Context = ContextThemeWrapper(context, R.style.Theme_Light)
+        val themeContext: Context = ContextThemeWrapper(context, CommonR.style.Theme_Light)
         val d = VectorDrawableCompat.create(context.resources, drawable, themeContext.theme)
         return insertItem(id, d, block)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogHost.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogHost.kt
index f5c84eb0de69..6f9df3a49651 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogHost.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogHost.kt
@@ -3,21 +3,14 @@
 package com.ichi2.anki.noteeditor
 
 import android.os.Bundle
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewParameter
 import com.ichi2.anki.noteeditor.data.ToolbarPreferences
-import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
 import com.ichi2.anki.settings.enums.DayTheme
-import com.ichi2.anki.settings.enums.Theme
 import com.ichi2.compose.theme.AnkiDroidTheme
-import com.ichi2.compose.ui.preview.AnkiDroidPreview
-import com.ichi2.compose.ui.preview.AnkiDroidThemeProvider
 import com.ichi2.themes.Themes
 
 private const val STATE_TOOLBAR_LAYOUT_DIALOG = "toolbarLayoutDialog"
@@ -64,65 +57,3 @@ internal class ToolbarLayoutDialogHost {
         outState.putBoolean(STATE_TOOLBAR_LAYOUT_DIALOG, isShowing)
     }
 }
-
-// TODO: Move these previews to ToolbarLayoutDialog.kt once theming is available in :common:android.
-// https://github.com/ankidroid/Anki-Android/issues/22694
-@Preview(name = "Scroll")
-@Composable
-private fun ToolbarLayoutDialogPreview(
-    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
-) {
-    AnkiDroidPreview(theme = theme) {
-        ToolbarLayoutDialog(
-            selected = ToolbarLayoutMode.SCROLL,
-            onSelect = {},
-            onDismiss = {},
-            showSelectionBackground = theme != DayTheme.EINK,
-        )
-    }
-}
-
-@Preview(name = "Stack")
-@Composable
-private fun ToolbarLayoutDialogStackPreview(
-    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
-) {
-    AnkiDroidPreview(theme = theme) {
-        ToolbarLayoutDialog(
-            selected = ToolbarLayoutMode.STACK,
-            onSelect = {},
-            onDismiss = {},
-            showSelectionBackground = theme != DayTheme.EINK,
-        )
-    }
-}
-
-@Preview(name = "Hidden")
-@Composable
-private fun ToolbarLayoutDialogHiddenPreview(
-    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
-) {
-    AnkiDroidPreview(theme = theme) {
-        ToolbarLayoutDialog(
-            selected = ToolbarLayoutMode.HIDDEN,
-            onSelect = {},
-            onDismiss = {},
-            showSelectionBackground = theme != DayTheme.EINK,
-        )
-    }
-}
-
-@Preview(name = "Large text - short window", widthDp = 320, heightDp = 240, fontScale = 2f)
-@Composable
-private fun ToolbarLayoutDialogLargeTextPreview(
-    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
-) {
-    AnkiDroidPreview(theme = theme) {
-        ToolbarLayoutDialog(
-            selected = ToolbarLayoutMode.HIDDEN,
-            onSelect = {},
-            onDismiss = {},
-            showSelectionBackground = theme != DayTheme.EINK,
-        )
-    }
-}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiServer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiServer.kt
index b43da2fc34bf..03e417bf34c6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiServer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiServer.kt
@@ -24,14 +24,15 @@ open class AnkiServer(
             Method.POST -> {
                 val uri = session.uri
                 Timber.d("POST: Requested %s", uri)
-                // NanoHTTPD closes the connection on body read failures by default
+                // NanoHTTPD responds and closes the connection if the body is rejected or can't be read
                 val inputBytes = getSessionBytes(session)
                 try {
                     val data = runBlocking { postHandler.handlePostRequest(PostRequestUri(uri), inputBytes) }
                     buildResponse(data)
                 } catch (exception: Exception) {
-                    Timber.w(exception, "buildResponse failure")
-                    buildResponse(exception.localizedMessage?.encodeToByteArray(), status = Response.Status.INTERNAL_ERROR)
+                    Timber.w(exception, "POST handler failed: %s", uri)
+                    val message = exception.localizedMessage ?: exception.javaClass.name
+                    buildResponse(message.encodeToByteArray(), status = Response.Status.INTERNAL_ERROR)
                 }
             }
             Method.GET -> {
@@ -39,21 +40,20 @@ open class AnkiServer(
                 newFixedLengthResponse(Response.Status.NOT_FOUND, null, null)
             }
             else -> {
-                Timber.d("Ignored request of unhandled method %s, uri %s", session.method, session.uri)
-                newFixedLengthResponse(null)
+                Timber.d("Rejecting request of unhandled method %s, uri %s", session.method, session.uri)
+                // the request body is left unread, so the connection can't be reused
+                newFixedLengthResponse(Response.Status.METHOD_NOT_ALLOWED, null, null).apply {
+                    addHeader("Allow", "POST")
+                    closeConnection(true)
+                }
             }
         }
 
     private fun buildResponse(
-        data: ByteArray?,
+        data: ByteArray,
         mimeType: String = "application/binary",
         status: Response.IStatus = Response.Status.OK,
-    ): Response =
-        if (data == null) {
-            newFixedLengthResponse(null)
-        } else {
-            newChunkedResponse(status, mimeType, ByteArrayInputStream(data))
-        }
+    ): Response = newFixedLengthResponse(status, mimeType, ByteArrayInputStream(data), data.size.toLong())
 
     companion object {
         const val LOCALHOST = "127.0.0.1"
@@ -63,8 +63,18 @@ open class AnkiServer(
         const val ANKIDROID_PREFIX = "/ankidroid/"
         const val ANKIDROID_JS_PREFIX = "/jsapi/"
 
+        /**
+         * @throws NanoHTTPD.ResponseException if the content-length is missing, or isn't
+         * ASCII digits within [Int]. NanoHTTPD sends its status and closes the connection
+         */
         fun getSessionBytes(session: IHTTPSession): ByteArray {
-            val contentLength = session.headers["content-length"]!!.toInt()
+            val header =
+                session.headers["content-length"]
+                    ?: throw ResponseException(Response.Status.LENGTH_REQUIRED, "content-length is required")
+            // RFC 9110: 1*DIGIT. toIntOrNull alone accepts a sign and non-ASCII digits
+            val contentLength =
+                header.takeIf { it.isNotEmpty() && it.all { char -> char in '0'..'9' } }?.toIntOrNull()
+                    ?: throw ResponseException(Response.Status.BAD_REQUEST, "invalid content-length: $header")
             val bytes = ByteArray(contentLength)
             DataInputStream(session.inputStream).readFully(bytes)
             return bytes
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsScreen.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsScreen.kt
index 31a35d360ebf..d27f88803ad7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsScreen.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsScreen.kt
@@ -296,7 +296,7 @@ private fun TimeboxDurationCard(
                     enabled = (textValue.toIntOrNull() ?: minutes) > TimeboxSettingsViewModel.MIN_TIMEBOX_MINUTES,
                 ) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_remove),
+                        painter = painterResource(CommonR.drawable.ic_remove),
                         contentDescription = stringResource(CommonString.minus_sign),
                     )
                 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
index d5d3bdcb528d..2c312da0680f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
@@ -62,11 +62,11 @@ class PreviewerFragment :
             // Read before constructing the ViewModel, which immediately loads the first card.
             val ids =
                 try {
-                    arguments.requireParcelable<IdsFile>(ARG_CARD_IDS_FILE).getIds()
+                    arguments.requireParcelable<IdsFile>(ARG_CARD_IDS_FILE).getIdsOrNull()
                 } catch (e: IOException) {
                     throw UnavailableSelectionException(e)
                 }
-            if (ids.isEmpty()) throw UnavailableSelectionException()
+            if (ids.isNullOrEmpty()) throw UnavailableSelectionException()
             PreviewerViewModel(handle, ids, requireNotNull(arguments.getIntOrNull(ARG_CURRENT_INDEX)))
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt b/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt
index 3524785dd899..0780405ac327 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt
@@ -8,16 +8,21 @@ import android.view.Window
 import android.view.WindowManager
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.coroutineScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.dialogs.LoadingDialogFragment
-import com.ichi2.anki.dialogs.dismissLoadingDialog
 import com.ichi2.anki.dialogs.showLoadingDialog
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.WeakHashMap
@@ -33,9 +38,19 @@ fun <M : Any> AnkiActivity.observeProgress(
     viewModel: HasProgress<M>,
     delayMillis: Duration = 600.milliseconds,
     resolveMessage: Context.(M) -> String,
+) = observeProgressFor(this, viewModel, delayMillis, resolveMessage)
+
+private fun <M : Any> AnkiActivity.observeProgressFor(
+    owner: LifecycleOwner,
+    viewModel: HasProgress<M>,
+    delayMillis: Duration,
+    resolveMessage: Context.(M) -> String,
 ) {
     val dialogTag = "${LoadingDialogFragment.TAG}:${viewModel.javaClass.name}"
-    var dialogVisible = supportFragmentManager.findFragmentByTag(dialogTag) != null
+    var holdingDialog = false
+    var reshowDialog: (() -> Unit)? = null
+    val dialogHolder: () -> Unit = { reshowDialog?.invoke() }
+    val ownerLifecycle = owner.lifecycle
     var backBlock: OnBackPressedCallback? = null
 
     fun blockInput() {
@@ -51,54 +66,114 @@ fun <M : Any> AnkiActivity.observeProgress(
         window.unblockTouches()
     }
 
-    lifecycleScope.launch {
-        repeatOnLifecycle(Lifecycle.State.STARTED) {
-            // Pending "show after delay" job survives subsequent Active emissions so the
-            // anti-flash delay isn't restarted on every progress update. Kept inside the
-            // block: a job cancelled on stop must not linger into the next start.
-            var pendingShow: Job? = null
-            viewModel.progressManager.progress.collect { state ->
-                when (state) {
-                    is ViewModelProgress.Idle -> {
-                        pendingShow?.cancel()
-                        pendingShow = null
-                        dialogVisible = false
-                        dismissLoadingDialog(dialogTag)
-                        unblockInput()
-                    }
-                    is ViewModelProgress.Active -> {
-                        blockInput()
-                        if (dialogVisible) {
+    fun holdDialog() {
+        if (holdingDialog) return
+        holdingDialog = true
+        supportFragmentManager.addDialogHolder(dialogTag, dialogHolder)
+    }
+
+    fun releaseDialog() {
+        if (!holdingDialog) return
+        holdingDialog = false
+        supportFragmentManager.removeDialogHolder(dialogTag, dialogHolder)
+    }
+
+    val restoringDialog =
+        !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) &&
+            supportFragmentManager.findFragmentByTag(dialogTag) != null
+    if (restoringDialog) holdDialog()
+
+    val releaseIfOwnerStopped =
+        LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_START && !ownerLifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) releaseDialog()
+        }
+    lifecycle.addObserver(releaseIfOwnerStopped)
+
+    ownerLifecycle.coroutineScope.launch {
+        try {
+            ownerLifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                // Pending "show after delay" job survives subsequent Active emissions so the
+                // anti-flash delay isn't restarted on every progress update. Kept inside the
+                // block: a job cancelled on stop must not linger into the next start.
+                var pendingShow: Job? = null
+
+                fun showDialogAfter(wait: Duration) =
+                    ownerLifecycle.coroutineScope.launch(Dispatchers.Main) {
+                        delay(wait)
+                        val latest = viewModel.progressManager.progress.value
+                        if (latest is ViewModelProgress.Active) {
+                            holdDialog()
                             showLoadingDialog(
-                                message = formatMessage(state, resolveMessage),
-                                cancellable = state.cancellable,
+                                message = formatMessage(latest, resolveMessage),
+                                cancellable = latest.cancellable,
                                 tag = dialogTag,
                             )
-                            if (state.cancellable) wireCancelListener(viewModel, dialogTag)
-                        } else if (pendingShow == null) {
-                            pendingShow =
-                                launch {
-                                    delay(delayMillis)
-                                    val latest = viewModel.progressManager.progress.value
-                                    if (latest is ViewModelProgress.Active) {
-                                        dialogVisible = true
-                                        showLoadingDialog(
-                                            message = formatMessage(latest, resolveMessage),
-                                            cancellable = latest.cancellable,
-                                            tag = dialogTag,
-                                        )
-                                        if (latest.cancellable) wireCancelListener(viewModel, dialogTag)
-                                    }
-                                    pendingShow = null
-                                }
+                            if (latest.cancellable) wireCancelListener(viewModel, dialogTag)
+                        }
+                        pendingShow = null
+                    }
+
+                reshowDialog = {
+                    pendingShow?.cancel()
+                    pendingShow = showDialogAfter(Duration.ZERO)
+                }
+                val progress =
+                    viewModel.progressManager.progress.onCompletion {
+                        reshowDialog = null
+                        pendingShow?.cancel()
+                        unblockInput()
+                        if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) releaseDialog()
+                    }
+                progress.collect { state ->
+                    when (state) {
+                        is ViewModelProgress.Idle -> {
+                            pendingShow?.cancel()
+                            pendingShow = null
+                            releaseDialog()
+                            unblockInput()
+                        }
+                        is ViewModelProgress.Active -> {
+                            blockInput()
+                            if (holdingDialog) {
+                                pendingShow?.cancel()
+                                pendingShow = showDialogAfter(Duration.ZERO)
+                            } else if (pendingShow == null) {
+                                pendingShow = showDialogAfter(delayMillis)
+                            }
                         }
                     }
                 }
             }
+        } finally {
+            lifecycle.removeObserver(releaseIfOwnerStopped)
+            releaseDialog()
         }
     }
 }
 
+private val dialogHolders = WeakHashMap<FragmentManager, MutableMap<String, MutableList<() -> Unit>>>()
+
+private fun FragmentManager.addDialogHolder(
+    tag: String,
+    reshow: () -> Unit,
+) {
+    dialogHolders.getOrPut(this) { mutableMapOf() }.getOrPut(tag) { mutableListOf() }.add(reshow)
+}
+
+private fun FragmentManager.removeDialogHolder(
+    tag: String,
+    reshow: () -> Unit,
+) {
+    val holders = dialogHolders[this]?.get(tag) ?: return
+    holders.remove(reshow)
+    if (holders.isNotEmpty()) {
+        holders.last().invoke()
+        return
+    }
+    dialogHolders[this]?.remove(tag)
+    (findFragmentByTag(tag) as? DialogFragment)?.dismissAllowingStateLoss()
+}
+
 private val touchBlockCounts = WeakHashMap<Window, Int>()
 
 internal fun Window.blockTouches() {
@@ -131,7 +206,7 @@ private fun AnkiActivity.wireCancelListener(
 }
 
 /**
- * Fragment wrapper that delegates to the host activity.
+ * Follows this fragment's lifecycle, showing the dialog and blocking touches and back on the host activity.
  *
  * If the host is not an [AnkiActivity], logs a warning and returns — no observer is set up.
  *
@@ -154,7 +229,7 @@ fun <M : Any> Fragment.observeProgress(
         )
         return
     }
-    activity.observeProgress(viewModel, delayMillis, resolveMessage)
+    activity.observeProgressFor(this, viewModel, delayMillis, resolveMessage)
 }
 
 private fun <M : Any> Context.formatMessage(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt
index a8c71d294dc2..d69ccafd584d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt
@@ -93,8 +93,8 @@ class SetDueDateDialog : AnalyticsDialogFragment() {
     // used to determine if a rotation has taken place
     private var initialRotation: Int = 0
 
-    val cardIds: List<Long>
-        get() = requireArguments().requireParcelable<IdsFile>(ARG_IDS_FILE).getIds()
+    val cardIds: List<Long>?
+        get() = requireArguments().requireParcelable<IdsFile>(ARG_IDS_FILE).getIdsOrNull()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -102,12 +102,14 @@ class SetDueDateDialog : AnalyticsDialogFragment() {
             try {
                 this.cardIds
             } catch (e: IOException) {
-                // the file may be missing, or truncated if the write was interrupted
                 Timber.w(e, "Failed to read cardIds")
-                showThemedToast(requireContext(), CommonString.something_wrong, false)
-                dismiss()
-                return
+                null
             }
+        if (cardIds == null) {
+            showThemedToast(requireContext(), CommonString.something_wrong, false)
+            dismiss()
+            return
+        }
 
         viewModel.init(cardIds)
         Timber.d("Set due date dialog: %d card(s)", cardIds.size)
@@ -278,7 +280,7 @@ class SetDueDateDialog : AnalyticsDialogFragment() {
                 Timber.d("Ignoring 'set due date' request: dialog is already open")
                 return
             }
-            val dialog = newInstance(IdsFile.getDirectory(activity), cardIds)
+            val dialog = newInstance(IdsFile.getDirectory(), cardIds)
             activity.showDialogFragment(dialog)
         }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt b/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
deleted file mode 100644
index 121559fd80d2..000000000000
--- a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package com.ichi2.anki.settings.enums
-
-import androidx.annotation.StyleRes
-import com.ichi2.anki.R
-import com.ichi2.anki.common.android.R as CommonR
-
-sealed interface Theme : PrefEnum {
-    @get:StyleRes
-    val styleResId: Int
-}
-
-/** [CommonR.array.day_theme_values] */
-enum class DayTheme(
-    override val entryResId: Int,
-    override val styleResId: Int,
-) : Theme {
-    LIGHT(CommonR.string.theme_light_value, R.style.Theme_Light),
-    PLAIN(CommonR.string.theme_plain_value, R.style.Theme_Light_Plain),
-    EINK(CommonR.string.theme_eink_scheme_value, R.style.Theme_Light_Eink),
-}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt b/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
deleted file mode 100644
index 42493d7c59a3..000000000000
--- a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package com.ichi2.anki.settings.enums
-
-import com.ichi2.anki.R
-import com.ichi2.anki.common.android.R as CommonR
-
-/** [CommonR.array.night_theme_values] */
-enum class NightTheme(
-    override val entryResId: Int,
-    override val styleResId: Int,
-) : Theme {
-    BLACK(CommonR.string.theme_black_value, R.style.Theme_Dark_Black),
-    DARK(CommonR.string.theme_dark_value, R.style.Theme_Dark),
-}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt
index 74762b9f77e5..6bfa07aacda4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt
@@ -11,6 +11,7 @@ import android.view.MenuItem
 import android.view.ViewGroup.MarginLayoutParams
 import android.webkit.CookieManager
 import android.webkit.URLUtil
+import android.webkit.WebBackForwardList
 import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
@@ -58,13 +59,22 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
 
     private var shouldHistoryBeCleared = false
 
+    private var isReturningAfterLogin = false
+
+    private val pagesBeforeLogin = mutableListOf<String>()
+
     private var loginRequiredDialog: AlertDialog? = null
 
     private val allowedHosts = listOf(Regex("""^(?:.*\.)?ankiweb\.net$"""), Regex("""^ankiuser\.net$"""), Regex("""^ankisrs\.net$"""))
     private val onBackPressedCallback =
         object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                if (binding.webView.canGoBack()) binding.webView.goBack()
+                if (isReturningAfterLogin) return
+                if (binding.webView.canGoBack()) {
+                    binding.webView.goBack()
+                } else {
+                    pagesBeforeLogin.removeLastOrNull()?.let { returnTo(it) }
+                }
             }
         }
 
@@ -83,7 +93,14 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
             isReload: Boolean,
         ) {
             super.doUpdateVisitedHistory(view, url, isReload)
-            onBackPressedCallback.isEnabled = binding.webView.canGoBack()
+            if (isReturningAfterLogin && url?.startsWith(SHARED_PAGES_PREFIX) == true) {
+                binding.webView.clearHistory()
+                isReturningAfterLogin = false
+            }
+            updateBackPressedCallback()
+            if (url?.startsWith(AFTER_LOGIN_URL) == true && isLoggedInToAnkiWeb()) {
+                returnToSharedDecks()
+            }
         }
 
         override fun onPageFinished(
@@ -94,6 +111,7 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
             if (shouldHistoryBeCleared) {
                 binding.webView.clearHistory()
                 shouldHistoryBeCleared = false
+                updateBackPressedCallback()
             }
             super.onPageFinished(view, url)
         }
@@ -167,8 +185,6 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
     private fun redirectToLogin() {
         val url = getString(R.string.shared_decks_login_url)
         Timber.i("HTTP 429, redirecting to login: '$url'")
-        // TODO: the result of login is typically redirecting the user to their decks
-        // this should be improved
         binding.webView.loadUrl(url)
     }
 
@@ -178,6 +194,28 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
         binding.webView.loadUrl(url)
     }
 
+    private fun returnToSharedDecks() {
+        if (isReturningAfterLogin) return
+        val history = binding.webView.copyBackForwardList()
+        val sharedPages =
+            history.urlsBeforeCurrent
+                .filter { it.startsWith(SHARED_PAGES_PREFIX) }
+                .toList()
+        val url = sharedPages.lastOrNull() ?: return
+        Timber.d("Logged in to AnkiWeb, returning to '$url'")
+        pagesBeforeLogin += sharedPages.dropLast(1)
+        returnTo(url)
+    }
+
+    private fun returnTo(url: String) {
+        isReturningAfterLogin = true
+        binding.webView.loadUrl(url)
+    }
+
+    private fun updateBackPressedCallback() {
+        onBackPressedCallback.isEnabled = binding.webView.canGoBack() || pagesBeforeLogin.isNotEmpty()
+    }
+
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal val webViewClient = SharedDeckWebViewClient()
 
@@ -186,6 +224,9 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
         const val ARG_DOWNLOAD_FILE = "DownloadFile"
 
         const val HTTP_STATUS_TOO_MANY_REQUESTS = 429
+
+        private const val AFTER_LOGIN_URL = "https://ankiweb.net/account/login?afterAuth=1"
+        private const val SHARED_PAGES_PREFIX = "https://ankiweb.net/shared/"
     }
 
     // Show WebView with AnkiWeb shared decks with the functionality to capture downloads and import decks.
@@ -280,6 +321,7 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
         if (item.itemId == R.id.home) {
             // R.id.home refers to a custom 'home' menu item defined in your app resources (res/menu/...).
             shouldHistoryBeCleared = true
+            pagesBeforeLogin.clear()
             binding.webView.loadUrl(resources.getString(R.string.shared_decks_url))
         } else if (item.itemId == android.R.id.home) {
             // android.R.id.home refers to the system-provided "up" button in the app toolbar
@@ -341,3 +383,6 @@ internal fun isLoggedInToAnkiWeb(): Boolean =
         Timber.w(e, "Could not determine login status")
         false
     }
+
+private val WebBackForwardList.urlsBeforeCurrent: Sequence<String>
+    get() = (0 until currentIndex).asSequence().map { getItemAtIndex(it).url }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt
index 79a513faf39c..9b2e41083791 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt
@@ -54,7 +54,11 @@ class ManageTagsViewModel : ViewModel() {
     /** Cached flat list of all tags, rebuilt when the backend tree changes */
     private var tagList: List<TagListItemState> = emptyList()
 
+    /** Explicit collapses override search expansion until the query changes. */
+    private val searchCollapsedTags = mutableSetOf<TagName>()
+
     private var tagOperation: Job? = null
+    private var expansionSave: Job? = null
 
     init {
         refreshTags()
@@ -73,6 +77,7 @@ class ManageTagsViewModel : ViewModel() {
      * of having a filtered tag selected.
      */
     fun filter(query: String) {
+        if (query != searchQuery.value) searchCollapsedTags.clear()
         searchQuery.value = query
         updateState { loaded ->
             loaded.copy(
@@ -87,44 +92,62 @@ class ManageTagsViewModel : ViewModel() {
     /** Checks the complete tag tree, including tags hidden by search or collapsed ancestors. */
     fun tagExists(tag: TagName): Boolean = tagList.any { it.fullTag == tag }
 
-    /** Returns the visible node for [tag], or null with a warning if not found or not loaded */
-    private fun findVisibleNode(tag: TagName): TagListItemState? {
+    /** Finds a tag using its displayed expansion state when visible. */
+    private fun findTagNode(tag: TagName): TagListItemState? {
         val loaded = state.value as? ManageTagsState.Content
         if (loaded == null) {
-            Timber.w("findVisibleNode called while not loaded")
+            Timber.w("findTagNode called while not loaded")
             return null
         }
-        return loaded.visibleNodes.firstOrNull { it.fullTag == tag }.also {
+        return (loaded.visibleNodes.firstOrNull { it.fullTag == tag } ?: tagList.firstOrNull { it.fullTag == tag }).also {
             if (it == null) {
-                Timber.w("Tag not found in visible nodes")
+                Timber.w("Tag not found in hierarchy")
                 Timber.d("Tag: %s", tag)
             }
         }
     }
 
     /**
-     * Expands or collapses [tag] in the tree. Persists the state to the backend.
+     * Expands or collapses [tag] immediately, then saves the preference without a busy state.
+     * Saves run in tap order; a save failure leaves the visible hierarchy intact and reports the error.
      *
      * PERF: ~55ms to process 10k+ tags on my M1; ~350ms to process 10k+ tags in CI
      *
      * @see Tags.setCollapsed
      */
-    fun toggleCollapsed(tag: TagName) =
-        launchTagOperation {
-            val node =
-                findVisibleNode(tag) ?: run {
-                    messageQueue.enqueue(UserMessage.UnexpectedError)
-                    return@launchTagOperation
+    fun toggleCollapsed(tag: TagName): Job {
+        tagOperation?.takeUnless { it.isCompleted }?.let { return it }
+        val previousSave = expansionSave
+        val operation =
+            viewModelScope.launch(start = CoroutineStart.LAZY) {
+                val node =
+                    findTagNode(tag) ?: run {
+                        messageQueue.enqueue(UserMessage.UnexpectedError)
+                        return@launch
+                    }
+                val newCollapsed = !node.collapsed
+                if (searchQuery.value.isNotBlank()) {
+                    if (newCollapsed) searchCollapsedTags.add(node.fullTag) else searchCollapsedTags.remove(node.fullTag)
                 }
-            val newCollapsed = !node.collapsed
-            withCol { tags.setCollapsed(node.fullTag, newCollapsed) }
-            // Update the in-memory list with the new collapsed state
-            tagList =
-                tagList.map {
-                    if (it.fullTag == tag) it.copy(collapsed = newCollapsed) else it
+                tagList =
+                    tagList.map {
+                        if (it.fullTag == tag) it.copy(collapsed = newCollapsed) else it
+                    }
+                updateState { it.copy(visibleNodes = computeVisibleNodes(searchQuery.value), error = null) }
+                previousSave?.join()
+                try {
+                    withCol { tags.setCollapsed(node.fullTag, newCollapsed) }
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: Exception) {
+                    Timber.w(e, "Saving tag expansion failed")
+                    updateState { it.copy(error = e) }
                 }
-            updateState { it.copy(visibleNodes = computeVisibleNodes(searchQuery.value)) }
-        }
+            }
+        expansionSave = operation
+        operation.start()
+        return operation
+    }
 
     /**
      * Deletes [tag] and its children from all notes.
@@ -170,7 +193,14 @@ class ManageTagsViewModel : ViewModel() {
     ) = launchTagOpAndRefresh {
         Timber.i("Moving tag")
         val result = undoableOp { moveTagTree(tag, newParent) }
-        messageQueue.enqueue(TagMoved(result.count))
+        val currentParent = TagName.build(tag.value.substringBeforeLast("::", ""))
+        messageQueue.enqueue(
+            if (result.count == 0 && currentParent != newParent) {
+                UserMessage.UnusedTagNotMoved
+            } else {
+                TagMoved(result.count)
+            },
+        )
     }
 
     private suspend fun loadTags() {
@@ -200,7 +230,14 @@ class ManageTagsViewModel : ViewModel() {
         }
 
         // set 'tagOperation' before executing
-        val operation = viewModelScope.launch(start = CoroutineStart.LAZY) { runTagOperation(block) }
+        val operation =
+            viewModelScope.launch(start = CoroutineStart.LAZY) {
+                runTagOperation {
+                    // Finish preference saves before a reload or a mutation can rename/remove their tags.
+                    expansionSave?.join()
+                    block()
+                }
+            }
         tagOperation = operation
         // calls from observers will now find this job
         operation.start()
@@ -241,7 +278,7 @@ class ManageTagsViewModel : ViewModel() {
             applyCollapsedVisibility(tagList)
         } else {
             // collapsed nodes can be re-expanded if searchQuery matches the leaf nodes
-            applySearchFilter(tagList, searchQuery)
+            applySearchFilter(tagList, searchQuery, searchCollapsedTags)
         }
 
     /** Applies [transform] only if the current state is [ManageTagsState.Content]; no-ops otherwise */
@@ -272,7 +309,7 @@ class ManageTagsViewModel : ViewModel() {
                     val fullTag = if (parentFullTag.isEmpty()) child.name else "$parentFullTag::${child.name}"
                     result.add(
                         TagListItemState(
-                            fullTag = TagName.build(fullTag) ?: error("Invalid tag provided"),
+                            fullTagName = fullTag,
                             displayName = child.name,
                             level = child.level - 1,
                             hasChildren = child.childrenList.isNotEmpty(),
@@ -309,7 +346,9 @@ class ManageTagsViewModel : ViewModel() {
         /**
          * Filters a flat tag list to items matching [searchQuery] (case-insensitive substring),
          * plus their ancestors to preserve hierarchy.
-         * Collapsed nodes are expanded if their children match, ensuring leaf matches are visible.
+         * Expands ancestors only when a match reaches a child's own name. A match inherited
+         * from a parent's name preserves the subtree's existing collapsed state.
+         * [manuallyCollapsedTags] prevents search from reopening tags collapsed by the user.
          *
          * O(n*d) where n = number of tags and d = maximum tag depth.
          */
@@ -317,52 +356,64 @@ class ManageTagsViewModel : ViewModel() {
         fun applySearchFilter(
             allNodes: List<TagListItemState>,
             searchQuery: String,
+            manuallyCollapsedTags: Set<TagName> = emptySet(),
         ): List<TagListItemState> {
             val queryLowercase = searchQuery.lowercase()
             val visibleTags = mutableSetOf<String>()
-            val parentsWithVisibleChildren = mutableSetOf<String>()
+            val ancestorsToExpand = mutableSetOf<String>()
             for (item in allNodes) {
                 if (item.containsLowercase(queryLowercase)) {
                     visibleTags.add(item.fullTag.value)
+                    val expandAncestors = item.matchesOwnComponent(queryLowercase)
                     for (ancestor in item.fullTag.ancestors) {
                         visibleTags.add(ancestor)
-                        parentsWithVisibleChildren.add(ancestor)
+                        if (expandAncestors) ancestorsToExpand.add(ancestor)
                     }
                 }
             }
-            return allNodes
-                .filter { it.fullTag.value in visibleTags }
-                .map {
-                    // expand a collapsed parent if a child matches the search
-                    if (it.collapsed && it.fullTag.value in parentsWithVisibleChildren) {
-                        it.copy(collapsed = false)
-                    } else {
-                        it
+            val filteredNodes =
+                allNodes
+                    .filter { it.fullTag.value in visibleTags }
+                    .map {
+                        if (it.collapsed && it.fullTag.value in ancestorsToExpand && it.fullTag !in manuallyCollapsedTags) {
+                            it.copy(collapsed = false)
+                        } else {
+                            it
+                        }
                     }
-                }
+            return applyCollapsedVisibility(filteredNodes)
         }
     }
 }
 
 /**
- * A flattened representation of a tag for display in a RecyclerView.
+ * A flattened tag row. Equality includes the full spelling so UI updates reach Compose.
  *
- * @param fullTag full hierarchical tag path, e.g. "science::biology"
+ * @param fullTagName full hierarchical tag path, e.g. "science::biology"
  * @param displayName leaf name only, e.g. "biology"
  * @param level tree depth (0 = top-level)
  */
 data class TagListItemState(
-    val fullTag: TagName,
+    val fullTagName: String,
     val displayName: String,
     val level: Int,
     val hasChildren: Boolean,
     val collapsed: Boolean,
 ) {
+    val fullTag: TagName = requireNotNull(TagName.build(fullTagName))
+
     // cache the tag name to support fast case-insensitive searches
-    private val fullTagLower: String = fullTag.value.lowercase()
+    private val fullTagLower: String = fullTagName.lowercase()
 
     /** Case-insensitive check against the full tag path. [query] must be pre-lowercased. */
     fun containsLowercase(query: String): Boolean = fullTagLower.contains(query)
+
+    /** Whether pre-lowercased [query] reaches this tag's own name or its preceding separator. */
+    fun matchesOwnComponent(query: String): Boolean {
+        val matchStart = fullTagLower.lastIndexOf(query)
+        // Include the separator so a query such as "parent::" reveals its immediate children.
+        return matchStart >= 0 && matchStart + query.length > fullTagLower.lastIndexOf("::")
+    }
 }
 
 sealed class ManageTagsState {
@@ -401,6 +452,12 @@ sealed interface UserMessage {
         val notesAffected: Int,
     ) : UserMessage
 
+    /**
+     * The backend leaves an entirely unused subtree in place when asked to move it.
+     * Remove this message and its handling when [Anki issue 5870](https://github.com/ankitects/anki/issues/5870) is fixed.
+     */
+    data object UnusedTagNotMoved : UserMessage
+
     /** @param count number of unused tags removed from the collection */
     data class ClearedUnusedTags(
         val count: Int,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt
index 49c72c78bc03..920c487fb0a4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt
@@ -97,6 +97,12 @@ class TagName private constructor(
     }
 }
 
+/** Returns this tag's path under [parent], or at the top level when the parent is null. */
+internal fun TagName.withParent(parent: TagName?): TagName {
+    val leaf = value.substringAfterLast("::")
+    return requireNotNull(TagName.build(parent?.let { "${it.value}::$leaf" } ?: leaf))
+}
+
 // Extension methods serve two purposes: removing `.value` from the call site
 // and ensuring that collection operation lambdas return `OpChanges`
 // Having Timber.d as a final call means the Lambda returns `Unit`, which is converted to `Any`
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagTreeOperations.kt b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagTreeOperations.kt
index 51158409f324..bd24df20a8e8 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagTreeOperations.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagTreeOperations.kt
@@ -40,8 +40,7 @@ internal fun Collection.moveTagTree(
     newParent: TagName?,
 ): OpChangesWithCount {
     require(newParent == null || !newParent.isSameOrDescendantOf(tag)) { "A tag cannot be moved under itself" }
-    val leaf = tag.value.substringAfterLast("::")
-    val destination = TagName.build(newParent?.let { "${it.value}::$leaf" } ?: leaf)!!
+    val destination = tag.withParent(newParent)
     if (destination == tag) return opChangesWithCount { }
     // Moving one subtree is a prefix rename. The backend reparent operation also rejects
     // valid sibling prefixes (e.g. parent::a beneath parent::ab).
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt b/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt
index 66ad37575c75..ef008a2c9819 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt
@@ -5,13 +5,16 @@ package com.ichi2.compose.ui.dialogs
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialogDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
@@ -29,9 +32,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.ichi2.anki.CommonString
 import com.ichi2.compose.ui.preview.AnkiDroidPreview
@@ -42,7 +50,14 @@ import com.ichi2.compose.ui.preview.DialogPreviews
  * the View based `AlertDialog.input(...)` helper.
  *
  * @param onConfirm called with the text, but only while it is valid
+ * @param initialText initial value shown in the field
+ * @param initialSelection initial cursor position or selected range; defaults to the end of [initialText]
  * @param errorMessageFor error to show for the current input, null when valid
+ * @param helperText shown when no error is displayed; an empty string reserves feedback space
+ * @param description optional context below the title
+ * @param transformInput applied to text edits, not cursor-only changes
+ * @param validateOnInput when false, validate on confirmation instead of while editing
+ * @param enabled whether confirmation is allowed from the button or keyboard
  */
 @Composable
 fun TextInputDialog(
@@ -53,137 +68,124 @@ fun TextInputDialog(
     onDismissRequest: () -> Unit,
     dismissText: String = stringResource(CommonString.dialog_cancel),
     initialText: String = "",
+    initialSelection: TextRange = TextRange(initialText.length),
     maxLengthCounter: Int? = null,
     lengthOf: (String) -> Int = { it.length },
     capitalization: KeyboardCapitalization = KeyboardCapitalization.Sentences,
     errorMessageFor: (String) -> String? = { null },
+    helperText: String? = null,
+    description: String? = null,
+    transformInput: (TextFieldValue) -> TextFieldValue = { it },
+    validateOnInput: Boolean = true,
+    enabled: Boolean = true,
 ) {
-    AnkiDroidDialog(onDismissRequest = onDismissRequest) {
-        TextInputDialogCard(
-            title = title,
-            label = label,
-            confirmText = confirmText,
-            onConfirm = onConfirm,
-            onDismissRequest = onDismissRequest,
-            dismissText = dismissText,
-            initialText = initialText,
-            maxLengthCounter = maxLengthCounter,
-            lengthOf = lengthOf,
-            capitalization = capitalization,
-            errorMessageFor = errorMessageFor,
-        )
+    var input by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(TextFieldValue(initialText, selection = initialSelection))
     }
-}
-
-/** The dialog card itself. Metrics match Material3's own AlertDialog. */
-@Composable
-private fun TextInputDialogCard(
-    title: String,
-    label: String,
-    confirmText: String,
-    onConfirm: (String) -> Unit,
-    onDismissRequest: () -> Unit,
-    dismissText: String,
-    initialText: String,
-    maxLengthCounter: Int?,
-    lengthOf: (String) -> Int,
-    capitalization: KeyboardCapitalization,
-    errorMessageFor: (String) -> String?,
-) {
-    var text by rememberSaveable { mutableStateOf(initialText) }
     var hasUserEdited by rememberSaveable { mutableStateOf(false) }
-    val errorMessage = errorMessageFor(text)
-    val displayedError = errorMessage?.takeIf { hasUserEdited }
+    var submissionAttempted by rememberSaveable { mutableStateOf(false) }
+    val errorMessage = if (validateOnInput || submissionAttempted) errorMessageFor(input.text) else null
+    val displayedError = errorMessage?.takeIf { hasUserEdited || submissionAttempted }
+    val supportingMessage = displayedError ?: helperText
+    val hasSupportingText = maxLengthCounter != null || supportingMessage != null || !validateOnInput
+    val focusRequester = remember { FocusRequester() }
 
     fun confirmIfValid() {
-        if (errorMessageFor(text) == null) onConfirm(text)
+        if (!enabled) return
+        submissionAttempted = true
+        if (errorMessageFor(input.text) == null) onConfirm(input.text)
     }
-
-    val focusRequester = remember { FocusRequester() }
-
-    Surface(
-        modifier = Modifier.widthIn(min = 280.dp, max = 560.dp),
-        shape = AlertDialogDefaults.shape,
-        color = AlertDialogDefaults.containerColor,
-        tonalElevation = AlertDialogDefaults.TonalElevation,
-    ) {
-        Column(modifier = Modifier.padding(24.dp)) {
-            Text(
-                text = title,
-                style = MaterialTheme.typography.headlineSmall,
-                color = AlertDialogDefaults.titleContentColor,
-                modifier = Modifier.padding(bottom = 16.dp),
-            )
-            OutlinedTextField(
-                value = text,
-                onValueChange = {
-                    text = it
-                    hasUserEdited = true
-                },
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .focusRequester(focusRequester),
-                label = { Text(label) },
-                isError = displayedError != null,
-                supportingText =
-                    if (displayedError == null && maxLengthCounter == null) {
-                        null
-                    } else {
-                        {
-                            Row(modifier = Modifier.fillMaxWidth()) {
-                                if (displayedError != null) {
-                                    Text(displayedError, modifier = Modifier.weight(1f))
-                                } else {
-                                    Spacer(modifier = Modifier.weight(1f))
-                                }
-                                if (maxLengthCounter != null) {
-                                    Text("${lengthOf(text)}/$maxLengthCounter")
-                                }
+    AnkiDroidDialog(onDismissRequest = onDismissRequest) {
+        Surface(
+            modifier = Modifier.widthIn(min = 280.dp, max = 560.dp),
+            shape = AlertDialogDefaults.shape,
+            color = AlertDialogDefaults.containerColor,
+            tonalElevation = AlertDialogDefaults.TonalElevation,
+        ) {
+            Layout(modifier = Modifier.padding(24.dp), content = {
+                Column(Modifier.verticalScroll(rememberScrollState())) {
+                    Text(
+                        title,
+                        style = MaterialTheme.typography.headlineSmall,
+                        color = AlertDialogDefaults.titleContentColor,
+                        modifier = Modifier.padding(bottom = if (description == null) 16.dp else 8.dp),
+                    )
+                    if (description != null) {
+                        Text(
+                            description,
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = AlertDialogDefaults.textContentColor,
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier = Modifier.padding(bottom = 16.dp),
+                        )
+                    }
+                    OutlinedTextField(
+                        value = input,
+                        onValueChange = { proposed ->
+                            if (input.text != proposed.text) {
+                                input = transformInput(proposed)
+                                hasUserEdited = true
+                                submissionAttempted = false
+                            } else {
+                                input = proposed
                             }
-                        }
-                    },
-                singleLine = true,
-                keyboardOptions =
-                    KeyboardOptions(
-                        capitalization = capitalization,
-                        imeAction = ImeAction.Done,
-                    ),
-                keyboardActions = KeyboardActions(onDone = { confirmIfValid() }),
-            )
-            LaunchedEffect(focusRequester) { focusRequester.requestFocus() }
-            Row(
-                modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(top = 24.dp),
-                horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
-            ) {
-                TextButton(onClick = onDismissRequest) {
-                    Text(dismissText)
+                        },
+                        modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),
+                        label = { Text(label, Modifier.testTag("text_input_label")) },
+                        isError = displayedError != null,
+                        supportingText =
+                            if (!hasSupportingText) {
+                                null
+                            } else {
+                                {
+                                    Row(Modifier.fillMaxWidth()) {
+                                        if (supportingMessage != null || !validateOnInput) {
+                                            Text(supportingMessage.orEmpty(), Modifier.weight(1f))
+                                        } else {
+                                            Spacer(Modifier.weight(1f))
+                                        }
+                                        if (maxLengthCounter != null) Text("${lengthOf(input.text)}/$maxLengthCounter")
+                                    }
+                                }
+                            },
+                        singleLine = true,
+                        keyboardOptions = KeyboardOptions(capitalization = capitalization, imeAction = ImeAction.Done),
+                        keyboardActions = KeyboardActions(onDone = { confirmIfValid() }),
+                    )
                 }
-                TextButton(
-                    onClick = ::confirmIfValid,
-                    enabled = errorMessage == null,
+                FlowRow(
+                    modifier = Modifier.fillMaxWidth().padding(top = if (hasSupportingText) 8.dp else 24.dp),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
+                    verticalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
-                    Text(confirmText)
+                    TextButton(onClick = onDismissRequest) { Text(dismissText) }
+                    TextButton(
+                        onClick = ::confirmIfValid,
+                        enabled = enabled && (!validateOnInput || errorMessage == null),
+                    ) { Text(confirmText) }
+                }
+            }) { children, constraints ->
+                val actions = children[1].measure(constraints.copy(minHeight = 0))
+                val body =
+                    children[0].measure(
+                        constraints.copy(minHeight = 0, maxHeight = (constraints.maxHeight - actions.height).coerceAtLeast(0)),
+                    )
+                layout(constraints.maxWidth, body.height + actions.height) {
+                    body.placeRelative(0, 0)
+                    actions.placeRelative(0, body.height)
                 }
             }
+            LaunchedEffect(focusRequester) { focusRequester.requestFocus() }
         }
     }
 }
 
+/** @see TextInputDialog */
 @DialogPreviews
 @Composable
 private fun TextInputDialogPreview() {
     AnkiDroidPreview {
-        TextInputDialog(
-            title = "Rename deck",
-            label = "Deck name",
-            confirmText = "Rename",
-            onConfirm = {},
-            onDismissRequest = {},
-            maxLengthCounter = 50,
-        )
+        TextInputDialog("Rename deck", "Deck name", "Rename", {}, {}, maxLengthCounter = 50)
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreferenceCompat.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreferenceCompat.kt
index 12b830c1bedf..46edc9c504c1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreferenceCompat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreferenceCompat.kt
@@ -12,7 +12,7 @@ import androidx.core.widget.doAfterTextChanged
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.databinding.DialogIncrementerPreferenceBinding
-import com.ichi2.anki.ui.NonLeadingZeroInputFilter
+import com.ichi2.utils.NonLeadingZeroInputFilter
 import com.ichi2.utils.moveCursorToEnd
 import com.ichi2.utils.positiveButton
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt
index ea172d1a4753..c5a39468aefd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt
@@ -7,20 +7,15 @@ import android.content.Context
 import android.text.InputFilter
 import android.text.InputType
 import android.util.AttributeSet
-import android.util.TypedValue
 import android.view.View
 import android.widget.EditText
 import androidx.core.content.withStyledAttributes
-import androidx.core.widget.TextViewCompat
 import androidx.preference.EditTextPreference
 import androidx.preference.EditTextPreferenceDialogFragmentCompat
-import com.google.android.material.textview.MaterialTextView
 import com.ichi2.anki.R
-import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.utils.getFormattedStringOrPlurals
-import com.ichi2.utils.setPaddingRelative
+import com.ichi2.utils.numberRangeTitle
 import timber.log.Timber
-import com.google.android.material.R as MaterialR
 
 open class NumberRangePreferenceCompat
     @JvmOverloads // fixes: Error inflating class com.ichi2.preferences.NumberRangePreferenceCompat
@@ -165,30 +160,7 @@ open class NumberRangePreferenceCompat
             override fun onPrepareDialogBuilder(builder: androidx.appcompat.app.AlertDialog.Builder) {
                 super.onPrepareDialogBuilder(builder)
 
-                val titleText = preference.dialogTitle ?: preference.title
-                if (titleText.isNullOrEmpty()) {
-                    return
-                }
-                // Use a custom MaterialTextView to match the title text appearance and padding,
-                // as seen in other dialogs (e.g. "Create deck"). The default TextView renders
-                // the title too small and inconsistent with Material dialog standards.
-                val tv =
-                    MaterialTextView(requireContext()).apply {
-                        text = titleText
-                        setPaddingRelative(start = 24.dp, top = 20.dp, end = 24.dp, bottom = 8.dp)
-
-                        val outValue = TypedValue()
-                        val hasStyle =
-                            context.theme.resolveAttribute(MaterialR.attr.materialAlertDialogTitleTextStyle, outValue, true)
-                        val styleRes = if (hasStyle) outValue.resourceId else 0
-                        if (styleRes != 0) {
-                            TextViewCompat.setTextAppearance(this, styleRes)
-                        } else {
-                            TextViewCompat.setTextAppearance(this, MaterialR.style.TextAppearance_Material3_HeadlineSmall)
-                        }
-                    }
-
-                builder.setCustomTitle(tv)
+                builder.numberRangeTitle(preference.dialogTitle ?: preference.title, requireContext())
             }
 
             /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/FileUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/FileUtil.kt
index b846b19479fe..0c9b84df9cc1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/FileUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/FileUtil.kt
@@ -111,6 +111,18 @@ object FileUtil {
     fun listFiles(dir: File): Array<File> =
         dir.listFiles()
             ?: throw IOException("Failed to list the contents of '$dir'")
+
+    /**
+     * Returns [dir]'s children, or an empty array when [File.listFiles] returns `null`
+     * or throws [SecurityException]. Security exceptions are logged.
+     */
+    fun listFilesOrEmpty(dir: File): Array<out File> =
+        try {
+            dir.listFiles().orEmpty()
+        } catch (e: SecurityException) {
+            Timber.w(e, "Unable to list directory: %s", dir)
+            emptyArray()
+        }
 }
 
 /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt
index 6c88483685f9..70d09f5dc4ec 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt
@@ -7,7 +7,6 @@ import android.content.res.Resources
 import android.view.View
 import androidx.core.view.OnReceiveContentListener
 import androidx.draganddrop.DropHelper
-import com.ichi2.anki.common.utils.Dp
 
 /** @see View.performClick */
 fun View.performClickIfEnabled() {
@@ -35,64 +34,6 @@ fun View.configureView(
     )
 }
 
-/**
- * Sets the relative padding for all dimensions of the view
- *
- * The view may add on the space required to display the scrollbars,
- * depending on the style and visibility of the scrollbars.
- * So the values returned from `getPadding` calls
- * may be different from the values set in this call.
- */
-fun View.setPaddingRelative(px: Int) = setPaddingRelative(px, px, px, px)
-
-/**
- * Sets the relative padding for all dimensions of the view
- *
- * The view may add on the space required to display the scrollbars,
- * depending on the style and visibility of the scrollbars.
- * So the values returned from `getPadding` calls
- * may be different from the values set in this call.
- */
-@Suppress("unused")
-fun View.setPaddingRelative(dp: Dp) = setPaddingRelative(dp.toPx(context))
-
-/**
- * Sets the relative padding
- *
- * The view may add on the space required to display the scrollbars,
- * depending on the style and visibility of the scrollbars.
- * So the values returned from `getPadding` calls
- * may be different from the values set in this call.
- */
-// Since we're in Kotlin, this now allows named arguments!
-@Suppress("unused")
-fun View.setPaddingRelative(
-    start: Dp,
-    top: Dp,
-    end: Dp,
-    bottom: Dp,
-) = setPaddingRelative(start.toPx(context), top.toPx(context), end.toPx(context), bottom.toPx(context))
-
-/**
- * Updates the relative padding for the [View]
- * This version of the method allows using named parameters to just set one or more axes.
- *
- * @see View.setPaddingRelative
- */
-fun View.updatePaddingRelative(
-    start: Dp? = null,
-    top: Dp? = null,
-    end: Dp? = null,
-    bottom: Dp? = null,
-) {
-    setPaddingRelative(
-        start?.toPx(context) ?: this.paddingStart,
-        top?.toPx(context) ?: this.paddingTop,
-        end?.toPx(context) ?: this.paddingEnd,
-        bottom?.toPx(context) ?: this.paddingBottom,
-    )
-}
-
 fun View.isRtl() = isRtl(resources)
 
 fun isRtl(res: Resources): Boolean = res.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL
diff --git a/AnkiDroid/src/main/res/layout/view_browser_column_cell.xml b/AnkiDroid/src/main/res/layout/view_browser_column_cell.xml
index 05478ca1353b..00b66502f784 100644
--- a/AnkiDroid/src/main/res/layout/view_browser_column_cell.xml
+++ b/AnkiDroid/src/main/res/layout/view_browser_column_cell.xml
@@ -4,8 +4,9 @@
     android:layout_width="0dp"
     android:layout_height="match_parent"
     android:layout_weight="1"
+    android:breakStrategy="simple"
     android:paddingStart="4dp"
     android:paddingEnd="4dp"
     android:paddingVertical="1dp"
     android:layout_gravity="top"
-/>
\ No newline at end of file
+/>
diff --git a/AnkiDroid/src/main/res/layout/view_saved_search_item.xml b/AnkiDroid/src/main/res/layout/view_saved_search_item.xml
index 0fa947b3920b..c7a1e0f5713c 100644
--- a/AnkiDroid/src/main/res/layout/view_saved_search_item.xml
+++ b/AnkiDroid/src/main/res/layout/view_saved_search_item.xml
@@ -30,6 +30,8 @@
             android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:ellipsize="end"
             android:gravity="start|center_vertical"
             android:textAlignment="viewStart"
             android:textSize="18sp"
@@ -41,6 +43,8 @@
             android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxLines="3"
+            android:ellipsize="end"
             android:gravity="start|center_vertical"
             android:textAlignment="viewStart"
             android:drawablePadding="10dp"
@@ -64,4 +68,4 @@
 
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/AnkiDroid/src/main/res/values/theme_black.xml b/AnkiDroid/src/main/res/values/theme_black.xml
deleted file mode 100644
index 8ac13482e7f3..000000000000
--- a/AnkiDroid/src/main/res/values/theme_black.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
-
-    <style name="Base.Theme.Dark.Black" parent="Theme_Dark">
-        <!-- Android colors -->
-        <item name="colorPrimary">@color/material_blue_400</item>
-        <item name="colorPrimaryDark">@color/black</item>
-        <item name="colorAccent">@color/material_blue_500</item>
-        <item name="colorSecondaryContainer">#252525</item>
-        <item name="colorSurfaceVariant">#252525</item>
-        <item name="colorOnSurfaceVariant">#CCCCCC</item>
-        <item name="colorOutlineVariant">#555555</item>
-        <item name="colorTertiary">#CCCCCC</item>
-        <item name="colorOnTertiary">#000000</item>
-        <item name="colorSurfaceContainerHigh">#151515</item>
-        <item name="android:textColor">@color/text_color_dark</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
-        <item name="android:colorBackground">@color/theme_black_primary</item>
-        <item name="android:windowBackground">@color/theme_black_primary</item>
-        <item name="preferenceCategoryTitleTextColor">?attr/colorAccent</item>
-        <!-- Action bar styles -->
-        <item name="appBarColor">@color/theme_black_primary</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="actionBarTextColor">@color/white</item>
-        <item name="actionBarPopupTextColor">@color/theme_black_primary_text</item>
-        <item name="actionModeBackground">@color/theme_black_primary_dark</item>
-        <!-- Tab layout -->
-        <item name="tabLayoutBackgroundColor">@color/theme_black_primary_dark</item>
-        <item name="tabActiveIconColor">@color/material_blue_500</item>
-        <!-- Deck list colors and divider -->
-        <item name="currentDeckBackground">@drawable/item_background_selected</item>
-        <item name="currentDeckBackgroundColor">@color/theme_black_row_current</item>
-        <item name="focusedRowBackgroundColor">@color/theme_black_row_current</item>
-        <item name="dynDeckColor">@color/material_light_blue_500</item>
-        <item name="deckDivider">@drawable/divider_black</item>
-        <item name="expandRef">@drawable/ic_chevron_right_white</item>
-        <item name="collapseRef">@drawable/ic_expand_more_white</item>
-        <!-- Count colors -->
-        <item name="newCountColor">@color/material_blue_600</item>
-        <item name="learnCountColor">@color/material_red_400</item>
-        <item name="reviewCountColor">@color/material_green_400</item>
-        <item name="buryCountColor">@color/disabled_gray_dark</item>
-        <item name="zeroCountColor">#202020</item>
-        <!-- Study Screen colors -->
-        <item name="showAnswerButtonBackground">#0c1215</item>
-        <item name="showAnswerColor">@color/theme_black_primary</item>
-        <item name="topBarColor">@color/theme_black_primary</item>
-        <item name="maxTimerColor">@color/material_red_300</item>
-        <item name="answerButtonTextColor">@color/theme_black_primary_text</item>
-        <item name="againButtonTextColor">@color/material_red_400</item>
-        <item name="hardButtonTextColor">@color/white</item>
-        <item name="goodButtonTextColor">@color/material_green_400</item>
-        <item name="easyButtonTextColor">@color/material_blue_700</item>
-
-        <item name="alternativeBackgroundColor">#0C0C0C</item>
-        <item name="againTextColor">@color/material_red_200</item>
-        <item name="hardTextColor">@color/material_orange_200</item>
-        <item name="goodTextColor">@color/material_light_green_200</item>
-        <item name="easyTextColor">@color/material_light_blue_A100</item>
-        <item name="againBackgroundColor">#170e0e</item>
-        <item name="hardBackgroundColor">#19120c</item>
-        <item name="goodBackgroundColor">#0e1310</item>
-        <item name="easyBackgroundColor">#0c1317</item>
-        <!-- Study Screen button drawables -->
-        <item name="againButtonRef">@drawable/footer_button_all_black</item>
-        <item name="hardButtonRef">@drawable/footer_button_all_black</item>
-        <item name="goodButtonRef">@drawable/footer_button_all_black</item>
-        <item name="easyButtonRef">@drawable/footer_button_all_black</item>
-        <item name="againButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
-        <item name="hardButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
-        <item name="goodButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
-        <item name="easyButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
-        <!-- Card Browser Colors -->
-        <item name="cardBrowserDivider">@color/white</item>
-        <!-- Browser colors -->
-        <item name="suspendedColor">#A8A634</item>
-        <item name="selectedColor">#a86634</item>
-        <item name="markedColor">#391080</item>
-        <!-- Note editor colors -->
-        <item name="duplicateColor">#855</item>
-        <!-- Note editor colors -->
-        <item name="editTextBackgroundColor">#EE5C5C5C</item>
-        <item name="editTextHighlightColor">@color/material_light_blue_900</item>
-        <item name="toolbarBackgroundColor">#616161</item>
-        <item name="toolbarIconColor">@color/white</item>
-        <item name="buttonShadowColor">#726B6B</item>
-        <item name="buttonRippleColor">#BABABA</item>
-        <item name="buttonForegroundColor">#363636</item>
-        <!-- FAB -->
-        <item name="fab_normal">#ff303030</item>
-        <item name="fab_pressed">#c8303030</item> <!-- 55 less opacity than fab_normal -->
-        <!-- Images -->
-        <item name="navDrawerImage">@drawable/nav_drawer_logo_black_theme</item>
-        <!-- Dialog styles -->
-        <item name="android:listPreferredItemHeight">56dip</item>
-        <item name="alertDialogTheme">@style/ThemeOverlay.AnkiDroid.AlertDialog.Black</item>
-        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog.Black</item>
-        <!--Custom Tabs colors-->
-        <item name="customTabNavBarColor">#000000</item>
-        <item name="popupBackgroundColor">@color/popup_background_theme_black</item>
-        <item name="android:statusBarColor">@color/black</item>
-
-        <item name="editTextDisabled">@color/material_grey_700</item>
-        <item name="android:navigationBarColor">@color/black</item>
-
-        <!-- Snackbar -->
-        <item name="snackbarTextViewStyle">@style/SnackbarTextStyleBlack</item>
-        <item name="snackbarBackgroundTintColor">#ff303030</item>
-        <item name="snackbarButtonTextColor">@color/material_light_blue_300</item>
-
-        <!-- Introduction -->
-        <item name="introductionLogoTransparent">#55111111</item>
-
-        <!-- Card-->
-        <item name="cardViewStyle">@style/BlackCardBackground</item>
-
-        <!-- ProgressDialog-->
-        <item name="dialogBackground">@color/theme_black_primary_light</item>
-        <item name="progressDialogButtonTextColor">@color/material_light_blue_400</item>
-
-
-        <item name="incrementerButtonBackground">@color/material_blue_grey_900</item>
-    </style>
-
-    <style name="SnackbarTextStyleBlack" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-    <style name="BlackCardBackground" parent="CardView">
-        <item name="cardBackgroundColor">@color/theme_black_primary_light</item>
-    </style>
-
-    <style name="ThemeOverlay.AnkiDroid.AlertDialog.Black" parent="ThemeOverlay.AnkiDroid.AlertDialog">
-        <item name="android:colorBackground">@color/theme_black_primary_light</item>
-    </style>
-
-    <style name="ThemeOverlay.App.BottomSheetDialog.Black" parent="ThemeOverlay.App.BottomSheetDialog">
-        <item name="android:colorBackground">@color/theme_black_primary_light</item>
-        <item name="elevationOverlayEnabled">false</item>
-    </style>
-
-    <style name="Theme_Dark.Black" parent="Base.Theme.Dark.Black"/>
-</resources>
diff --git a/AnkiDroid/src/main/res/values/theme_dark.xml b/AnkiDroid/src/main/res/values/theme_dark.xml
deleted file mode 100644
index b342834633dc..000000000000
--- a/AnkiDroid/src/main/res/values/theme_dark.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
-
-    <style name="Base.Theme.Dark" parent="@style/Theme.Material3.Dark.NoActionBar">
-        <!-- Android colors -->
-        <item name="colorPrimary">@color/material_blue_400</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorPrimaryDark">@color/theme_dark_primary_dark</item>
-        <item name="colorSurface">?android:colorBackground</item>
-        <item name="colorAccent">@color/material_blue_400</item>
-        <item name="colorOnSurface">@color/white</item>
-        <item name="colorPrimaryContainer">@color/white</item> <!-- Switch thumb color when disabled and being pressed -->
-        <item name="colorOnPrimaryContainer">@color/white</item> <!-- FAB icons -->
-
-        <item name="android:textColor">@color/text_color_dark</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
-        <item name="android:colorBackground">@color/material_theme_grey</item>
-        <item name="android:windowBackground">@color/material_theme_grey</item>
-        <item name="colorSecondaryContainer">#3C5A6E</item>
-        <item name="colorSurfaceVariant">#263E50</item>
-        <item name="colorOnSurfaceVariant">#D4D4D4</item>
-        <item name="colorOutlineVariant">#5B819B</item>
-        <item name="colorTertiary">#78CAFF</item>
-        <item name="colorOnTertiary">#00324D</item>
-        <item name="colorOnSecondaryContainer">@color/white</item>
-
-        <item name="colorSurfaceContainerHighest">?attr/colorSurfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">#424C54</item>
-        <item name="colorSurfaceContainer">#0F42A5F5</item>
-        <item name="colorSurfaceContainerLow">?android:attr/colorBackground</item>
-        <!-- Widget colors -->
-        <item name="widgetColorActivated">?attr/colorAccent</item>
-        <item name="preferenceCategoryTitleTextColor">?attr/colorAccent</item>
-        <!-- Navigation drawer -->
-        <item name="navDrawerItemColor">@color/drawer_item_text_dark</item>
-        <item name="navDrawerItemBackgroundColor">@drawable/drawer_item_background_dark</item>
-        <!-- Menu -->
-        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
-        <item name="popupMenuStyle">@style/PopupMenuStyle</item>
-        <item name="spinnerStyle">@style/SpinnerStyle</item>
-        <!-- Action bar styles -->
-        <item name="appBarColor">@color/theme_dark_primary</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="actionBarTextColor">@color/white</item>
-        <item name="actionBarPopupTextColor">@color/theme_dark_primary_text</item>
-        <item name="actionModeBackground">@color/theme_dark_primary</item>
-        <!-- Tab layout -->
-        <item name="tabLayoutBackgroundColor">@color/theme_dark_primary</item>
-        <item name="tabActiveIconColor">@color/material_blue_500</item>
-        <!-- Deck list colors and divider -->
-        <item name="currentDeckBackground">@drawable/item_background_selected</item>
-        <item name="currentDeckBackgroundColor">@color/theme_dark_row_current</item>
-        <item name="focusedRowBackgroundColor">@color/theme_dark_row_current</item>
-        <item name="dynDeckColor">@color/material_light_blue_500</item>
-        <item name="deckDivider">@drawable/divider_dark</item>
-        <item name="expandRef">@drawable/ic_chevron_right_white</item>
-        <item name="collapseRef">@drawable/ic_expand_more_white</item>
-        <!-- Count colors -->
-        <item name="newCountColor">@color/material_indigo_200</item>
-        <item name="learnCountColor">@color/material_red_200</item>
-        <item name="reviewCountColor">@color/material_green_200</item>
-        <item name="buryCountColor">@color/disabled_gray_dark</item>
-        <item name="zeroCountColor">#404040</item>
-        <!-- Study Screen colors -->
-        <item name="showAnswerButtonBackground">#22333f</item>
-        <item name="againButtonBackground">@color/material_red_800</item>
-        <item name="hardButtonBackground">@color/material_blue_grey_800</item>
-        <item name="goodButtonBackground">@color/material_green_800</item>
-        <item name="easyButtonBackground">@color/material_light_blue_800</item>
-        <item name="topBarColor">@color/theme_dark_primary_light</item>
-        <item name="maxTimerColor">@color/material_red_300</item>
-        <item name="answerButtonTextColor">@color/white</item>
-        <item name="againButtonTextColor">@color/white</item>
-        <item name="hardButtonTextColor">@color/white</item>
-        <item name="goodButtonTextColor">@color/white</item>
-        <item name="easyButtonTextColor">@color/white</item>
-
-        <item name="alternativeBackgroundColor">#2a2a2a</item>
-        <item name="againTextColor">@color/material_red_200</item>
-        <item name="hardTextColor">@color/material_orange_200</item>
-        <item name="goodTextColor">@color/material_light_green_200</item>
-        <item name="easyTextColor">@color/material_light_blue_A100</item>
-        <item name="againBackgroundColor">#462828</item>
-        <item name="hardBackgroundColor">#4e3122</item>
-        <item name="goodBackgroundColor">#2c3b2c</item>
-        <item name="easyBackgroundColor">#223946</item>
-        <item name="againIconColor">?againTextColor</item>
-        <item name="hardIconColor">?hardTextColor</item>
-        <item name="goodIconColor">?goodTextColor</item>
-        <item name="easyIconColor">?easyTextColor</item>
-        <!-- Study Screen button drawables -->
-        <item name="showAnswerColor">@color/material_blue_grey_800</item>
-        <item name="againButtonRef">@drawable/footer_button_again_dark</item>
-        <item name="hardButtonRef">@drawable/footer_button_hard_dark</item>
-        <item name="goodButtonRef">@drawable/footer_button_good_dark</item>
-        <item name="easyButtonRef">@drawable/footer_button_easy_dark</item>
-        <item name="againButtonRippleRef">@drawable/footer_button_ripple</item>
-        <item name="hardButtonRippleRef">@drawable/footer_button_ripple</item>
-        <item name="goodButtonRippleRef">@drawable/footer_button_ripple</item>
-        <item name="easyButtonRippleRef">@drawable/footer_button_ripple</item>
-        <!-- Card Browser Colors -->
-        <item name="cardBrowserDivider">@color/white</item>
-        <!-- Browser colors -->
-        <item name="suspendedColor">@color/material_grey_700</item>
-        <item name="buriedColor">#612B09</item>
-        <item name="markedColor">@color/material_deep_purple_400</item>
-        <!-- Note editor colors -->
-        <item name="duplicateColor">#855</item>
-        <item name="editTextBackgroundColor">#EE5C5C5C</item>
-        <item name="editTextHighlightColor">@color/material_light_blue_900</item>
-        <item name="toolbarBackgroundColor">#616161</item>
-        <item name="toolbarIconColor">@color/white</item>
-        <item name="buttonShadowColor">#bdbdbd</item>
-        <item name="buttonRippleColor">#BABABA</item>
-        <item name="buttonForegroundColor">#757575</item>
-        <!-- FAB -->
-        <item name="fab_normal">@color/material_light_blue_700</item>
-        <item name="fab_pressed">@color/material_light_blue_900</item>
-        <!-- Images -->
-        <item name="navDrawerImage">@drawable/nav_drawer_logo_dark_theme</item>
-        <!-- Dialog styles -->
-        <item name="android:listPreferredItemHeight">56dip</item>
-        <item name="dialogCornerRadius">@dimen/dialog_corner_radius</item>
-        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item>
-        <item name="textAllCaps">false</item>
-        <item name="clozeColor">#1976D2</item>
-        <!--Custom Tabs colors-->
-        <item name="customTabNavBarColor">@color/material_grey_800</item>
-        <item name="popupBackgroundColor">@color/popup_background_theme_dark</item>
-        <item name="editTextDisabled">@color/material_grey_500</item>
-        <item name="overflowAndPopupMenuIconColor">#9effffff</item>
-        <!-- StatusBar -->
-        <item name="android:statusBarColor">@color/theme_dark_primary</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <!-- Navbar -->
-        <item name="android:navigationBarColor">@color/material_theme_grey</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
-        <item name="android:navigationBarColor">@color/black</item>
-
-        <!-- Snackbar. Attributes snackbarStyle, snackbarTextViewStyle and snackbarButtonStyle
-             must be *all* present in a theme (or its parent) in order for the snackbar
-             to pick up the proper layout that uses these attributes. -->
-        <item name="snackbarStyle">@style/SnackbarStyle</item>
-        <item name="snackbarTextViewStyle">@style/Widget.MaterialComponents.Snackbar.TextView</item>
-        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
-        <item name="snackbarBackgroundTintColor">#cfcfcf</item>
-        <item name="snackbarButtonTextColor">@color/material_light_blue_900</item>
-
-        <!-- Introduction -->
-        <item name="introductionLogoTransparent">#883d3d3d</item>
-
-        <!-- Widget styles -->
-        <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.Material3</item>
-        <item name="sliderStyle">@style/SliderStyle</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.AnkiDroid</item>
-
-        <!-- ProgressDialog-->
-        <item name="dialogBackground">#ff303030</item>
-        <item name="progressDialogButtonTextColor">@color/material_light_blue_400</item>
-
-        <item name="checkMediaListBackground">@color/material_grey_700</item>
-        <item name="checkMediaListForeground">@color/white</item>
-
-        <!-- AlertDialogTheme-->
-        <item name="alertDialogTheme">@style/ThemeOverlay.AnkiDroid.AlertDialog</item>
-        <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout</item>
-
-        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
-
-        <item name="incrementerButtonBackground">@color/material_theme_grey</item>
-
-        <!-- Reminder troubleshooting -->
-        <item name="reminderTroubleshootingOk">@color/google_green_300</item>
-        <item name="reminderTroubleshootingWarning">@color/google_yellow_300</item>
-
-        <item name="badgeErrorColor">#f45000</item>
-        <item name="badgeWarningColor">#ff5e13</item>
-        <item name="widgetStrokeWidth">0dp</item>
-        <item name="widgetStrokeColor">@color/transparent</item>
-        <item name="studyScreenElevation">0.8dp</item>
-        <item name="whiteboardToolbarCardStyle">?attr/materialCardViewStyle</item>
-    </style>
-
-    <style name="Theme_Dark" parent="Base.Theme.Dark"/>
-</resources>
diff --git a/AnkiDroid/src/main/res/values/theme_plain.xml b/AnkiDroid/src/main/res/values/theme_plain.xml
deleted file mode 100644
index 4bb610040157..000000000000
--- a/AnkiDroid/src/main/res/values/theme_plain.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
-
-    <style name="Base.Theme.Light.Plain">
-        <!-- Android colors -->
-        <item name="colorPrimary">@color/theme_plain_primary</item>
-        <item name="colorPrimaryDark">@color/theme_plain_primary_dark</item>
-        <item name="colorAccent">@color/theme_plain_accent</item>
-        <item name="colorSurfaceContainer">#0F9E9E9E</item>
-        <item name="colorSecondaryContainer">#DDDDDD</item>
-        <item name="colorSurfaceVariant">#EEEEEE</item>
-        <item name="colorOnSurfaceVariant">#555555</item>
-        <item name="colorOutlineVariant">#BBBBBB</item>
-        <item name="colorTertiary">#555555</item>
-        <item name="colorOnTertiary">#FFFFFF</item>
-        <item name="colorSurfaceContainerHigh">#F4F4F4</item>
-        <item name="android:textColor">@color/text_color_light</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
-        <item name="preferenceCategoryTitleTextColor">?attr/colorAccent</item>
-        <!-- Widget colors -->
-        <item name="widgetColorActivated">?attr/colorAccent</item>
-        <!-- Action bar styles -->
-        <item name="actionBarPopupTextColor">@color/theme_plain_primary_text</item>
-        <item name="actionModeBackground">@color/theme_plain_primary</item>
-        <!-- Tab layout -->
-        <item name="tabLayoutBackgroundColor">@color/theme_plain_primary</item>
-        <item name="tabActiveIconColor">@color/white</item>
-        <!-- Study Screen colors -->
-        <item name="topBarColor">@color/theme_plain_primary_light</item>
-        <item name="againTextColor">@color/material_grey_800</item>
-        <item name="hardTextColor">@color/material_grey_800</item>
-        <item name="goodTextColor">@color/material_grey_800</item>
-        <item name="easyTextColor">@color/material_grey_800</item>
-        <item name="againBackgroundColor">@color/material_grey_300</item>
-        <item name="hardBackgroundColor">@color/material_grey_300</item>
-        <item name="goodBackgroundColor">@color/material_grey_300</item>
-        <item name="easyBackgroundColor">@color/material_grey_300</item>
-        <item name="againIconColor">@color/material_red_900</item>
-        <item name="hardIconColor">#B33800</item>
-        <item name="goodIconColor">@color/material_green_900</item>
-        <item name="easyIconColor">@color/material_light_blue_900</item>
-        <!-- Study Screen button drawables -->
-        <item name="showAnswerButtonBackground">@color/theme_plain_primary</item>
-        <item name="showAnswerColor">@color/theme_plain_primary</item>
-        <item name="againButtonRef">@drawable/footer_button_all_plain</item>
-        <item name="hardButtonRef">@drawable/footer_button_all_plain</item>
-        <item name="goodButtonRef">@drawable/footer_button_all_plain</item>
-        <item name="easyButtonRef">@drawable/footer_button_all_plain</item>
-        <item name="againButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
-        <item name="hardButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
-        <item name="goodButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
-        <item name="easyButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
-        <!-- Card Browser Colors -->
-        <item name="cardBrowserDivider">#CCCCCC</item>
-        <!-- Note editor colors -->
-        <item name="editTextBackgroundColor">#EBCCCCCC</item>
-        <item name="editTextHighlightColor">@color/material_grey_300</item>
-        <item name="toolbarBackgroundColor">#D6D7D7</item>
-        <item name="toolbarIconColor">@color/black</item>
-        <item name="buttonShadowColor">#FFAAAAAA</item>
-        <item name="buttonRippleColor">#595959</item>
-        <item name="buttonForegroundColor">#D6D7D7</item>
-        <!-- FAB -->
-        <item name="fab_normal">@color/theme_plain_accent</item>
-        <item name="fab_pressed">@color/theme_plain_accent</item> <!-- No change in opacity on FAB pressed to avoid Android's material shadow artifact on translucent backgrounds -->
-        <!--Custom Tabs colors-->
-        <item name="customTabNavBarColor">@color/material_grey_500</item>
-        <item name="overflowAndPopupMenuIconColor">?attr/colorPrimary</item>
-        <!-- StatusBar -->
-        <item name="android:statusBarColor">@color/theme_plain_primary</item>
-        <!-- Navbar -->
-        <item name="android:navigationBarColor">@color/semi_transparent_black</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
-
-        <item name="currentDeckBackground">@drawable/item_background_selected</item>
-
-        <item name="snackbarButtonTextColor">#96bdce</item>
-
-        <!-- Introduction -->
-        <item name="introductionLogoTransparent">#99FFFFFF</item>
-
-        <!-- Browser Options Dialog-->
-        <item name="colorSurface">@color/white</item>
-
-        <!-- ProgressDialog-->
-        <item name="dialogBackground">@color/white</item>
-        <item name="progressDialogButtonTextColor">@color/theme_plain_primary</item>
-
-        <item name="incrementerButtonBackground">@color/theme_plain_primary</item>
-    </style>
-
-    <style name="Theme_Light.Plain" parent="Base.Theme.Light.Plain"/>
-</resources>
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt
index e0d7fa1b8b56..6b3fe0623c9f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt
@@ -11,23 +11,34 @@ import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.browser.IdsFile
 import com.ichi2.anki.common.crashreporting.CrashReportService.sendExceptionReport
+import com.ichi2.anki.common.time.TimeManager
+import com.ichi2.anki.multimedia.MultimediaArgsStorage
 import com.ichi2.anki.multiprofile.ProfileManager
 import com.ichi2.anki.multiprofile.ProfileManager.Companion.PREF_LAST_ACTIVE_PROFILE_ID
 import com.ichi2.anki.multiprofile.ProfileManager.Companion.PROFILE_REGISTRY_FILENAME
 import com.ichi2.anki.multiprofile.isPhoenixProcess
+import com.ichi2.anki.recorder.VoiceRecorder
 import io.mockk.every
+import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.runBlocking
+import leakcanary.AppWatcher
 import org.junit.After
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.runner.RunWith
 import java.io.File
+import java.io.IOException
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.time.Duration.Companion.days
 
 @RunWith(AndroidJUnit4::class)
 class AnkiDroidAppTest {
@@ -86,6 +97,11 @@ class AnkiDroidAppTest {
         )
     }
 
+    @Test
+    fun `LeakCanary stays off in unit tests`() {
+        assertFalse(AppWatcher.isInstalled)
+    }
+
     @Test
     fun `the application retains the profile manager`() {
         val app = ApplicationProvider.getApplicationContext<AnkiDroidApp>()
@@ -114,6 +130,27 @@ class AnkiDroidAppTest {
         ).forEach { assertTrue("$it is outside $profileDir", it.startsWith(profileDir)) }
     }
 
+    @Test
+    fun `ID snapshots use base storage when no profile was loaded`() =
+        runBlocking {
+            val app = ApplicationProvider.getApplicationContext<AnkiDroidApp>()
+            val manager = app.profileManager
+            try {
+                app.profileManager = null
+                val directory = IdsFile.getDirectory()
+                assertEquals(frameworkBase.cacheDir, directory.parentFile)
+                val file = IdsFile(directory, listOf(42L), IdsFile.Purpose.PREVIEW)
+                assertEquals(listOf(42L), file.getIdsOrNull())
+                assertTrue(file.setLastModified(TimeManager.time.intTimeMS() - 8.days.inWholeMilliseconds))
+
+                app.launchCacheCleanup().join()
+
+                assertFalse(file.exists())
+            } finally {
+                app.profileManager = manager
+            }
+        }
+
     @Test
     fun `ACRA process skips the profile environment`() {
         mockkStatic(::isAcraSenderProcess)
@@ -138,6 +175,73 @@ class AnkiDroidAppTest {
         assertEquals(frameworkBase.filesDir, app.filesDir)
     }
 
+    @Test
+    fun `multimedia cleanup failure does not prevent voice recording cleanup`() =
+        runBlocking {
+            profileRegistry.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, "p_cleanup_failure") }
+            val app = startApplication()
+            val recording =
+                File(VoiceRecorder.recordingsDirectory(app).apply { mkdirs() }, "ankidroid_audiorec-expired.3gp").apply {
+                    writeText("expired recording")
+                }
+            assertTrue(recording.setLastModified(TimeManager.time.intTimeMS() - 8.days.inWholeMilliseconds))
+            mockkObject(MultimediaArgsStorage.Companion)
+            every { MultimediaArgsStorage.create(any()) } throws IOException("unavailable multimedia storage")
+
+            app.launchCacheCleanup().join()
+
+            verify(exactly = 1) { MultimediaArgsStorage.create(app) }
+            assertFalse(recording.exists())
+        }
+
+    @Test
+    fun `multimedia cleanup failure does not prevent ID cleanup`() =
+        runBlocking {
+            profileRegistry.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, "p_multimedia_id_cleanup") }
+            val app = startApplication()
+            val file = IdsFile(IdsFile.getDirectory(app), listOf(1L), IdsFile.Purpose.PREVIEW)
+            assertTrue(file.setLastModified(TimeManager.time.intTimeMS() - 8.days.inWholeMilliseconds))
+            mockkObject(MultimediaArgsStorage.Companion)
+            every { MultimediaArgsStorage.create(any()) } throws IOException("unavailable multimedia storage")
+
+            app.launchCacheCleanup().join()
+
+            verify(exactly = 1) { MultimediaArgsStorage.create(app) }
+            assertFalse(file.exists())
+        }
+
+    @Test
+    fun `voice recording cleanup failure does not prevent ID cleanup`() =
+        runBlocking {
+            profileRegistry.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, "p_voice_id_cleanup") }
+            val app = startApplication()
+            val file = IdsFile(IdsFile.getDirectory(app), listOf(1L), IdsFile.Purpose.PREVIEW)
+            assertTrue(file.setLastModified(TimeManager.time.intTimeMS() - 8.days.inWholeMilliseconds))
+            val recordingsDirectory = VoiceRecorder.recordingsDirectory(app)
+            mockkObject(VoiceRecorder.Companion)
+            every { VoiceRecorder.removeExpiredRecordings(recordingsDirectory, any()) } throws IOException("unavailable recording storage")
+
+            app.launchCacheCleanup().join()
+
+            verify(exactly = 1) { VoiceRecorder.removeExpiredRecordings(recordingsDirectory, any()) }
+            assertFalse(file.exists())
+        }
+
+    @Test
+    fun `explicit cache cleanup uses the active profile's storage`() =
+        runBlocking {
+            for (profile in listOf("default", "p_first", "p_second")) {
+                profileRegistry.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, profile) }
+                val app = startApplication()
+                val directory = IdsFile.getDirectory(app)
+                assertEquals(app.cacheDir, directory.parentFile)
+                val file = IdsFile(directory, listOf(1L), IdsFile.Purpose.PREVIEW)
+                assertTrue(file.setLastModified(TimeManager.time.intTimeMS() - 8.days.inWholeMilliseconds))
+                app.launchCacheCleanup().join()
+                assertFalse(file.exists(), "Cleanup missed $profile")
+            }
+        }
+
     private fun startApplication(): AnkiDroidApp =
         AttachableApp().apply {
             attach(
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt
index b093d5cf8e76..a47cdb1b716f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt
@@ -13,6 +13,8 @@ import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import androidx.recyclerview.widget.RecyclerView
+import com.ichi2.anki.browser.CardBrowserColumn.ANSWER
+import com.ichi2.anki.browser.setColumn
 import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.ui.RecyclerFastScroller
 import com.ichi2.testutils.HIDDEN_GESTURE_BAR
@@ -29,6 +31,23 @@ import org.robolectric.RuntimeEnvironment
  * `./gradlew :AnkiDroid:verifyRoborazziPlayDebug -Pscreenshot --tests "com.ichi2.anki.CardBrowserScreenshotTest"`
  */
 class CardBrowserScreenshotTest : ScreenshotTest() {
+    @Test
+    fun `long browser cells wrap when collapsed and expanded - Issue 22827`() =
+        runTest {
+            val text = "A long paragraph of card text. ".repeat(2000)
+            addBasicNote(text, text)
+            val browser = getBrowserWithNotes(noteCount = 0)
+            browser.viewModel.setColumn(1, ANSWER)
+            advanceRobolectricLooper()
+            browser.waitForSearchResults()
+
+            for ((truncated, state) in listOf(true to "collapsed", false to "expanded", true to "collapsed_again")) {
+                browser.viewModel.setTruncated(truncated).join()
+                advanceRobolectricLooper()
+                captureScreen("long_cells_$state")
+            }
+        }
+
     @Test
     fun cardBrowserWith30Notes() =
         withCardBrowser(noteCount = 50) { browser ->
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index 496cede618a1..19c0e5f8fedc 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -107,6 +107,7 @@ import com.ichi2.testutils.ext.snackbarText
 import com.ichi2.testutils.getSharedPrefs
 import com.ichi2.testutils.parcelledCopy
 import com.ichi2.testutils.saveState
+import com.ichi2.testutils.targetContext
 import com.ichi2.testutils.withSplitPaneUi
 import com.ichi2.testutils.withSplitPaneUiAsync
 import com.ichi2.utils.LanguageUtil
@@ -137,6 +138,7 @@ import org.robolectric.Robolectric
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
 import timber.log.Timber
+import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
@@ -146,6 +148,7 @@ import kotlin.test.assertNotEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNotSame
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 import kotlin.test.fail
 
 @RunWith(AndroidJUnit4::class)
@@ -157,6 +160,25 @@ class CardBrowserTest : RobolectricTest() {
         setUsingSearchView(false)
     }
 
+    @Test
+    fun browserStartsWhenSnapshotDirectoryIsUnavailable() {
+        ensureCollectionLoadIsSynchronous()
+        addBasicNote("front", "back")
+        val directory = File(targetContext.cacheDir, "idsfiles")
+        if (directory.exists()) assertTrue(directory.deleteRecursively())
+        directory.writeText("occupied")
+        try {
+            Robolectric.buildActivity(CardBrowser::class.java).use { controller ->
+                val browser = controller.setup().get()
+                browser.waitForSearchResults()
+                assertEquals(1, browser.viewModel.rowCount)
+                assertEquals(false, browser.viewModel.isInMultiSelectMode)
+            }
+        } finally {
+            assertTrue(directory.delete())
+        }
+    }
+
     @Test
     fun browserIsNotInitiallyInMultiSelectModeWithNoCards() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt
index 24a00598d92d..fc9ae6452dca 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt
@@ -45,6 +45,7 @@ import kotlin.test.assertNotSame
 import kotlin.test.assertNull
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class CoroutineHelpersRobolectricTest : RobolectricTest() {
@@ -264,7 +265,7 @@ class CoroutineHelpersRobolectricTest : RobolectricTest() {
             throwOnShowError = false
             val controller = Robolectric.buildActivity(FragmentActivity::class.java).also(::saveControllerForCleanup)
             val activity = controller.create().get()
-            activity.setTheme(R.style.Theme_Light)
+            activity.setTheme(CommonR.style.Theme_Light)
 
             activity.launchCatchingTask { withCol { } }
             advanceRobolectricLooper()
@@ -295,7 +296,7 @@ class CoroutineHelpersRobolectricTest : RobolectricTest() {
             throwOnShowError = false
             val controller = Robolectric.buildActivity(FragmentActivity::class.java).also(::saveControllerForCleanup)
             val activity = controller.create().get()
-            activity.setTheme(R.style.Theme_Light)
+            activity.setTheme(CommonR.style.Theme_Light)
 
             activity.launchCatchingTask { withCol { } }
             advanceRobolectricLooper()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerNoExternalFilesDirTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerNoExternalFilesDirTest.kt
index 7fdc2bc490d5..fa841b489000 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerNoExternalFilesDirTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerNoExternalFilesDirTest.kt
@@ -2,7 +2,7 @@
 
 package com.ichi2.anki
 
-import android.content.Context
+import android.Manifest
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -26,22 +26,20 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
-import org.robolectric.annotation.Implementation
-import org.robolectric.annotation.Implements
 import org.robolectric.shadows.ShadowDialog
-import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
 import kotlin.io.path.absolutePathString
 
 @RunWith(AndroidJUnit4::class)
-@Config(shadows = [ShadowNullExternalFilesDir::class])
+@Config(shadows = [ShadowNullExternalStorage::class])
 class DeckPickerNoExternalFilesDirTest : RobolectricTest() {
     // TODO: @Config(sdk = [Build.VERSION_CODES.BAKLAVA]) // Bug 460912704 occurs on Android 16
     @Test
     fun `Fatal error is shown on fresh startup getExternalFilesDir is null`() {
         // Currently undefined if we should fail when PREF_COLLECTION_PATH is set
         //  but getExternalFilesDir returns null
+        assertThat(targetContext.getExternalFilesDir(null), equalTo(null))
 
         // IntroductionActivity should be skipped by our code so we can show the error
         // without user interaction
@@ -54,6 +52,7 @@ class DeckPickerNoExternalFilesDirTest : RobolectricTest() {
     @Test
     @Config(application = AnkiDroidAppWithCollectionButUnwritableStorage::class)
     fun `Fatal error is shown when getExternalFilesDir is null and collection is set but unwritable`() {
+        assertThat(targetContext.getExternalFilesDir(null), equalTo(null))
         // IntroductionActivity should be skipped by our code so we can show the error
         // without user interaction
         deckPicker(skipIntroduction = false) {
@@ -65,6 +64,7 @@ class DeckPickerNoExternalFilesDirTest : RobolectricTest() {
     @Test
     fun `fatal error is shown after 'Create a new collection' and getExternalFilesDir is null`() =
         try {
+            assertThat(targetContext.getExternalFilesDir(null), equalTo(null))
             AnkiDroidApp.clearFatalError()
             withNoWritePermission {
                 CollectionHelper.ankiDroidDirectoryOverride = tempFolder.newFolder()
@@ -92,23 +92,17 @@ class DeckPickerNoExternalFilesDirTest : RobolectricTest() {
         }
 }
 
-/**
- * A shadow which makes [Context.getExternalFilesDir] return `null`
- */
-@Suppress("ProtectedInFinal", "unused")
-@Implements(
-    className = "android.app.ContextImpl",
-    isInAndroidSdk = false,
-)
-class ShadowNullExternalFilesDir {
-    @Implementation
-    protected fun getExternalFilesDir(type: String?): File? = null
-}
-
 class AnkiDroidAppWithCollectionButUnwritableStorage : AnkiDroidApp() {
     override fun onCreate() =
         withTempDir("DeckPickerNoExternalFilesDirTest") { path ->
             try {
+                // Legacy storage permission is what reaches initializeAnkiDroidDirectory
+                // after a collection path is already saved. The mock then throws, and a
+                // null external files dir becomes the storage fatal error.
+                shadowOf(this).grantPermissions(
+                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                )
                 mockkObject(CollectionHelper)
                 every { CollectionHelper.initializeAnkiDroidDirectory(any()) } throws StorageAccessException("testing")
                 this.sharedPrefs().edit {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt
index d68100985752..f32f6e1069dd 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt
@@ -16,6 +16,7 @@ import org.hamcrest.Matchers
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class NoteTypeFieldEditorTest(
@@ -88,7 +89,7 @@ class NoteTypeFieldEditorTest(
         fieldNameInput: EditText,
         fieldOperationType: FieldOperationType,
     ): AlertDialog =
-        AlertDialog.Builder(ContextThemeWrapper(targetContext, R.style.Theme_Light)).show {
+        AlertDialog.Builder(ContextThemeWrapper(targetContext, CommonR.style.Theme_Light)).show {
             positiveButton(text = "") {
                 try {
                     val noteTypeName = "Basic"
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ShadowNullExternalStorage.java b/AnkiDroid/src/test/java/com/ichi2/anki/ShadowNullExternalStorage.java
new file mode 100644
index 000000000000..fcb4d3afaed3
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ShadowNullExternalStorage.java
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki;
+
+import android.os.Environment;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowEnvironment;
+
+import java.io.File;
+
+/**
+ * Makes {@code Context.getExternalFilesDir} return null without replacing {@code ShadowContextImpl}.
+ *
+ * <p>{@code ShadowContextImpl.getExternalFilesDir} returns null when
+ * {@link Environment#getExternalStoragePublicDirectory} does.
+ */
+@Implements(Environment.class)
+public class ShadowNullExternalStorage extends ShadowEnvironment {
+    @Implementation
+    public static File getExternalStoragePublicDirectory(String type) {
+        return null;
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt
index 422609457538..33cf1794a69a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt
@@ -14,7 +14,9 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.commit
 import androidx.fragment.app.commitNow
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -30,6 +32,7 @@ import com.ichi2.testutils.ext.triggerDeckNotFoundInLimitsMap
 import com.ichi2.testutils.launchFragmentInContainer
 import com.ichi2.testutils.withFragment
 import com.ichi2.utils.neutralButton
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestScope
@@ -46,6 +49,7 @@ import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
 import kotlin.test.assertNotNull
+import kotlin.test.assertNotSame
 import kotlin.test.assertNull
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
@@ -169,6 +173,25 @@ class StudyOptionsFragmentTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `returning from another panel keeps a single progress observer`() =
+        runTest {
+            withStudyOptions {
+                val firstView = requireView()
+
+                parentFragmentManager.commit {
+                    replace(android.R.id.content, Fragment())
+                    addToBackStack(null)
+                }
+                parentFragmentManager.executePendingTransactions()
+                parentFragmentManager.popBackStackImmediate()
+
+                assertNotSame(firstView, requireView())
+                val progress = viewModel.progressManager.progress as MutableStateFlow<*>
+                assertEquals(1, progress.subscriptionCount.value)
+            }
+        }
+
     /** Issue 22348: replacing the tablet panel can detach it before its initial refresh starts. */
     @Test
     @Config(qualifiers = "xlarge")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt
index 964566d2c86e..c5a9ed0b3e33 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt
@@ -7,6 +7,7 @@ import anki.scheduler.CardAnswer.Rating
 import app.cash.turbine.test
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.observability.ensureOpsExecuted
+import com.ichi2.anki.progress.ViewModelProgress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
@@ -172,6 +173,24 @@ class StudyOptionsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `rebuildCram - reports progress`() =
+        runTest {
+            addBasicNote()
+            addDynamicDeck("Filtered", "")
+
+            assertProgressAround(StudyOptionsProgress.REBUILDING_FILTERED_DECK) { viewModel.rebuildCram() }
+        }
+
+    @Test
+    fun `emptyCram - reports progress`() =
+        runTest {
+            addBasicNote()
+            addDynamicDeck("Filtered", "")
+
+            assertProgressAround(StudyOptionsProgress.EMPTYING_FILTERED_DECK) { viewModel.emptyCram() }
+        }
+
     @Test
     fun `unbury - is undoable`() =
         runTest {
@@ -300,6 +319,20 @@ class StudyOptionsViewModelTest : RobolectricTest() {
             }
         }
 
+    private suspend fun assertProgressAround(
+        message: StudyOptionsProgress,
+        op: suspend () -> Unit,
+    ) {
+        viewModel.progressManager.progress.test {
+            assertIs<ViewModelProgress.Idle>(awaitItem())
+            op()
+            val active = assertIs<ViewModelProgress.Active<StudyOptionsProgress>>(awaitItem())
+            assertEquals(message, active.message)
+            assertIs<ViewModelProgress.Idle>(awaitItem())
+            expectNoEvents()
+        }
+    }
+
     /** Hold the production queue as a sync would; restore Robolectric's lock after all work finishes. */
     private suspend fun withBlockedCollectionQueue(block: suspend CoroutineScope.(releaseQueue: () -> Unit) -> Unit) {
         val previousQueue = CollectionManager.setTestDispatcher(Dispatchers.IO.limitedParallelism(1), useReentrantLock = false)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestDeckStatusTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestDeckStatusTest.kt
index 570adc53487e..3f36625575b9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestDeckStatusTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestDeckStatusTest.kt
@@ -11,7 +11,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.AnkiDroidApp
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.awaitInitialDeckHolder
 import com.ichi2.anki.common.time.TimeManager
@@ -27,6 +26,7 @@ import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class AnkiquestDeckStatusTest : RobolectricTest() {
@@ -93,7 +93,7 @@ class AnkiquestDeckStatusTest : RobolectricTest() {
     }
 
     private fun bind(states: Map<DeckId, DailyDeckState>): Map<DeckId, DeckAdapter.ViewHolder> {
-        val context = ContextThemeWrapper(targetContext, R.style.Theme_Light)
+        val context = ContextThemeWrapper(targetContext, CommonR.style.Theme_Light)
         val adapter =
             DeckAdapter(
                 context,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestPrivateAccessTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestPrivateAccessTest.kt
index 939b840862ba..41d696eba1a2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestPrivateAccessTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ankiquest/AnkiquestPrivateAccessTest.kt
@@ -100,7 +100,7 @@ class AnkiquestPrivateAccessTest : RobolectricTest() {
             Ankiquest.leaderboard()
             Ankiquest.profile()
 
-            assertEquals(listOf("/api/leaderboard", "/api/profile/member%20name"), requests.map { it.path })
+            assertEquals(setOf("/api/leaderboard", "/api/profile/member%20name"), requests.map { it.path }.toSet())
             assertTrue(requests.all { it.authorization == "Bearer member-secret" })
             assertTrue(requests.all { it.method == "GET" && it.body.isEmpty() })
         }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt
index 0ffb13cf8256..33f543920811 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt
@@ -8,16 +8,16 @@ import android.widget.FrameLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class BrowserMultiColumnAdapterRowsTest : RobolectricTest() {
-    private val browserContext by lazy { ContextThemeWrapper(targetContext, R.style.Theme_Light) }
+    private val browserContext by lazy { ContextThemeWrapper(targetContext, CommonR.style.Theme_Light) }
 
     @Test
     fun `scroll during search refresh does not crash - Issue 17759`() =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt
index 72e360729a13..0a6c878bdbf2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt
@@ -1103,7 +1103,7 @@ class CardBrowserViewModelTest : JvmTest() {
             val data = queryPreviewIntentData()
             assertThat(data.currentIndex, equalTo(0))
 
-            data.idsFile.getIds().also { actualCardIds ->
+            assertNotNull(data.idsFile.getIdsOrNull()).also { actualCardIds ->
                 assertThat("previewing a note previews cards", actualCardIds, hasSize(5))
 
                 val firstCardIds =
@@ -1127,7 +1127,7 @@ class CardBrowserViewModelTest : JvmTest() {
         runViewModelTest(notes = 2) {
             val data = queryPreviewIntentData()
             assertThat(data.currentIndex, equalTo(0))
-            assertThat(data.idsFile.getIds(), hasSize(2))
+            assertThat(data.idsFile.getIdsOrNull(), hasSize(2))
         }
 
     @Test
@@ -1136,7 +1136,7 @@ class CardBrowserViewModelTest : JvmTest() {
             selectRowsWithPositions(0).also {
                 val data = queryPreviewIntentData()
                 assertThat(data.currentIndex, equalTo(0))
-                assertThat(data.idsFile.getIds(), hasSize(2))
+                assertThat(data.idsFile.getIdsOrNull(), hasSize(2))
             }
 
             selectNone()
@@ -1145,7 +1145,7 @@ class CardBrowserViewModelTest : JvmTest() {
             selectRowsWithPositions(1).also {
                 val data = queryPreviewIntentData()
                 assertThat(data.currentIndex, equalTo(1))
-                assertThat(data.idsFile.getIds(), hasSize(2))
+                assertThat(data.idsFile.getIdsOrNull(), hasSize(2))
             }
         }
 
@@ -1870,7 +1870,7 @@ class CardBrowserViewModelTest : JvmTest() {
             assertThat("two rows are selected", selectedRows, hasSize(2))
 
             handle[STATE_MULTISELECT_VALUES] = generateExpensiveSavedState()
-            val savedIds = handle.multiselectStateFile!!.getIds()
+            val savedIds = handle.multiselectStateFile!!.getIdsOrNull()
             val expectedIds = selectedRows.map { it.cardOrNoteId }
             assertThat("saved selection matches the rows", savedIds, containsInAnyOrder(*expectedIds.toTypedArray()))
         }
@@ -1907,6 +1907,20 @@ class CardBrowserViewModelTest : JvmTest() {
         }
     }
 
+    @Test
+    fun `saving multiselect state recreates an evicted snapshot directory`() {
+        val directory = File(createTransientDirectory(), "idsfiles").apply { mkdirs() }
+        runViewModelTest(notes = 2, initMode = InitMode.NO_DELAY, cacheDir = directory) {
+            selectRowAtPosition(1)
+            generateExpensiveSavedState()
+            assertTrue(directory.deleteRecursively())
+
+            val replacement = assertNotNull(generateExpensiveSavedState().multiselectStateFile)
+
+            assertEquals(selectedRows.map { it.cardOrNoteId }, replacement.getIdsOrNull())
+        }
+    }
+
     @Test
     fun `failed replacement preserves restored multiselect state file`() {
         val handle = SavedStateHandle()
@@ -1915,17 +1929,17 @@ class CardBrowserViewModelTest : JvmTest() {
             handle[STATE_MULTISELECT_VALUES] = generateExpensiveSavedState()
         }
         val restoredFile = assertNotNull(handle.multiselectStateFile)
-        val savedIds = restoredFile.getIds()
+        val savedIds = assertNotNull(restoredFile.getIdsOrNull())
 
-        // A missing cache directory makes the replacement write fail without affecting the old file.
+        // A file at the directory path prevents replacement without affecting the old snapshot.
         runViewModelTest(
             savedStateHandle = handle,
             initMode = InitMode.NO_DELAY,
-            cacheDir = File(createTransientDirectory(), "missing"),
+            cacheDir = File(createTransientDirectory(), "blocked").apply { writeText("occupied") },
         ) {
             assertThat("selection is restored", selectedRows, hasSize(1))
             assertFailsWith<IOException> { generateExpensiveSavedState() }
-            assertThat("previous snapshot remains readable", restoredFile.getIds(), equalTo(savedIds))
+            assertThat("previous snapshot remains readable", restoredFile.getIdsOrNull(), equalTo(savedIds))
         }
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt
index 9b13a756dd38..78caacb2a1c6 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt
@@ -32,6 +32,7 @@ import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class FindAndReplaceDialogFragmentTest : RobolectricTest() {
@@ -49,7 +50,7 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
                     arguments = Bundle().apply { putParcelable(FindAndReplaceDialogFragment.ARG_IDS, file) }
                 }
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Theme_Light)
+                controller.get().setTheme(CommonR.style.Theme_Light)
                 val activity = controller.setup().get()
                 activity.setContentView(CoordinatorLayout(activity).apply { id = R.id.root_layout })
                 fragment.show(activity.supportFragmentManager, "find-replace")
@@ -109,7 +110,7 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
                 .launch(
                     fragmentClass = FindAndReplaceDialogFragment::class.java,
                     fragmentArgs = Bundle().apply { putParcelable(FindAndReplaceDialogFragment.ARG_IDS, file) },
-                    themeResId = R.style.Theme_Light,
+                    themeResId = CommonR.style.Theme_Light,
                 ).use { scenario ->
                     scenario.onFragment { fragment ->
                         advanceUntilIdle()
@@ -149,7 +150,7 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
             .launch(
                 fragmentClass = FindAndReplaceDialogFragment::class.java,
                 fragmentArgs = Bundle().apply { putParcelable(FindAndReplaceDialogFragment.ARG_IDS, file) },
-                themeResId = R.style.Theme_Light,
+                themeResId = CommonR.style.Theme_Light,
             ).use { scenario -> scenario.onFragment { fragment -> fragment.action() } }
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/IdsFileTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/IdsFileTest.kt
index 27e535f7373b..6f69bacf2018 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/IdsFileTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/IdsFileTest.kt
@@ -2,23 +2,49 @@
 
 package com.ichi2.anki.browser
 
+import android.content.Context
+import android.content.ContextWrapper
 import android.os.Parcel
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.time.Time
+import com.ichi2.anki.common.time.TimeManager
+import com.ichi2.anki.multiprofile.ProfileContextWrapper
+import com.ichi2.anki.multiprofile.ProfileId
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.targetContext
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import java.io.DataOutputStream
+import java.io.File
 import java.io.IOException
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.days
 
 @RunWith(AndroidJUnit4::class)
-class IdsFileTest {
+class IdsFileTest : AndroidTest {
     @get:Rule
     val temporaryFolder = TemporaryFolder()
 
+    @Test
+    fun `snapshot directory is created only when writing`() {
+        val directory = IdsFile.getDirectory(storageContext)
+        assertEquals(File(storageContext.cacheDir, "idsfiles"), directory)
+        assertFalse(directory.exists())
+        IdsFile(directory, listOf(42L), IdsFile.Purpose.PREVIEW)
+        assertTrue(directory.isDirectory)
+    }
+
     @Test
     fun `purposes preserve existing snapshot prefixes`() {
         val expectedPrefixes =
@@ -35,7 +61,7 @@ class IdsFileTest {
             val file = IdsFile(temporaryFolder.root, listOf(42L), purpose)
             assertTrue(file.name.startsWith(prefix))
             assertTrue(file.name.endsWith(".tmp"))
-            assertEquals(listOf(42L), file.getIds())
+            assertEquals(listOf(42L), file.getIdsOrNull())
         }
     }
 
@@ -48,8 +74,8 @@ class IdsFileTest {
             file.writeToParcel(parcel, 0)
             parcel.setDataPosition(0)
             val restored = IdsFile.CREATOR.createFromParcel(parcel)
-            assertEquals(ids, restored.getIds())
-            assertEquals(ids, restored.getIds())
+            assertEquals(ids, restored.getIdsOrNull())
+            assertEquals(ids, restored.getIdsOrNull())
             assertTrue(file.exists())
         } finally {
             parcel.recycle()
@@ -59,16 +85,16 @@ class IdsFileTest {
     @Test
     fun `empty selection is distinct from a missing file`() {
         val file = IdsFile(temporaryFolder.root, emptyList(), IdsFile.Purpose.PREVIEW)
-        assertEquals(emptyList(), file.getIds())
+        assertEquals(emptyList(), file.getIdsOrNull())
         assertTrue(file.delete())
-        assertFailsWith<IOException> { file.getIds() }
+        assertNull(file.getIdsOrNull())
     }
 
     @Test
     fun `incomplete header cannot be read`() {
         val file = IdsFile(temporaryFolder.root, emptyList(), IdsFile.Purpose.PREVIEW)
         file.writeBytes(byteArrayOf(0, 0))
-        assertFailsWith<IOException> { file.getIds() }
+        assertFailsWith<IOException> { file.getIdsOrNull() }
     }
 
     @Test
@@ -79,7 +105,7 @@ class IdsFileTest {
                 it.writeInt(count)
                 it.writeLong(1L)
             }
-            assertFailsWith<IOException>("count: $count") { file.getIds() }
+            assertFailsWith<IOException>("count: $count") { file.getIdsOrNull() }
         }
     }
 
@@ -91,7 +117,164 @@ class IdsFileTest {
                 it.writeInt(count)
                 it.writeLong(1L)
             }
-            assertFailsWith<IOException>("count: $count") { file.getIds() }
+            assertFailsWith<IOException>("count: $count") { file.getIdsOrNull() }
         }
     }
+
+    private val now = 1_800_000_000_000L
+    private lateinit var storageContext: ProfileContextWrapper
+
+    @Before
+    fun setUpStorage() {
+        val time = mockk<Time>()
+        every { time.intTimeMS() } returns now
+        TimeManager.resetWith(time)
+        val root = temporaryFolder.newFolder("storage")
+        val base =
+            object : ContextWrapper(targetContext) {
+                override fun getApplicationContext(): Context = this
+
+                override fun getNoBackupFilesDir() = File(root, "no_backup").apply { mkdirs() }
+
+                override fun getFilesDir() = File(root, "files").apply { mkdirs() }
+
+                override fun getCacheDir() = File(root, "cache").apply { mkdirs() }
+
+                override fun getExternalCacheDir() = File(root, "external-cache").apply { mkdirs() }
+            }
+        storageContext = ProfileContextWrapper.create(base, ProfileId.DEFAULT, root)
+    }
+
+    @After
+    fun resetTime() = TimeManager.reset()
+
+    @Test
+    fun `directory creation fails clearly when a file occupies the path`() {
+        val path = File(storageContext.cacheDir, "idsfiles").apply { writeText("occupied") }
+        val exception =
+            assertFailsWith<IOException> {
+                IdsFile(IdsFile.getDirectory(storageContext), listOf(1L), IdsFile.Purpose.PREVIEW)
+            }
+        assertTrue(exception.message.orEmpty().contains(path.path))
+    }
+
+    @Test
+    fun `snapshots and cleanup are isolated by profile`() {
+        val otherProfile =
+            ProfileContextWrapper.create(
+                storageContext.baseContext,
+                ProfileId("p_other"),
+                File(storageContext.filesDir.parentFile, "p_other"),
+            )
+        val file = IdsFile(IdsFile.getDirectory(storageContext), listOf(9L), IdsFile.Purpose.PREVIEW).aged(8.days.inWholeMilliseconds)
+        val otherFile = IdsFile(IdsFile.getDirectory(otherProfile), listOf(10L), IdsFile.Purpose.PREVIEW).aged(8.days.inWholeMilliseconds)
+        assertEquals(otherProfile.cacheDir, otherFile.parentFile!!.parentFile)
+        IdsFile.deleteStaleFiles(storageContext)
+        assertFalse(file.exists())
+        assertTrue(otherFile.exists())
+        IdsFile.deleteStaleFiles(otherProfile)
+        assertFalse(otherFile.exists())
+    }
+
+    @Test
+    fun `cleanup removes only files older than the retention boundary`() {
+        val directory = IdsFile.getDirectory(storageContext)
+        val expired = IdsFile(directory, listOf(1L), IdsFile.Purpose.PREVIEW).aged(7.days.inWholeMilliseconds + 1)
+        val boundary = IdsFile(directory, listOf(2L), IdsFile.Purpose.PREVIEW).aged(7.days.inWholeMilliseconds)
+        val recent = IdsFile(directory, listOf(3L), IdsFile.Purpose.PREVIEW).aged(1.days.inWholeMilliseconds)
+        val future = IdsFile(directory, listOf(4L), IdsFile.Purpose.PREVIEW).aged(-1.days.inWholeMilliseconds)
+        val unknownAge = IdsFile(directory, listOf(5L), IdsFile.Purpose.PREVIEW).apply { assertTrue(setLastModified(0)) }
+        val subdirectory = File(directory, "ids123.tmp").apply { mkdir() }.aged(8.days.inWholeMilliseconds)
+
+        IdsFile.deleteStaleFiles(storageContext)
+
+        assertFalse(expired.exists())
+        listOf(boundary, recent, future, unknownAge, subdirectory).forEach { assertTrue(it.exists(), it.name) }
+    }
+
+    @Test
+    fun `cleanup leaves files outside the snapshot directory untouched`() {
+        val files =
+            listOf(storageContext.cacheDir, storageContext.externalCacheDir!!).map { directory ->
+                IdsFile(directory, listOf(1L), IdsFile.Purpose.PREVIEW).aged(8.days.inWholeMilliseconds)
+            }
+
+        IdsFile.deleteStaleFiles(storageContext)
+
+        files.forEach { assertTrue(it.exists(), it.path) }
+    }
+
+    @Test
+    fun `cleanup continues after a deletion throws`() {
+        val failedFile = mockk<File>()
+        every { failedFile.isFile } returns true
+        every { failedFile.lastModified() } returns now - 8.days.inWholeMilliseconds
+        every { failedFile.delete() } throws SecurityException("denied")
+        every { failedFile.toString() } returns "ids123.tmp"
+        val expired = IdsFile(IdsFile.getDirectory(storageContext), listOf(1L), IdsFile.Purpose.PREVIEW).aged(8.days.inWholeMilliseconds)
+        val directory =
+            object : File(expired.parent) {
+                override fun listFiles(): Array<File> = arrayOf(failedFile, expired)
+            }
+        IdsFile.deleteStaleFiles(directory)
+        verify(exactly = 1) { failedFile.delete() }
+        assertFalse(expired.exists())
+    }
+
+    @Test
+    fun `parcelled snapshot remains readable until its file expires`() {
+        val file = IdsFile(IdsFile.getDirectory(storageContext), listOf(7L, 11L), IdsFile.Purpose.PREVIEW).aged(7.days.inWholeMilliseconds)
+        val parcel = Parcel.obtain()
+        try {
+            file.writeToParcel(parcel, 0)
+            parcel.setDataPosition(0)
+            val restored = IdsFile.CREATOR.createFromParcel(parcel)
+            IdsFile.deleteStaleFiles(storageContext)
+            assertEquals(listOf(7L, 11L), restored.getIdsOrNull())
+            file.aged(8.days.inWholeMilliseconds)
+            IdsFile.deleteStaleFiles(storageContext)
+            assertNull(restored.getIdsOrNull())
+        } finally {
+            parcel.recycle()
+        }
+    }
+
+    @Test
+    fun `cleanup continues when deleting a file returns false`() {
+        val failedFile = mockk<File>()
+        every { failedFile.isFile } returns true
+        every { failedFile.lastModified() } returns now - 8.days.inWholeMilliseconds
+        every { failedFile.delete() } returns false
+        every { failedFile.toString() } returns "ids123.tmp"
+        val expired = IdsFile(IdsFile.getDirectory(storageContext), listOf(1L), IdsFile.Purpose.PREVIEW).aged(8.days.inWholeMilliseconds)
+        val directory =
+            object : File(expired.parent) {
+                override fun listFiles(): Array<File> = arrayOf(failedFile, expired)
+            }
+        IdsFile.deleteStaleFiles(directory)
+        verify(exactly = 1) { failedFile.delete() }
+        assertFalse(expired.exists())
+    }
+
+    @Test
+    fun `cleanup does not create unused snapshot directories`() {
+        IdsFile.deleteStaleFiles(storageContext)
+        assertFalse(File(storageContext.cacheDir, "idsfiles").exists())
+    }
+
+    @Test
+    fun `cleanup tolerates an unreadable snapshot directory`() {
+        val directory =
+            object : File(IdsFile.getDirectory(storageContext).path) {
+                override fun listFiles(): Array<File> = throw SecurityException("denied")
+            }
+        val file = IdsFile(directory, listOf(1L), IdsFile.Purpose.PREVIEW).aged(8.days.inWholeMilliseconds)
+        IdsFile.deleteStaleFiles(directory)
+        assertTrue(file.exists())
+    }
+
+    private fun <T : File> T.aged(ageMillis: Long): T =
+        apply {
+            assertTrue(setLastModified(now - ageMillis))
+        }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/StandardSearchFragmentScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/StandardSearchFragmentScreenshotTest.kt
new file mode 100644
index 000000000000..5adfb474b4df
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/StandardSearchFragmentScreenshotTest.kt
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.browser.search
+
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.browser.SearchHistory
+import com.ichi2.anki.browser.withCardBrowserFragment
+import org.junit.Test
+
+class StandardSearchFragmentScreenshotTest : ScreenshotTest() {
+    @Test
+    fun `large saved searches have bounded previews - Issue 22820`() {
+        SearchHistory().clear()
+        runTest {
+            SavedSearches.saveToConfig(
+                listOf(
+                    SavedSearch("Long name ".repeat(10_000), "nid:" + (1..10_000).joinToString(",")),
+                    SavedSearch("Short name", "tag:short"),
+                ),
+            )
+        }
+
+        withCardBrowserFragment(useSearchView = true) {
+            requireNotNull(searchView).show()
+            advanceRobolectricLooper()
+
+            captureScreen("large_saved_search_previews")
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapRenderTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapRenderTest.kt
index 11831c67d11f..d888890b21c6 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapRenderTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapRenderTest.kt
@@ -26,6 +26,7 @@ import org.robolectric.annotation.GraphicsMode
 import java.io.File
 import java.time.LocalDate
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 /** Human-reviewed render artifacts, deliberately kept out of source-controlled golden images. */
 @RunWith(RobolectricTestRunner::class)
@@ -64,7 +65,11 @@ class ReviewHeatmapRenderTest {
                     (uiMode and Configuration.UI_MODE_NIGHT_MASK.inv()) or
                     if (dark) Configuration.UI_MODE_NIGHT_YES else Configuration.UI_MODE_NIGHT_NO
             }
-        val context = ContextThemeWrapper(app.createConfigurationContext(config), if (dark) R.style.Theme_Dark else R.style.Theme_Light)
+        val context =
+            ContextThemeWrapper(
+                app.createConfigurationContext(config),
+                if (dark) CommonR.style.Theme_Dark else CommonR.style.Theme_Light,
+            )
         val view = ReviewHeatmapView(context).apply(configure)
         view.measure(
             View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapViewTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapViewTest.kt
index 89d7a2ac8f13..a643eb1f9d15 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapViewTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/heatmap/ReviewHeatmapViewTest.kt
@@ -23,13 +23,14 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(RobolectricTestRunner::class)
 @Config(application = EmptyApplication::class, qualifiers = "en-rUS-mdpi")
 @Category(EmptyApplicationCategory::class)
 class ReviewHeatmapViewTest {
     private val context: Context
-        get() = ContextThemeWrapper(ApplicationProvider.getApplicationContext(), R.style.Theme_Light)
+        get() = ContextThemeWrapper(ApplicationProvider.getApplicationContext(), CommonR.style.Theme_Light)
 
     @Test
     fun `selecting leap day previews details and only the full size button opens cards`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt
index a0a83af4c41f..ba30a95c83a4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt
@@ -22,6 +22,7 @@ import org.hamcrest.Matchers.equalTo
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class ChangeNoteTypeDialogTest : RobolectricTest() {
@@ -103,7 +104,7 @@ class ChangeNoteTypeDialogTest : RobolectricTest() {
     ) {
         launchFragment<ChangeNoteTypeDialog>(
             fragmentArgs = Bundle().apply { putLongArray(ARG_NOTE_IDS, longArrayOf(noteId)) },
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use { scenario -> scenario.onFragment { action(it) } }
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
index 841c186acf03..400a9510da68 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
@@ -100,6 +100,7 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class CustomStudyDialogTest : RobolectricTest() {
@@ -1208,7 +1209,7 @@ class CustomStudyDialogTest : RobolectricTest() {
         addBasicNote()
         val customStudy = CustomStudyDialog().apply { arguments = argumentsDisplayingSubscreen(option) }
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Base_Theme_Light)
+            controller.get().setTheme(CommonR.style.Base_Theme_Light)
             val activity = controller.setup().get()
             activity.showDialogFragment(customStudy)
             onSubscreenEditText().perform(replaceText(typed))
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt
index c4a3c59d52c7..fb5dc169ccf5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt
@@ -21,6 +21,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class DeckPickerAnalyticsOptInDialogTest {
@@ -54,7 +55,7 @@ class DeckPickerAnalyticsOptInDialogTest {
     @Test
     fun `cancelling does not change the opt-in state`() {
         launchFragment<DeckPickerAnalyticsOptInDialog>(
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
             initialState = Lifecycle.State.RESUMED,
         ).onFragment { fragment ->
             (fragment.dialog as AlertDialog).cancel()
@@ -65,7 +66,7 @@ class DeckPickerAnalyticsOptInDialogTest {
 
     private fun showDialog(optIn: Boolean) {
         launchFragment<DeckPickerAnalyticsOptInDialog>(
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
             initialState = Lifecycle.State.RESUMED,
         )
         // the checkbox starts unticked, so only opting in needs a click
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt
index 6f16e93e457c..0d3fe0f747cf 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt
@@ -14,7 +14,6 @@ import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.IntroductionActivity
-import com.ichi2.anki.R
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.ui.internationalization.sentenceCase
@@ -30,6 +29,7 @@ import org.junit.runner.RunWith
 import timber.log.Timber
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class DeckPickerContextMenuTest {
@@ -168,7 +168,7 @@ class DeckPickerContextMenuTest {
     }
 
     private fun launch(arguments: Bundle) =
-        launch(DeckPickerContextMenu::class.java, arguments, R.style.Theme_Light).also {
+        launch(DeckPickerContextMenu::class.java, arguments, CommonR.style.Theme_Light).also {
             scenariosForCleanup.add(it)
         }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt
index 531c02429bd3..f154467f0577 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt
@@ -7,7 +7,6 @@ import androidx.fragment.app.testing.launchFragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.cardviewer.SingleCardSide
 import com.ichi2.anki.dialogs.InsertFieldDialog.Companion.RESULT_INSERTED_FIELD
@@ -27,6 +26,7 @@ import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNull
+import com.ichi2.anki.common.android.R as CommonR
 
 /** Tests for [InsertFieldDialog] */
 @RunWith(AndroidJUnit4::class)
@@ -81,7 +81,7 @@ class InsertFieldDialogTest : RobolectricTest() {
         val requestKey = "insert_field"
         launchFragment<InsertFieldDialog>(
             fragmentArgs = InsertFieldDialog.newInstance(listOf("Front", "Back"), metadata, requestKey).requireArguments(),
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use { scenario ->
             scenario.onFragment { dialog ->
                 val results = mutableListOf<String>()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt
index f2e9c7d75ce5..ec0d236e22b5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt
@@ -26,6 +26,7 @@ import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class HelpDialogTest {
@@ -212,7 +213,7 @@ class HelpDialogTest {
     private fun withHelpDialog(block: (FragmentScenario<HelpDialog>) -> Unit) {
         launchFragment<HelpDialog>(
             fragmentArgs = HelpDialog.newHelpInstance().arguments,
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use(block)
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt
index a72a26fd4031..ca3b434258d3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt
@@ -5,7 +5,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.testutils.RecyclerViewUtils
 import com.ichi2.ui.CheckBoxTriStates.State.CHECKED
@@ -16,6 +15,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import kotlin.test.assertNull
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsArrayAdapterBindingTest : RobolectricTest() {
@@ -40,7 +40,7 @@ class TagsArrayAdapterBindingTest : RobolectricTest() {
         block: TagSelection.() -> Unit,
     ) {
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup().get()
             val recycler = RecyclerView(activity)
             recycler.layoutManager = LinearLayoutManager(activity)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt
index dcd3eb3bfdba..b60f79588c48 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt
@@ -5,7 +5,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.testutils.RecyclerViewUtils
 import com.ichi2.ui.CheckBoxTriStates.State.CHECKED
@@ -17,6 +16,7 @@ import org.junit.Assert.assertFalse
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsArrayAdapterSelectionTest : RobolectricTest() {
@@ -54,7 +54,7 @@ class TagsArrayAdapterSelectionTest : RobolectricTest() {
         block: TagSelection.() -> Unit,
     ) {
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup().get()
             val recycler = RecyclerView(activity)
             recycler.layoutManager = LinearLayoutManager(activity)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt
index 60be504cb55f..b343bd4a3d40 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt
@@ -4,7 +4,6 @@ package com.ichi2.anki.dialogs.tags
 
 import androidx.fragment.app.FragmentActivity
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.dialogs.tags.TagsDialog.DialogType
 import com.ichi2.anki.utils.ext.DIALOG_FRAGMENT_TAG
@@ -18,6 +17,7 @@ import kotlin.test.assertIs
 import kotlin.test.assertNotSame
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsDialogFactoryTest : RobolectricTest() {
@@ -67,7 +67,7 @@ class TagsDialogFactoryTest : RobolectricTest() {
         runTest {
             ensureCollectionLoadIsSynchronous()
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Base_Theme_Light)
+                controller.get().setTheme(CommonR.style.Base_Theme_Light)
                 val activity = controller.setup().get()
                 val factory = TagsDialogFactory(mock()).attachToActivity<TagsDialogFactory>(activity)
                 block(activity, factory)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
index a2eeae507a49..20ddb0121b6f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
@@ -31,6 +31,9 @@ import com.ichi2.ui.CheckBoxTriStates.State.CHECKED
 import com.ichi2.ui.CheckBoxTriStates.State.INDETERMINATE
 import com.ichi2.ui.CheckBoxTriStates.State.UNCHECKED
 import com.ichi2.utils.ListUtil
+import com.ichi2.utils.getInputField
+import com.ichi2.utils.getInputTextLayout
+import com.ichi2.utils.positiveButton
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.greaterThanOrEqualTo
@@ -41,11 +44,14 @@ import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowDialog
 import org.robolectric.shadows.ShadowToast
 import timber.log.Timber
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsDialogTest : RobolectricTest() {
@@ -82,7 +88,7 @@ class TagsDialogTest : RobolectricTest() {
             }
         val listener = Mockito.mock(TagsDialogListener::class.java)
         val args = TagsDialog().withArguments(targetContext, TagsDialog.DialogType.EDIT_TAGS, ids).requireArguments()
-        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, TagsDialogFactory(listener)).use { scenario ->
+        FragmentScenario.launch(TagsDialog::class.java, args, CommonR.style.Theme_Light, TagsDialogFactory(listener)).use { scenario ->
             scenario.moveToState(Lifecycle.State.STARTED)
             scenario.onFragment { fragment ->
                 advanceRobolectricLooperUntil { fragment.binding.tagsList.adapter != null }
@@ -112,7 +118,7 @@ class TagsDialogTest : RobolectricTest() {
         val fragment = TagsDialog(listener).withArguments(targetContext, TagsDialog.DialogType.EDIT_TAGS, listOf(addBasicNote().id))
         fragment.requireArguments().requireParcelable<IdsFile>(TagsDialog.ARG_TAGS_FILE).changeFile()
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup().get()
             fragment.show(activity.supportFragmentManager, "tags")
             advanceRobolectricLooper()
@@ -128,7 +134,7 @@ class TagsDialogTest : RobolectricTest() {
         val file = fragment.requireArguments().requireParcelable<IdsFile>(TagsDialog.ARG_TAGS_FILE)
         val savedState =
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Theme_Light)
+                controller.get().setTheme(CommonR.style.Theme_Light)
                 val activity = controller.setup().get()
                 fragment.show(activity.supportFragmentManager, "tags")
                 advanceRobolectricLooper()
@@ -137,7 +143,7 @@ class TagsDialogTest : RobolectricTest() {
         assertTrue(file.delete())
         ShadowToast.reset()
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup(savedState).get()
             advanceRobolectricLooper()
             assertNull(activity.supportFragmentManager.findFragmentByTag("tags"))
@@ -796,7 +802,7 @@ class TagsDialogTest : RobolectricTest() {
                 .arguments
         val mockListener = Mockito.mock(TagsDialogListener::class.java)
         val factory = TagsDialogFactory(mockListener)
-        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory).use { scenario ->
+        FragmentScenario.launch(TagsDialog::class.java, args, CommonR.style.Theme_Light, factory).use { scenario ->
             scenario.moveToState(Lifecycle.State.STARTED)
             scenario.onFragment { Timber.d("Dialog successfully opened") }
         }
@@ -913,12 +919,90 @@ class TagsDialogTest : RobolectricTest() {
         )
     }
 
+    @Test
+    fun `entering an existing tag shows an error and disables OK`() {
+        val existingTag = "a"
+        val validTag = "b"
+        withAddTagDialog(allTags = listOf(existingTag)) { addTagDialog ->
+            // OK starts disabled: Ensure its enabled for a valid input
+            addTagDialog.getInputField().setText(validTag)
+            advanceRobolectricLooperUntil(
+                lazyMessage = { "OK was never enabled for a valid tag" },
+            ) {
+                addTagDialog.positiveButton.isEnabled
+            }
+            addTagDialog.getInputField().setText(existingTag)
+            advanceRobolectricLooperUntil(
+                lazyMessage = { "error was never shown for an existing tag" },
+            ) {
+                addTagDialog.getInputTextLayout().error != null
+            }
+            assertEquals(
+                expected = targetContext.getString(CommonString.tag_already_exists),
+                actual = addTagDialog.getInputTextLayout().error.toString(),
+            )
+            assertFalse(
+                actual = addTagDialog.positiveButton.isEnabled,
+                message = "OK should be disabled for an existing tag",
+            )
+        }
+    }
+
+    @Test
+    fun `entering a new valid tag clears the error and enables OK`() {
+        val existingTag = "a"
+        val validTag = "b"
+        withAddTagDialog(allTags = listOf(existingTag)) { addTagDialog ->
+            // Start from the error state
+            addTagDialog.getInputField().setText(existingTag)
+            advanceRobolectricLooperUntil(
+                lazyMessage = { "error was never shown for an existing tag" },
+            ) {
+                addTagDialog.getInputTextLayout().error != null
+            }
+            addTagDialog.getInputField().setText(validTag)
+            advanceRobolectricLooperUntil(
+                lazyMessage = { "error was never cleared for a valid tag" },
+            ) {
+                addTagDialog.getInputTextLayout().error == null
+            }
+            assertTrue(
+                actual = addTagDialog.positiveButton.isEnabled,
+                message = "OK should be enabled for a valid tag",
+            )
+        }
+    }
+
+    private fun withAddTagDialog(
+        allTags: List<String>,
+        block: (AlertDialog) -> Unit,
+    ) {
+        runTagsDialogScenario(
+            args =
+                TagsDialog(ParametersUtils.whatever())
+                    .withTestArguments(
+                        type = TagsDialog.DialogType.EDIT_TAGS,
+                        checkedTags = arrayListOf(),
+                        allTags = allTags,
+                    ).requireArguments(),
+            factory =
+                TagsDialogFactory(
+                    listener = Mockito.mock(TagsDialogListener::class.java),
+                ),
+        ) { tagsDialog: TagsDialog ->
+            tagsDialog.binding.toolbar.root.menu
+                .performIdentifierAction(R.id.tags_dialog_action_add, 0)
+            advanceRobolectricLooper()
+            block(ShadowDialog.getLatestDialog() as AlertDialog)
+        }
+    }
+
     private fun runTagsDialogScenario(
         args: Bundle,
         factory: TagsDialogFactory? = null,
         block: (TagsDialog) -> Unit,
     ) {
-        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory).use { scenario ->
+        FragmentScenario.launch(TagsDialog::class.java, args, CommonR.style.Theme_Light, factory).use { scenario ->
             scenario.moveToState(Lifecycle.State.STARTED)
             scenario.onFragment { tagsDialog: TagsDialog ->
                 advanceRobolectricLooperUntil { tagsDialog.binding.tagsList.adapter != null }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt
index c6a38848bdde..c36af8f5d4b7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt
@@ -32,6 +32,7 @@ import org.robolectric.shadows.ShadowToast
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class ExportDialogFragmentTest : RobolectricTest() {
@@ -48,7 +49,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
                 // APKG, notes as text, and cards as text all need the original selection.
                 for (exportFormat in 1..3) {
                     val args = ExportDialogFragment.newInstance(targetContext.cacheDir, type, listOf(1L)).requireArguments()
-                    launchFragment<ExportDialogFragment>(fragmentArgs = args, themeResId = R.style.Theme_Light).use { scenario ->
+                    launchFragment<ExportDialogFragment>(fragmentArgs = args, themeResId = CommonR.style.Theme_Light).use { scenario ->
                         advanceRobolectricLooper()
                         scenario.onFragment { fragment ->
                             fragment.binding.exportTypeSelector.setSelection(exportFormat)
@@ -207,7 +208,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
 
         launchFragment<ExportDialogFragment>(
             fragmentArgs = fragment.arguments,
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use { scenario ->
             scenario.recreate()
             assertTrue(idsFile.exists(), "ids file must survive a configuration change")
@@ -217,7 +218,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
     /** Launches [ExportDialogFragment] and executes [action] on the fragment. */
     private fun onExportDialog(action: ExportDialogFragment.() -> Unit) =
         launchFragment<ExportDialogFragment>(
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use { scenario -> scenario.onFragment { action(it) } }
 
     companion object {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt
index ca161146afa1..9eb4ca42edb2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt
@@ -73,7 +73,6 @@ class ProfileManagerTest {
     fun `createOrNull returns a manager on the active profile context`() {
         val manager = assertNotNull(ProfileManager.createOrNull(context))
 
-        assertTrue("Expected a profile context", manager.activeProfileContext is ProfileContextWrapper)
         assertNull(ProfileManager.attachError)
         assertEquals(context.filesDir.absolutePath, manager.activeProfileContext.filesDir.absolutePath)
     }
@@ -124,7 +123,7 @@ class ProfileManagerTest {
 
         assertEquals("default", prefs.getString(PREF_LAST_ACTIVE_PROFILE_ID, null))
 
-        val activeContext = manager.activeProfileContext as ProfileContextWrapper
+        val activeContext = manager.activeProfileContext
         val currentFile = File(activeContext.filesDir, "old_user_data.txt")
 
         assertTrue("Default profile must see legacy files", currentFile.exists())
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/pages/AnkiServerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/pages/AnkiServerTest.kt
index 44ee31d39b1b..74df94fe015f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/pages/AnkiServerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/pages/AnkiServerTest.kt
@@ -4,6 +4,9 @@ package com.ichi2.anki.pages
 
 import fi.iki.elonen.NanoHTTPD.IHTTPSession
 import fi.iki.elonen.NanoHTTPD.Method
+import fi.iki.elonen.NanoHTTPD.Response
+import fi.iki.elonen.NanoHTTPD.Response.Status
+import fi.iki.elonen.NanoHTTPD.ResponseException
 import org.junit.Test
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
@@ -16,6 +19,7 @@ import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertSame
+import kotlin.test.assertTrue
 
 class AnkiServerTest {
     @Test
@@ -75,14 +79,95 @@ class AnkiServerTest {
         assertContentEquals(byteArrayOf(), AnkiServer.getSessionBytes(session))
     }
 
+    @Test
+    fun `a missing content length is rejected without dispatching`() {
+        assertRejected(contentLengthHeader = null, Status.LENGTH_REQUIRED)
+    }
+
+    @Test
+    fun `an invalid content length is rejected without dispatching`() {
+        // lengths beyond Int can't be allocated, and must not be truncated
+        val beyondInt = listOf((Int.MAX_VALUE + 1L).toString(), Long.MAX_VALUE.toString())
+        // HTTP only allows ASCII digits; "١" is ARABIC-INDIC DIGIT ONE
+        val notAsciiDigits = listOf("+1", "-0", " 1", "١")
+        for (header in listOf("abc", "-1", "") + beyondInt + notAsciiDigits) {
+            assertRejected(contentLengthHeader = header, Status.BAD_REQUEST)
+        }
+    }
+
+    @Test
+    fun `a handler exception without a message is an internal error`() {
+        val response = serveWithFailingHandler(IllegalStateException())
+
+        assertEquals(Status.INTERNAL_ERROR, response.status)
+        assertEquals(IllegalStateException::class.java.name, response.data.readBytes().decodeToString())
+    }
+
+    @Test
+    fun `a handler exception message is the error body`() {
+        // Anki's postProto suppresses its alert for exactly '500: Interrupted'
+        val response = serveWithFailingHandler(IllegalStateException("Interrupted"))
+
+        assertEquals(Status.INTERNAL_ERROR, response.status)
+        assertEquals("Interrupted", response.data.readBytes().decodeToString())
+    }
+
+    @Test
+    fun `an unhandled method is rejected and closes the connection`() {
+        // the request body is left unread, so the connection must not be reused
+        val session =
+            mock<IHTTPSession> {
+                on { method } doReturn Method.PUT
+                on { uri } doReturn "/_anki/test"
+            }
+
+        val response = AnkiServer(mock()).serve(session)
+
+        assertEquals(Status.METHOD_NOT_ALLOWED, response.status)
+        // RFC 9110: a 405 must list the supported methods
+        assertEquals("POST", response.getHeader("Allow"))
+        assertTrue(response.isCloseConnection)
+    }
+
+    private fun assertRejected(
+        contentLengthHeader: String?,
+        expected: Status,
+    ) {
+        val session = postSession(ByteArrayInputStream(byteArrayOf(1, 2, 3)), contentLengthHeader)
+        val handler = mock<PostRequestHandler>()
+
+        val message = "content-length: $contentLengthHeader"
+        val exception = assertFailsWith<ResponseException>(message) { AnkiServer(handler).serve(session) }
+
+        assertEquals(expected, exception.status, message)
+        verifyNoInteractions(handler)
+    }
+
+    private fun serveWithFailingHandler(exception: Exception): Response {
+        val handler =
+            object : PostRequestHandler {
+                override suspend fun handlePostRequest(
+                    uri: PostRequestUri,
+                    bytes: ByteArray,
+                ): ByteArray = throw exception
+            }
+        val session = postSession(ByteArrayInputStream(byteArrayOf()), contentLength = 0)
+        return AnkiServer(handler).serve(session)
+    }
+
     private fun postSession(
         stream: InputStream,
         contentLength: Int,
+    ): IHTTPSession = postSession(stream, contentLength.toString())
+
+    private fun postSession(
+        stream: InputStream,
+        contentLengthHeader: String?,
     ): IHTTPSession =
         mock {
             on { method } doReturn Method.POST
             on { uri } doReturn "/_anki/test"
-            on { headers } doReturn mapOf("content-length" to contentLength.toString())
+            on { headers } doReturn listOfNotNull(contentLengthHeader?.let { "content-length" to it }).toMap()
             on { inputStream } doReturn stream
         }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt
index 85aeaf23fe67..8deba70cd909 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt
@@ -25,7 +25,7 @@ class PageWebViewClientAssetTest : PageWebViewClientTestBase() {
 
         // Pin the entire declaration, including the bootstrap script hash, to require review on backend updates.
         // Backend updates are expected to change this hash and fail this test until the new declaration is reviewed.
-        val expectedPolicy = "script-src 'self' 'sha256-1eO5v3fJDmbaWxUNa8DWv729RR8kpfPqIe0VFTiVNds='"
+        val expectedPolicy = "script-src 'self' 'sha256-KgVk6DKxcC2FwNZfJ2E4h8ryzLcg38Fu9Id96eo1C5A='"
         assertEquals(
             listOf(expectedPolicy),
             policies,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverReviewTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverReviewTest.kt
new file mode 100644
index 000000000000..57d428d9b317
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverReviewTest.kt
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.progress
+
+import android.os.Looper
+import androidx.fragment.app.commitNow
+import androidx.lifecycle.Lifecycle
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.dialogs.LoadingDialogFragment
+import com.ichi2.testutils.EmptyAnkiActivity
+import kotlinx.coroutines.CompletableDeferred
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import java.time.Duration
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class ProgressObserverReviewTest : RobolectricTest() {
+    @Test
+    fun `completed progress disappears when its owner remains stopped on foreground`() {
+        val controller = Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, "owner") }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idle()
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) {
+            setMaxLifecycle(fragment, Lifecycle.State.CREATED)
+        }
+        gate.complete(Unit)
+        idle()
+        controller.start().resume()
+        idle()
+
+        assertEquals(Lifecycle.State.CREATED, fragment.lifecycle.currentState)
+        assertEquals(ViewModelProgress.Idle, fragment.viewModel.progressManager.progress.value)
+        assertNull(activity.loadingDialog(), "completed operation must not block the foreground screen")
+    }
+
+    @Test
+    fun `backgrounded holder cannot retain a completed shared dialog`() {
+        val controller = Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        val secondGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        second.viewModel.runOp(secondGate)
+        idle()
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) {
+            setMaxLifecycle(first, Lifecycle.State.CREATED)
+        }
+        firstGate.complete(Unit)
+        controller.start().resume()
+        idle()
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        secondGate.complete(Unit)
+        idle()
+        assertNull(activity.loadingDialog(), "a stopped former holder must not retain another owner's completed dialog")
+    }
+
+    private fun EmptyAnkiActivity.loadingDialog() =
+        supportFragmentManager.fragments.filterIsInstance<LoadingDialogFragment>().singleOrNull()
+
+    private fun idle() = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(1200))
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt
index a9027ff91813..7f166b86b514 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt
@@ -2,11 +2,18 @@
 // SPDX-FileCopyrightText: Copyright (c) 2026 Ashish Yadav <mailtoashish693@gmail.com>
 package com.ichi2.anki.progress
 
+import android.os.Bundle
 import android.os.Looper
 import android.view.WindowManager
 import android.widget.TextView
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commitNow
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewModelScope
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
@@ -17,6 +24,7 @@ import com.ichi2.testutils.EmptyAnkiActivity
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -27,6 +35,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.test.assertSame
 import kotlin.test.assertTrue
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -80,6 +89,26 @@ class ProgressObserverTest : RobolectricTest() {
         op.cancel()
     }
 
+    @Test
+    fun `a later operation waits for the delay again`() {
+        val activity = startActivity().get()
+        activity.observeProgress(viewModel, delayMillis = SHOW_DELAY) { it }
+        val gate = CompletableDeferred<Unit>()
+        val op = launchOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+
+        val laterGate = CompletableDeferred<Unit>()
+        val laterOp = launchOp(laterGate)
+        idleMainLooper(SHOW_DELAY / 2)
+
+        assertNull(activity.loadingDialog(), "a quick later op must not flash a dialog")
+        laterGate.complete(Unit)
+        op.cancel()
+        laterOp.cancel()
+    }
+
     @Test
     fun `dialog is shown when the activity is stopped and restarted during the show delay`() {
         val controller = startActivity()
@@ -324,6 +353,391 @@ class ProgressObserverTest : RobolectricTest() {
         legacyOp.cancel()
     }
 
+    @Test
+    fun `a fragment's observer stops when the fragment is destroyed`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val progress = fragment.viewModel.progressManager.progress as MutableStateFlow<*>
+        assertEquals(1, progress.subscriptionCount.value)
+
+        activity.supportFragmentManager.commitNow { remove(fragment) }
+        shadowOf(Looper.getMainLooper()).idle()
+
+        assertEquals(0, progress.subscriptionCount.value, "the observer must not outlive its fragment")
+    }
+
+    @Test
+    fun `a stopped fragment gives back the touches its op blocked`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val op = fragment.viewModel.runOp(CompletableDeferred())
+        assertTrue(activity.touchesBlocked(), "touches must be blocked while the op runs")
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.CREATED) }
+        assertFalse(activity.touchesBlocked(), "a stopped fragment must not keep the window blocked")
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.RESUMED) }
+        assertTrue(activity.touchesBlocked(), "touches must be blocked again while the op still runs")
+        op.cancel()
+    }
+
+    @Test
+    fun `an operation completing while its fragment is stopped leaves no dialog`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val gate = CompletableDeferred<Unit>()
+        val op = fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.CREATED) }
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+        assertFalse(activity.touchesBlocked())
+        assertNull(activity.loadingDialog(), "completed operation must not leave a modal dialog over the host")
+        op.cancel()
+    }
+
+    @Test
+    fun `destroying a fragment removes its visible progress dialog`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        fragment.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        activity.supportFragmentManager.commitNow { remove(fragment) }
+        idleMainLooper(SHOW_DELAY)
+        assertNull(activity.loadingDialog(), "destroyed fragment must not leave a modal dialog over the host")
+    }
+
+    @Test
+    fun `restarting a fragment after its operation completes dismisses visible progress`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.CREATED) }
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.RESUMED) }
+        idleMainLooper(SHOW_DELAY)
+        assertNull(activity.loadingDialog())
+    }
+
+    @Test
+    fun `recreating the activity during visible fragment progress is safe`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, "progress-owner") }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        controller.recreate()
+        idleMainLooper(SHOW_DELAY)
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+        assertNull(controller.get().loadingDialog())
+    }
+
+    @Test
+    fun `recreating the activity keeps a fragment's visible dialog`() {
+        val controller = startActivity()
+        val fragment = ProgressObservingFragment()
+        controller.get().supportFragmentManager.commitNow { add(fragment, "progress-owner") }
+        fragment.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+
+        controller.recreate()
+        idleMainLooper(Duration.ZERO)
+
+        assertNotNull(controller.get().loadingDialog())
+    }
+
+    @Test
+    fun `an operation completing right after the activity is recreated leaves no dialog`() {
+        val controller = startActivity()
+        val fragment = ProgressObservingFragment()
+        controller.get().supportFragmentManager.commitNow { add(fragment, "progress-owner") }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+
+        controller.recreate()
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+
+        assertNull(controller.get().loadingDialog())
+    }
+
+    @Test
+    fun `an operation completing while the activity is stopped leaves no dialog on return`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        gate.complete(Unit)
+        controller.start().resume()
+        idleMainLooper(SHOW_DELAY)
+
+        assertNull(activity.loadingDialog())
+    }
+
+    @Test
+    fun `removing a fragment while the activity is stopped leaves no dialog on return`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        fragment.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) { remove(fragment) }
+        controller.start().resume()
+        idleMainLooper(SHOW_DELAY)
+
+        assertNull(activity.loadingDialog())
+    }
+
+    @Test
+    fun `destroying an idle fragment does not dismiss a different instance's progress`() {
+        val activity = startActivity().get()
+        val idle = ProgressObservingFragment()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(idle, "idle")
+            add(active, "active")
+        }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+
+        activity.supportFragmentManager.commitNow { remove(idle) }
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(activity.touchesBlocked())
+        assertNotNull(activity.loadingDialog(), "another fragment still owns active progress")
+        gate.complete(Unit)
+    }
+
+    @Test
+    fun `restarting an idle fragment does not dismiss a different instance's progress`() {
+        val activity = startActivity().get()
+        val idle = ProgressObservingFragment()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(idle, "idle")
+            add(active, "active")
+        }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(idle, Lifecycle.State.CREATED) }
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(idle, Lifecycle.State.RESUMED) }
+        idleMainLooper(SHOW_DELAY * 2)
+
+        assertNotNull(activity.loadingDialog())
+        gate.complete(Unit)
+    }
+
+    @Test
+    fun `adding an idle fragment does not dismiss a different instance's progress`() {
+        val activity = startActivity().get()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(active, "active") }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val dialog = assertNotNull(activity.loadingDialog())
+
+        activity.supportFragmentManager.commitNow { add(ProgressObservingFragment(), "idle") }
+        idleMainLooper(SHOW_DELAY * 2)
+
+        assertSame(dialog, activity.loadingDialog())
+        gate.complete(Unit)
+    }
+
+    @Test
+    fun `destroying a stopped former owner does not dismiss another fragments progress`() {
+        val activity = startActivity().get()
+        val former = ProgressObservingFragment()
+        val current = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(former, "former") }
+        val formerGate = CompletableDeferred<Unit>()
+        former.viewModel.runOp(formerGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(former, Lifecycle.State.CREATED) }
+        idleMainLooper(SHOW_DELAY)
+        assertNull(activity.loadingDialog())
+        formerGate.complete(Unit)
+        activity.supportFragmentManager.commitNow { add(current, "current") }
+        val currentGate = CompletableDeferred<Unit>()
+        current.viewModel.runOp(currentGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+        activity.supportFragmentManager.commitNow { remove(former) }
+        idleMainLooper(SHOW_DELAY)
+        assertTrue(activity.touchesBlocked())
+        assertNotNull(activity.loadingDialog(), "former owner must not dismiss the current operation")
+        currentGate.complete(Unit)
+    }
+
+    @Test
+    fun `an operation ending does not dismiss the dialog another instance showed after it`() {
+        val activity = startActivity().get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val secondGate = CompletableDeferred<Unit>()
+        second.viewModel.runOp(secondGate)
+        idleMainLooper(SHOW_DELAY * 2)
+
+        firstGate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+
+        assertNotNull(activity.loadingDialog())
+        secondGate.complete(Unit)
+    }
+
+    @Test
+    fun `review - later operation ends while earlier operation still runs`() {
+        val activity = startActivity().get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val secondGate = CompletableDeferred<Unit>()
+        second.viewModel.runOp(secondGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        secondGate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(activity.touchesBlocked())
+        assertNotNull(activity.loadingDialog(), "earlier operation still needs visible progress")
+        firstGate.complete(Unit)
+    }
+
+    @Test
+    fun `review - created idle fragment must not retain completed dialog`() {
+        val activity = startActivity().get()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(active, "active") }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val idle = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(idle, "idle")
+            setMaxLifecycle(idle, Lifecycle.State.CREATED)
+        }
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertFalse(activity.touchesBlocked())
+        assertNull(activity.loadingDialog(), "an idle CREATED fragment must not retain a completed operation's dialog")
+    }
+
+    @Test
+    fun `review - remaining owner restores its message and cancel listener`() {
+        val activity = startActivity().get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        var cancelled = false
+        val firstOp = launchOp(firstGate, message = "first", onCancel = { cancelled = true }, manager = first.viewModel.progressManager)
+        idleMainLooper(SHOW_DELAY * 2)
+        val secondGate = CompletableDeferred<Unit>()
+        val secondOp = launchOp(secondGate, message = "second", onCancel = {}, manager = second.viewModel.progressManager)
+        idleMainLooper(SHOW_DELAY * 2)
+        secondGate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        activity.loadingDialog()!!.requireDialog().cancel()
+        idleMainLooper(Duration.ZERO)
+        assertTrue(cancelled, "cancel must reach the remaining active owner")
+        firstGate.complete(Unit)
+        firstOp.cancel()
+        secondOp.cancel()
+    }
+
+    @Test
+    fun `review - recreation with idle created fragment leaves no orphan dialog`() {
+        val controller = startActivity()
+        val idle = ProgressObservingFragment()
+        val active = ProgressObservingFragment()
+        controller.get().supportFragmentManager.commitNow {
+            add(idle, "idle")
+            setMaxLifecycle(idle, Lifecycle.State.CREATED)
+            add(active, "active")
+        }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        controller.recreate()
+        idleMainLooper(SHOW_DELAY * 2)
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertFalse(controller.get().touchesBlocked())
+        assertNull(controller.get().loadingDialog(), "restored idle fragment must not retain completed dialog")
+    }
+
+    @Test
+    fun `a holder leaving while the activity is stopped is safe`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        second.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) { remove(second) }
+        idleMainLooper(SHOW_DELAY)
+        controller.start().resume()
+        idleMainLooper(SHOW_DELAY)
+
+        assertNotNull(activity.loadingDialog())
+        firstGate.complete(Unit)
+    }
+
     private fun launchOp(
         gate: CompletableDeferred<Unit>,
         message: String = "op",
@@ -357,3 +771,20 @@ class ProgressObserverTest : RobolectricTest() {
         private val SHOW_DELAY = 600.milliseconds
     }
 }
+
+class ProgressObservingFragment : Fragment() {
+    val viewModel: ProgressTestViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        observeProgress(viewModel) { it }
+    }
+}
+
+class ProgressTestViewModel :
+    ViewModel(),
+    HasProgress<String> {
+    override val progressManager = ProgressManager<String>()
+
+    fun runOp(gate: CompletableDeferred<Unit>) = viewModelScope.launch { progressManager.withProgress(message = "op") { gate.await() } }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt
index 1a69c871cfcb..1a785ef12267 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt
@@ -46,6 +46,7 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNotSame
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class SetDueDateDialogTest : RobolectricTest() {
@@ -154,7 +155,7 @@ class SetDueDateDialogTest : RobolectricTest() {
         runTest {
             val cardIds = List(2) { addBasicNote().firstCard().id }
             launchFragment<SetDueDateDialog>(
-                themeResId = R.style.Base_Theme_Light,
+                themeResId = CommonR.style.Base_Theme_Light,
                 fragmentArgs = setDueDateArgs(cardIds),
             ).use { scenario ->
                 advanceRobolectricLooper()
@@ -174,7 +175,7 @@ class SetDueDateDialogTest : RobolectricTest() {
             val idsFile = args.requireParcelable<IdsFile>(SetDueDateDialog.ARG_IDS_FILE)
 
             launchFragment<SetDueDateDialog>(
-                themeResId = R.style.Base_Theme_Light,
+                themeResId = CommonR.style.Base_Theme_Light,
                 fragmentArgs = args,
             ).use { scenario ->
                 advanceRobolectricLooper()
@@ -212,7 +213,7 @@ class SetDueDateDialogTest : RobolectricTest() {
             args.requireParcelable<IdsFile>(SetDueDateDialog.ARG_IDS_FILE).writeBytes(ByteArray(0))
 
             launchFragment<SetDueDateDialog>(
-                themeResId = R.style.Base_Theme_Light,
+                themeResId = CommonR.style.Base_Theme_Light,
                 fragmentArgs = args,
             ).use {
                 advanceRobolectricLooper()
@@ -322,7 +323,7 @@ class SetDueDateDialogTest : RobolectricTest() {
     private val FragmentActivity.dueDateFiles: List<File>
         get() =
             IdsFile
-                .getDirectory(this)
+                .getDirectory()
                 .listFiles { _, name -> name.startsWith("set-due-date") }
                 .orEmpty()
                 .toList()
@@ -330,7 +331,7 @@ class SetDueDateDialogTest : RobolectricTest() {
     private fun withActivity(block: suspend TestScope.(FragmentActivity) -> Unit) =
         runTest {
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Base_Theme_Light)
+                controller.get().setTheme(CommonR.style.Base_Theme_Light)
                 block(controller.setup().get())
             }
         }
@@ -364,7 +365,7 @@ class SetDueDateDialogTest : RobolectricTest() {
         val cardIds = List(cardCount) { addBasicNote().firstCard().id }
         val dialog = SetDueDateDialog.newInstance(targetContext.externalCacheDir ?: targetContext.cacheDir, cardIds)
         launchFragment(
-            themeResId = R.style.Base_Theme_Light,
+            themeResId = CommonR.style.Base_Theme_Light,
             fragmentArgs = dialog.arguments,
         ) {
             return@launchFragment dialog
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt
index 8002204c9509..9f62dccc7034 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt
@@ -3,6 +3,7 @@
 
 package com.ichi2.anki.shareddeck
 
+import android.util.Log
 import android.webkit.CookieManager
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
@@ -22,9 +23,13 @@ import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.robolectric.Robolectric
 import org.robolectric.Shadows
+import org.robolectric.fakes.RoboMenuItem
 import org.robolectric.shadows.ShadowDialog
+import timber.log.Timber
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 /** Tests for [SharedDecksActivity] */
 @RunWith(AndroidJUnit4::class)
@@ -82,6 +87,143 @@ class SharedDecksActivityTest : RobolectricTest() {
         assertEquals(getResourceString(R.string.shared_decks_url), activity.lastLoadedUrl)
     }
 
+    @Test
+    fun `logging in to AnkiWeb returns to the shared deck`() {
+        val activity = startOnSharedDeck()
+
+        activity.logInToAnkiWeb()
+
+        assertEquals(SHARED_DECK, activity.webView.url)
+    }
+
+    @Test
+    fun `back after logging in to AnkiWeb returns to the search results`() {
+        val searchResults = "https://ankiweb.net/shared/decks/Japanese"
+        val activity = startSharedDecks()
+        activity.visit(searchResults)
+        activity.visit(SHARED_DECK)
+
+        activity.logInToAnkiWeb()
+
+        activity.visit(SHARED_DECK)
+        assertEquals(SHARED_DECK, activity.webView.url)
+
+        activity.onBackPressedDispatcher.onBackPressed()
+
+        assertFalse(activity.isFinishing, "Back should return to the search results instead of closing the screen")
+        assertEquals(searchResults, activity.webView.url)
+    }
+
+    @Test
+    fun `back after logging in to AnkiWeb returns to each earlier shared page once`() {
+        val sharedDecks = getResourceString(R.string.shared_decks_url)
+        val searchResults = "https://ankiweb.net/shared/decks/Japanese"
+        val activity = startSharedDecks()
+        activity.visit(sharedDecks)
+        activity.visit(searchResults)
+        activity.visit(SHARED_DECK)
+        activity.logInToAnkiWeb()
+        activity.visit(AFTER_LOGIN)
+        activity.visit(SHARED_DECK)
+
+        activity.pressBack()
+        assertEquals(searchResults, activity.webView.url)
+        activity.pressBack()
+        assertEquals(sharedDecks, activity.webView.url)
+        activity.pressBack()
+        assertTrue(activity.isFinishing)
+    }
+
+    @Test
+    fun `back from home after logging in to AnkiWeb closes the screen`() {
+        val activity = startOnSharedDeck()
+        activity.logInToAnkiWeb()
+        activity.visit(SHARED_DECK)
+
+        activity.onOptionsItemSelected(RoboMenuItem(R.id.home))
+        activity.visit(getResourceString(R.string.shared_decks_url))
+        activity.pressBack()
+
+        assertTrue(activity.isFinishing)
+    }
+
+    @Test
+    fun `logging in after AnkiWeb refuses a download returns to the deck page`() {
+        val activity = startOnSharedDeck()
+        activity.visit(DECK_DOWNLOAD)
+
+        activity.logInToAnkiWeb()
+
+        assertEquals(SHARED_DECK, activity.webView.url)
+    }
+
+    @Test
+    fun `AnkiWeb login without a session stays on AnkiWeb`() {
+        val activity = startOnSharedDeck()
+        activity.openAnkiWebLogin()
+
+        activity.visit(AFTER_LOGIN)
+
+        assertEquals(AFTER_LOGIN, activity.webView.url)
+    }
+
+    @Test
+    fun `back while returning after login must not reopen login`() {
+        val activity = startOnSharedDeck()
+        activity.logInToAnkiWeb()
+        // loadUrl was requested, but the return navigation has not committed yet.
+        activity.onBackPressedDispatcher.onBackPressed()
+        assertFalse(
+            activity.webView.url?.startsWith(getResourceString(R.string.shared_decks_login_url)) == true,
+            "Back reopened the login page while the return to the deck was pending",
+        )
+    }
+
+    @Test
+    fun `returning after a login does not log the deck URL at info`() {
+        val activity = startOnSharedDeck()
+
+        val logs = captureInfoLogs { activity.logInToAnkiWeb() }
+
+        assertEquals(SHARED_DECK, activity.webView.url)
+        assertFalse(logs.any { it.contains(SHARED_DECK) }, "Deck URL was logged at info or above: $logs")
+    }
+
+    private fun startOnSharedDeck(): SharedDecksActivity =
+        startSharedDecks().apply {
+            visit(getResourceString(R.string.shared_decks_url))
+            visit(SHARED_DECK)
+        }
+
+    private fun SharedDecksActivity.openAnkiWebLogin() {
+        receiveTooManyRequests()
+        clickAlertDialogButton { positiveButton }
+        visit(getResourceString(R.string.shared_decks_login_url))
+    }
+
+    private fun SharedDecksActivity.logInToAnkiWeb() {
+        openAnkiWebLogin()
+        CookieManager.getInstance().setCookie("https://ankiweb.net", "has_auth=1")
+        visit(AFTER_LOGIN)
+    }
+
+    private fun SharedDecksActivity.visit(url: String) {
+        if (webView.copyBackForwardList().currentItem?.url != url) {
+            Shadows.shadowOf(webView).pushEntryToHistory(url)
+        }
+        webViewClient.doUpdateVisitedHistory(webView, url, false)
+        webViewClient.onPageFinished(webView, url)
+        // Robolectric clears every history entry; real WebView keeps the current page.
+        if (webView.copyBackForwardList().size == 0) {
+            Shadows.shadowOf(webView).pushEntryToHistory(url)
+        }
+    }
+
+    private fun SharedDecksActivity.pressBack() {
+        onBackPressedDispatcher.onBackPressed()
+        if (!isFinishing) visit(requireNotNull(webView.url))
+    }
+
     private fun startSharedDecks(): SharedDecksActivity {
         val controller =
             Robolectric
@@ -94,6 +236,28 @@ class SharedDecksActivityTest : RobolectricTest() {
         return controller.get()
     }
 
+    private fun captureInfoLogs(block: () -> Unit): List<String> {
+        val messages = mutableListOf<String>()
+        val tree =
+            object : Timber.Tree() {
+                override fun log(
+                    priority: Int,
+                    tag: String?,
+                    message: String,
+                    t: Throwable?,
+                ) {
+                    if (priority >= Log.INFO) messages += message
+                }
+            }
+        Timber.plant(tree)
+        try {
+            block()
+        } finally {
+            Timber.uproot(tree)
+        }
+        return messages
+    }
+
     private fun SharedDecksActivity.receiveTooManyRequests() {
         val response = mock<WebResourceResponse> { on { statusCode } doReturn HTTP_STATUS_TOO_MANY_REQUESTS }
         webViewClient.onReceivedHttpError(webView, mock(), response)
@@ -104,4 +268,10 @@ class SharedDecksActivityTest : RobolectricTest() {
 
     private val SharedDecksActivity.lastLoadedUrl: String?
         get() = Shadows.shadowOf(webView).lastLoadedUrl
+
+    companion object {
+        private const val SHARED_DECK = "https://ankiweb.net/shared/info/1234"
+        private const val DECK_DOWNLOAD = "https://ankiweb.net/svc/shared/download-deck/1234?t=key"
+        private const val AFTER_LOGIN = "https://ankiweb.net/account/login?afterAuth=1"
+    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt
index 46bb224d6dc1..3c7c24455651 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt
@@ -14,7 +14,6 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.R
 import com.ichi2.testutils.EmptyApplication
 import org.junit.Before
 import org.junit.Test
@@ -32,7 +31,7 @@ import com.ichi2.anki.common.android.R as CommonR
 @Config(application = EmptyApplication::class)
 @Category(EmptyApplicationCategory::class)
 class SnackbarsTest {
-    private val context = ContextThemeWrapper(ApplicationProvider.getApplicationContext<Context>(), R.style.Theme_Light)
+    private val context = ContextThemeWrapper(ApplicationProvider.getApplicationContext<Context>(), CommonR.style.Theme_Light)
     private val host = CoordinatorLayout(context)
     private val looper = shadowOf(Looper.getMainLooper())
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt
index 42d3f5716c48..5a299f1e10cb 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt
@@ -360,6 +360,44 @@ class FlattenTreeTest {
         MatcherAssert.assertThat(result[1].fullTag.value, Matchers.equalTo("d"))
     }
 
+    @Test
+    fun `search only expands ancestors needed to reach the matching component`() {
+        val items =
+            listOf(
+                tagListItem("a", "a", level = 0, hasChildren = true, collapsed = true),
+                tagListItem("a::b", "b", level = 1, hasChildren = true, collapsed = true),
+                tagListItem("a::b::c", "c", level = 2, hasChildren = true, collapsed = true),
+                tagListItem("a::b::c::d", "d", level = 3, hasChildren = false, collapsed = false),
+            )
+        for ((query, expectedNames) in listOf(
+            "a" to listOf("a"),
+            "b" to listOf("a", "a::b"),
+            "A::B" to listOf("a", "a::b"),
+            "a::" to listOf("a", "a::b"),
+            "c" to listOf("a", "a::b", "a::b::c"),
+            "::" to items.map { it.fullTagName },
+        )) {
+            val result = ManageTagsViewModel.applySearchFilter(items, query)
+            MatcherAssert.assertThat("Query: $query", result.map { it.fullTagName }, Matchers.equalTo(expectedNames))
+            MatcherAssert.assertThat(result.dropLast(1).all { !it.collapsed }, Matchers.equalTo(true))
+            MatcherAssert.assertThat(result.last().collapsed, Matchers.equalTo(result.last().hasChildren))
+        }
+    }
+
+    @Test
+    fun `a match in both parent and child names reveals the child`() {
+        val items =
+            listOf(
+                tagListItem("a", "a", level = 0, hasChildren = true, collapsed = true),
+                tagListItem("a::cat", "cat", level = 1, hasChildren = true, collapsed = true),
+                tagListItem("a::cat::dog", "dog", level = 2, hasChildren = false, collapsed = false),
+            )
+        val result = ManageTagsViewModel.applySearchFilter(items, "a")
+        MatcherAssert.assertThat(result.map { it.fullTagName }, Matchers.equalTo(listOf("a", "a::cat")))
+        MatcherAssert.assertThat(result[0].collapsed, Matchers.equalTo(false))
+        MatcherAssert.assertThat(result[1].collapsed, Matchers.equalTo(true))
+    }
+
     @Test
     fun `applySearchFilter includes ancestors`() {
         val items =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt
index 4caecf27dec9..9c1fb50e4c9c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt
@@ -2,9 +2,6 @@
 
 package com.ichi2.anki.tags
 
-/** Unwraps [TagListItemState.fullTag] to a plain [String] for test assertions */
-internal val TagListItemState.fullTagName: String get() = fullTag.value
-
 internal val ManageTagsState.Content.visibleTagNames: List<String>
     get() = visibleNodes.map { it.fullTagName }
 
@@ -30,7 +27,7 @@ internal fun tagListItem(
     hasChildren: Boolean,
     collapsed: Boolean,
 ) = TagListItemState(
-    fullTag = TagName.asValid(fullTag),
+    fullTagName = fullTag,
     displayName = displayName,
     level = level,
     hasChildren = hasChildren,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt
index 0e5e398dd9e7..786314fc25e7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt
@@ -31,6 +31,7 @@ import kotlin.system.measureTimeMillis
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
+import kotlin.test.assertNotEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
@@ -43,6 +44,17 @@ import kotlin.time.Duration.Companion.seconds
     "Preserve RobolectricTest's scoped CollectionManager dispatcher when switching to JvmTest; tag operations must finish before assertions and teardown.",
 )
 class ManageTagsViewModelTest : RobolectricTest() {
+    @Test
+    fun `row equality preserves parent spelling while tag identity ignores case`() {
+        val original = tagListItem("parent::child", "child", 1, hasChildren = false, collapsed = false)
+        val renamed = original.copy(fullTagName = "PARENT::child")
+
+        assertEquals(original.fullTag, renamed.fullTag)
+        assertEquals(original.displayName, renamed.displayName)
+        assertNotEquals(original, renamed)
+        assertEquals("PARENT::child", renamed.fullTag.value)
+    }
+
     @Test
     fun `tagExists follows backend identity for hidden Unicode tags`() =
         runTest {
@@ -440,6 +452,82 @@ class ManageTagsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `search preserves collapsed matches and allows manual expansion`() =
+        runTest {
+            addTags("a::b::c::d", "other")
+            withViewModel {
+                filter("a")
+                assertEquals(listOf("a"), loadedState.visibleTagNames)
+                assertTrue(loadedState.visibleNodes.first().collapsed)
+
+                toggleCollapsed("a").join()
+                assertEquals(listOf("a", "a::b"), loadedState.visibleTagNames)
+                assertTrue(loadedState.visibleNodes[1].collapsed)
+
+                filter("c")
+                assertEquals(listOf("a", "a::b", "a::b::c"), loadedState.visibleTagNames)
+
+                filter("")
+                assertEquals(listOf("a", "a::b", "other"), loadedState.visibleTagNames)
+                assertTrue(loadedState.visibleNodes[1].collapsed)
+
+                filter("a")
+                toggleCollapsed("a").join()
+                assertEquals(listOf("a"), loadedState.visibleTagNames)
+                refreshTags().join()
+                assertEquals(listOf("a"), loadedState.visibleTagNames)
+            }
+        }
+
+    @Test
+    fun `search-expanded ancestors can collapse and expand regardless of saved state`() =
+        runTest {
+            addTags("parent::child")
+            for (initiallyCollapsed in listOf(true, false)) {
+                col.tags.setCollapsed(TagName.asValid("parent"), initiallyCollapsed)
+                withViewModel {
+                    filter("child")
+                    assertFalse(loadedState.visibleNodes.first().collapsed)
+
+                    toggleCollapsed("PARENT").join()
+                    assertEquals(listOf("parent"), loadedState.visibleTagNames)
+                    assertTrue(loadedState.visibleNodes.single().collapsed)
+                    filter("child")
+                    refreshTags().join()
+                    assertEquals(listOf("parent"), loadedState.visibleTagNames)
+                    assertTrue(ManageTagsViewModel.flattenTree(col.tags.tree()).first().collapsed)
+
+                    toggleCollapsed("parent").join()
+                    assertEquals(listOf("parent", "parent::child"), loadedState.visibleTagNames)
+                    assertFalse(loadedState.visibleNodes.first().collapsed)
+                    assertFalse(ManageTagsViewModel.flattenTree(col.tags.tree()).first().collapsed)
+                }
+            }
+        }
+
+    @Test
+    fun `changing search reveals matches beneath manually collapsed ancestors`() =
+        runTest {
+            addTags("parent::child::leaf")
+            withViewModel {
+                filter("leaf")
+                toggleCollapsed("parent::child").join()
+                assertEquals(listOf("parent", "parent::child"), loadedState.visibleTagNames)
+                assertTrue(loadedState.visibleNodes.last().collapsed)
+
+                filter("lea")
+                assertEquals(listOf("parent", "parent::child", "parent::child::leaf"), loadedState.visibleTagNames)
+                assertFalse(loadedState.visibleNodes[1].collapsed)
+
+                filter("")
+                assertEquals(listOf("parent"), loadedState.visibleTagNames)
+                toggleCollapsed("parent").join()
+                assertEquals(listOf("parent", "parent::child"), loadedState.visibleTagNames)
+                assertTrue(loadedState.visibleNodes.last().collapsed)
+            }
+        }
+
     @Test
     fun `filter shows ancestors of matching nested tags`() =
         runTest {
@@ -463,6 +551,63 @@ class ManageTagsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `expansion is immediate and rapid taps persist in order without blocking actions`() =
+        runTest {
+            addTags("science::biology", "history::ancient")
+            withViewModel {
+                withQueuedCollectionAccess {
+                    val expand = toggleCollapsed("science")
+                    assertFalse(expand.isCompleted)
+                    assertFalse(loadedState.isWorking)
+                    assertTrue("science::biology" in loadedState.visibleTagNames)
+
+                    val collapse = toggleCollapsed("science")
+                    assertFalse(collapse.isCompleted)
+                    assertFalse(loadedState.isWorking)
+                    assertFalse("science::biology" in loadedState.visibleTagNames)
+
+                    toggleCollapsed("history")
+                    assertTrue("history::ancient" in loadedState.visibleTagNames)
+                    // Reloading must wait for every queued preference save.
+                    refreshTags().join()
+                }
+                assertEquals(listOf("history", "history::ancient", "science"), loadedState.visibleTagNames)
+                assertFalse(loadedState.isWorking)
+            }
+        }
+
+    @Test
+    fun `deleting a tag waits for expansion saves so they cannot recreate it`() =
+        runTest {
+            addTags("science::biology", "history")
+            withViewModel {
+                withQueuedCollectionAccess {
+                    toggleCollapsed("science")
+                    toggleCollapsed("science")
+                    removeTag("science").join()
+                }
+                assertEquals(listOf("history"), loadedState.visibleTagNames)
+                assertEquals(listOf("history"), col.tags.all())
+            }
+        }
+
+    @Test
+    fun `failed expansion save retains the visible hierarchy and reports the error`() =
+        runTest {
+            addTags("science::biology")
+            withViewModel {
+                withLockedCollection { toggleCollapsed("science").join() }
+                assertEquals(listOf("science", "science::biology"), loadedState.visibleTagNames)
+                assertFalse(loadedState.isWorking)
+                assertIs<CollectionLockedException>(loadedState.error)
+                toggleCollapsed("science").join()
+                assertNull(loadedState.error)
+                refreshTags().join()
+                assertEquals(listOf("science"), loadedState.visibleTagNames)
+            }
+        }
+
     @Test
     fun `toggleCollapsed expands a collapsed tag`() =
         runTest {
@@ -851,6 +996,28 @@ class ManageTagsViewModelTest : RobolectricTest() {
             }
         }
 
+    /**
+     * Detects a fix for [Anki issue 5870](https://github.com/ankitects/anki/issues/5870) so
+     * [UserMessage.UnusedTagNotMoved] and its handling can be removed. Call native reparent directly
+     * because [moveTagTree] currently implements moves using rename.
+     */
+    @Test
+    fun `backend reparent still requires UnusedTagNotMoved`() =
+        runTest {
+            val sourceTags = setOf("parent::child", "parent::child::leaf")
+            addUnusedTags(*sourceTags.toTypedArray())
+            assertEquals(sourceTags, col.tags.all().toSet())
+
+            col.tags.reparent(listOf("parent::child"), "target")
+
+            assertEquals(
+                sourceTags,
+                col.tags.all().toSet(),
+                "Anki issue 5870 changed: update moveTagTree to use the fixed backend operation " +
+                    "and remove ${UserMessage.UnusedTagNotMoved}.",
+            )
+        }
+
     @Test
     fun `moving an unused subtree preserves tags and the previous undo action`() =
         runTest {
@@ -858,11 +1025,15 @@ class ManageTagsViewModelTest : RobolectricTest() {
             withViewModel {
                 val before = col.tags.all().toSet()
                 val undoBefore = col.undoStatus()
-                moveTag("parent::child", "target").join()
-                assertThat(col.tags.all().toSet(), equalTo(before))
-                assertEquals(undoBefore.undo, col.undoStatus().undo)
-                assertEquals(undoBefore.redo, col.undoStatus().redo)
-                assertThat(pendingMessages.value.single().message, equalTo(UserMessage.TagMoved(0)))
+                for (destination in listOf("target", null)) {
+                    moveTag("parent::child", destination).join()
+                    assertThat(col.tags.all().toSet(), equalTo(before))
+                    assertEquals(undoBefore.undo, col.undoStatus().undo)
+                    assertEquals(undoBefore.redo, col.undoStatus().redo)
+                    val pending = pendingMessages.value.single()
+                    assertThat(pending.message, equalTo(UserMessage.UnusedTagNotMoved))
+                    messageShown(pending.id)
+                }
                 col.undo()
                 assertEquals(before, col.getNote(note.id).tags.toSet())
                 col.redo()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceNoExternalFilesDirTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceNoExternalFilesDirTest.kt
index 53d3f3ccee39..988eeedc5709 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceNoExternalFilesDirTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceNoExternalFilesDirTest.kt
@@ -6,7 +6,7 @@ import android.content.Intent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.IntentHandler
 import com.ichi2.anki.RobolectricTest
-import com.ichi2.anki.ShadowNullExternalFilesDir
+import com.ichi2.anki.ShadowNullExternalStorage
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
@@ -16,10 +16,12 @@ import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-@Config(shadows = [ShadowNullExternalFilesDir::class])
+@Config(shadows = [ShadowNullExternalStorage::class])
 class ManageSpaceNoExternalFilesDirTest : RobolectricTest() {
     @Test
     fun `opening without an external files dir redirects to the app start`() {
+        assertThat(targetContext.getExternalFilesDir(null), equalTo(null))
+
         val controller = Robolectric.buildActivity(ManageSpaceActivity::class.java, Intent())
         saveControllerForCleanup(controller)
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt
index bb67075f2252..21fb59ec5105 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt
@@ -12,7 +12,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commitNow
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.testutils.EmptyAnkiActivity
 import kotlinx.coroutines.CompletableDeferred
@@ -26,6 +25,7 @@ import org.robolectric.android.controller.ActivityController
 import org.robolectric.shadows.ShadowDialog
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class MessageQueueObserverTest : RobolectricTest() {
@@ -62,7 +62,7 @@ class MessageQueueObserverTest : RobolectricTest() {
         runTest {
             val waiting =
                 launch(start = CoroutineStart.UNDISPATCHED) {
-                    AlertDialog.Builder(ContextThemeWrapper(targetContext, R.style.Theme_Light)).showAndAwaitDismissal {}
+                    AlertDialog.Builder(ContextThemeWrapper(targetContext, CommonR.style.Theme_Light)).showAndAwaitDismissal {}
                 }
             val dialog = ShadowDialog.getLatestDialog()
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/DeckAdapterTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/widget/DeckAdapterTest.kt
index 45c956dbe156..2c29d7b0ff65 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/widget/DeckAdapterTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/widget/DeckAdapterTest.kt
@@ -32,6 +32,7 @@ import kotlin.test.assertIs
 import kotlin.test.assertNotNull
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class DeckAdapterTest : RobolectricTest() {
@@ -184,7 +185,7 @@ class DeckAdapterTest : RobolectricTest() {
     }
 
     private inner class HeatmapDeckListFixture {
-        private val context = ContextThemeWrapper(targetContext, R.style.Theme_Light)
+        private val context = ContextThemeWrapper(targetContext, CommonR.style.Theme_Light)
         val deckAdapter =
             DeckAdapter(
                 context,
diff --git a/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogScreenshotTest.kt
new file mode 100644
index 000000000000..2e4a0ecec6a1
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogScreenshotTest.kt
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.compose.ui.dialogs
+
+import androidx.compose.ui.test.assertHeightIsAtLeast
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.hasSetTextAction
+import androidx.compose.ui.test.isDialog
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.unit.dp
+import com.google.testing.junit.testparameterinjector.TestParameter
+import com.ichi2.anki.ComposeScreenshotTest
+import com.ichi2.anki.preferences.profiles.AddProfileDialog
+import org.junit.Test
+import org.robolectric.annotation.Config
+
+/** Captures Add profile at default text size and scrolling dialogs with fixed actions at 200%. */
+@Config(qualifiers = "w320dp-h320dp-mdpi")
+class TextInputDialogScreenshotTest : ComposeScreenshotTest() {
+    @Test
+    fun addProfile(
+        @TestParameter nameEntered: Boolean,
+    ) {
+        capture(
+            name = if (nameEntered) "add_profile_valid" else "add_profile_empty",
+            node = isDialog(),
+            beforeCapture = {
+                if (nameEntered) {
+                    composeRule.onNode(hasSetTextAction()).performTextInput("Personal")
+                    composeRule.onNodeWithText("Add").assertIsEnabled()
+                } else {
+                    composeRule.onNodeWithText("Add").assertIsNotEnabled()
+                }
+            },
+        ) {
+            AddProfileDialog(existingNames = emptyList(), onDismissRequest = {}, onConfirm = {})
+        }
+    }
+
+    @Test
+    fun largeTextInShortWindow(
+        @TestParameter inputVisible: Boolean,
+    ) {
+        val position = if (inputVisible) "input" else "title"
+        capture(
+            "large_text_short_window_$position",
+            node = isDialog(),
+            fontScale = 2f,
+            beforeCapture = {
+                val body = if (inputVisible) composeRule.onNode(hasSetTextAction()) else composeRule.onNodeWithText("Rename tag")
+                body.performScrollTo().assertIsDisplayed()
+                composeRule.onNodeWithText("Cancel").assertIsDisplayed().assertHeightIsAtLeast(40.dp)
+                composeRule.onNodeWithText("Rename").assertIsDisplayed().assertHeightIsAtLeast(40.dp)
+            },
+        ) {
+            TextInputDialog(
+                title = "Rename tag",
+                description = "Source tag: parent::Science",
+                label = "Tag name",
+                confirmText = "Rename",
+                dismissText = "Cancel",
+                initialText = "History",
+                onConfirm = {},
+                onDismissRequest = {},
+                validateOnInput = false,
+            )
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogTest.kt
index 561fe8102077..70b73a88ffdc 100644
--- a/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogTest.kt
@@ -3,38 +3,359 @@
 
 package com.ichi2.compose.ui.dialogs
 
+import android.view.animation.AnimationUtils
+import android.view.animation.Transformation
+import androidx.compose.ui.semantics.SemanticsProperties
+import androidx.compose.ui.test.SemanticsMatcher
+import androidx.compose.ui.test.assert
+import androidx.compose.ui.test.assertHeightIsAtLeast
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.assertTextContains
+import androidx.compose.ui.test.assertTextEquals
+import androidx.compose.ui.test.click
 import androidx.compose.ui.test.hasSetTextAction
+import androidx.compose.ui.test.junit4.StateRestorationTester
 import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performImeAction
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.performTextInputSelection
+import androidx.compose.ui.test.performTextReplacement
+import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.unit.dp
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.preferences.profiles.RenameProfileDialog
+import com.ichi2.compose.theme.AnkiDroidTheme
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import org.robolectric.shadows.ShadowDialog
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
-class TextInputDialogTest : RobolectricTest() {
+class TextInputDialogTest : RobolectricTest(loadBackend = false) {
     @get:Rule
-    val composeRule = createComposeRule()
+    val compose = createComposeRule()
+
+    @Test
+    fun `field semantics retain the label and editable value`() {
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Rename tag",
+                    label = "Tag name",
+                    confirmText = "Rename",
+                    initialText = "History",
+                    initialSelection = TextRange(1, 3),
+                    errorMessageFor = { if (it.isBlank()) "Name required" else null },
+                    onConfirm = {},
+                    onDismissRequest = {},
+                )
+            }
+        }
+
+        val field = compose.onNode(hasSetTextAction())
+        field.assertTextContains("Tag name")
+        field.assert(SemanticsMatcher.expectValue(SemanticsProperties.EditableText, AnnotatedString("History")))
+        field.assert(SemanticsMatcher.expectValue(SemanticsProperties.TextSelectionRange, TextRange(1, 3)))
+        field.assert(SemanticsMatcher.keyNotDefined(SemanticsProperties.ContentDescription))
+        compose.onNodeWithTag("text_input_label", useUnmergedTree = true).assertTextEquals("Tag name")
+
+        field.performTextReplacement("")
+
+        field.assertTextContains("Tag name")
+        field.assert(SemanticsMatcher.expectValue(SemanticsProperties.EditableText, AnnotatedString("")))
+        field.assert(SemanticsMatcher.keyIsDefined(SemanticsProperties.Error))
+        compose.onNodeWithText("Name required").assertIsDisplayed()
+    }
 
     @Test
     fun `the length counter uses the given length function`() {
-        composeRule.setContent {
-            TextInputDialog(
-                title = "Title",
-                label = "Label",
-                confirmText = "OK",
-                onConfirm = {},
-                onDismissRequest = {},
-                maxLengthCounter = 3,
-                lengthOf = { it.trim().length },
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Title",
+                    label = "Label",
+                    confirmText = "OK",
+                    onConfirm = {},
+                    onDismissRequest = {},
+                    maxLengthCounter = 3,
+                    lengthOf = { it.trim().length },
+                )
+            }
+        }
+
+        compose.onNode(hasSetTextAction()).performTextReplacement(" abc ")
+
+        compose.onNodeWithText("3/3").assertIsDisplayed()
+    }
+
+    @Test
+    fun `input transformation runs only for text edits`() {
+        var transformations = 0
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Rename",
+                    label = "Name",
+                    confirmText = "Confirm",
+                    initialText = "Initial",
+                    transformInput = {
+                        transformations++
+                        it.copy(text = it.text.uppercase())
+                    },
+                    onConfirm = {},
+                    onDismissRequest = {},
+                )
+            }
+        }
+        val field = compose.onNode(hasSetTextAction())
+        field.performTextInputSelection(TextRange.Zero)
+        assertEquals(0, transformations)
+
+        field.performTextReplacement("mixed")
+        field.assert(SemanticsMatcher.expectValue(SemanticsProperties.EditableText, AnnotatedString("MIXED")))
+        assertEquals(1, transformations)
+
+        field.performTextInputSelection(TextRange(1, 3))
+        assertEquals(1, transformations)
+    }
+
+    @Test
+    fun `deferred validation rejects invalid submission and allows retry`() {
+        var validations = 0
+        var submitted: String? = null
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Rename",
+                    label = "Name",
+                    confirmText = "Confirm",
+                    initialText = "Invalid",
+                    validateOnInput = false,
+                    errorMessageFor = {
+                        validations++
+                        if (it == "Allowed") null else "Invalid name"
+                    },
+                    onConfirm = { submitted = it },
+                    onDismissRequest = {},
+                )
+            }
+        }
+        val field = compose.onNode(hasSetTextAction())
+        compose.onNodeWithText("Confirm").assertIsEnabled()
+        compose.onNodeWithText("Invalid name").assertDoesNotExist()
+        field.performTextReplacement("Still invalid")
+        assertEquals(0, validations)
+
+        compose.onNodeWithText("Confirm").performClick()
+        compose.onNodeWithText("Invalid name").assertIsDisplayed()
+        compose.onNodeWithText("Confirm").assertIsEnabled()
+        assertNull(submitted)
+
+        val validationsAfterSubmission = validations
+        field.performTextReplacement("Allowed")
+        compose.onNodeWithText("Invalid name").assertDoesNotExist()
+        assertEquals(validationsAfterSubmission, validations)
+        field.performImeAction()
+        assertEquals("Allowed", submitted)
+    }
+
+    @Test
+    fun `disabled confirmation also blocks the keyboard action`() {
+        var confirmations = 0
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Rename",
+                    label = "Name",
+                    confirmText = "Confirm",
+                    initialText = "Valid",
+                    enabled = false,
+                    onConfirm = { confirmations++ },
+                    onDismissRequest = {},
+                )
+            }
+        }
+        compose.onNodeWithText("Confirm").assertIsNotEnabled()
+        compose.onNode(hasSetTextAction()).performImeAction()
+        assertEquals(0, confirmations)
+    }
+
+    @Test
+    fun `initial selection can place the cursor at the start`() {
+        assertInitialSelection("Existing", TextRange.Zero)
+    }
+
+    @Test
+    fun `initial selection can select all text`() {
+        val text = "Existing"
+        assertInitialSelection(text, TextRange(0, text.length))
+    }
+
+    @Test
+    fun `the cursor starts at the end of the profile name`() {
+        val name = "Work"
+        compose.setContent {
+            AnkiDroidTheme {
+                RenameProfileDialog(currentName = name, existingNames = emptyList(), onDismissRequest = {}, onConfirm = {})
+            }
+        }
+
+        val field = compose.onNode(hasSetTextAction())
+        field.assert(SemanticsMatcher.expectValue(SemanticsProperties.TextSelectionRange, TextRange(name.length)))
+    }
+
+    @Test
+    fun `edited text and cursor survive state restoration`() {
+        assertSelectionRestored(TextRange(3))
+    }
+
+    @Test
+    fun `edited text and selected range survive state restoration`() {
+        assertSelectionRestored(TextRange(1, 5))
+    }
+
+    @Test
+    fun `changing selection does not reveal validation errors before editing`() {
+        val validationError = "Name already exists"
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Rename",
+                    label = "Name",
+                    confirmText = "Rename",
+                    initialText = "Existing",
+                    errorMessageFor = { validationError },
+                    onConfirm = {},
+                    onDismissRequest = {},
+                )
+            }
+        }
+        val field = compose.onNode(hasSetTextAction())
+        compose.onNodeWithText(validationError).assertDoesNotExist()
+
+        for (selection in listOf(TextRange(2), TextRange(1, 4))) {
+            field.performTextInputSelection(selection)
+            field.assert(SemanticsMatcher.expectValue(SemanticsProperties.TextSelectionRange, selection))
+            compose.onNodeWithText(validationError).assertDoesNotExist()
+        }
+
+        field.performTextReplacement("Changed")
+        compose.onNodeWithText(validationError).assertIsDisplayed()
+    }
+
+    @Test
+    @Config(qualifiers = "w320dp-h320dp-port")
+    @GraphicsMode(GraphicsMode.Mode.NATIVE)
+    fun `large text can scroll the input without losing the action buttons`() {
+        RuntimeEnvironment.setFontScale(2f)
+        var confirmed = false
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Rename tag",
+                    description = "Source tag: parent::Science",
+                    label = "Tag name",
+                    confirmText = "Rename",
+                    initialText = "History",
+                    onConfirm = { confirmed = true },
+                    onDismissRequest = {},
+                    validateOnInput = false,
+                )
+            }
+        }
+        val move = compose.onNodeWithText("Rename").assertIsDisplayed().assertHeightIsAtLeast(40.dp)
+        compose.onNodeWithText("Cancel").assertIsDisplayed().assertHeightIsAtLeast(40.dp)
+        val originalBounds = move.fetchSemanticsNode().boundsInWindow
+        compose.onNode(hasSetTextAction()).performScrollTo().assertIsDisplayed()
+        assertEquals(originalBounds, move.fetchSemanticsNode().boundsInWindow)
+        move.performTouchInput { click() }
+        assertTrue(confirmed)
+    }
+
+    @Test
+    fun `dialog opening and closing fade without moving the card`() {
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(title = "Rename tag", label = "Tag name", confirmText = "OK", onConfirm = {}, onDismissRequest = {})
+            }
+        }
+        compose.waitForIdle()
+        val window = requireNotNull(ShadowDialog.getLatestDialog().window)
+        val animations =
+            targetContext.obtainStyledAttributes(
+                window.attributes.windowAnimations,
+                intArrayOf(
+                    android.R.attr.windowEnterAnimation,
+                    android.R.attr.windowExitAnimation,
+                ),
             )
+        try {
+            for (index in 0..1) {
+                val animation = AnimationUtils.loadAnimation(targetContext, animations.getResourceId(index, 0))
+                animation.initialize(320, 240, 320, 640)
+                animation.startTime = 0
+                val frame = Transformation()
+                for (time in listOf(0L, animation.duration / 2, animation.duration)) {
+                    animation.getTransformation(time, frame)
+                    assertTrue(frame.matrix.isIdentity, "Dialog moved at $time ms")
+                    if (time == 0L) assertEquals(if (index == 0) 0f else 1f, frame.alpha)
+                    if (time == animation.duration) assertEquals(if (index == 0) 1f else 0f, frame.alpha)
+                    frame.clear()
+                }
+            }
+        } finally {
+            animations.recycle()
+        }
+    }
+
+    private fun assertInitialSelection(
+        text: String,
+        selection: TextRange,
+    ) {
+        compose.setContent {
+            AnkiDroidTheme {
+                TextInputDialog(
+                    title = "Rename",
+                    label = "Name",
+                    confirmText = "Rename",
+                    initialText = text,
+                    initialSelection = selection,
+                    onConfirm = {},
+                    onDismissRequest = {},
+                )
+            }
+        }
+        compose.onNode(hasSetTextAction()).assert(SemanticsMatcher.expectValue(SemanticsProperties.TextSelectionRange, selection))
+    }
+
+    private fun assertSelectionRestored(selection: TextRange) {
+        val restoration = StateRestorationTester(compose)
+        restoration.setContent {
+            AnkiDroidTheme {
+                RenameProfileDialog(currentName = "Work", existingNames = emptyList(), onDismissRequest = {}, onConfirm = {})
+            }
         }
+        val field = compose.onNode(hasSetTextAction())
+        field.performTextReplacement("Personal")
+        field.performTextInputSelection(selection)
 
-        composeRule.onNode(hasSetTextAction()).performTextInput(" abc ")
+        restoration.emulateSavedInstanceStateRestore()
 
-        composeRule.onNodeWithText("3/3").assertIsDisplayed()
+        field.assert(SemanticsMatcher.expectValue(SemanticsProperties.EditableText, AnnotatedString("Personal")))
+        field.assert(SemanticsMatcher.expectValue(SemanticsProperties.TextSelectionRange, selection))
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt
index 83d06205fe3a..501bd8cca352 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt
@@ -16,7 +16,6 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.R
 import com.ichi2.testutils.EmptyApplication
 import com.ichi2.utils.DisplayUtils.setDialogKeyboardResize
 import org.junit.Test
@@ -25,6 +24,7 @@ import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 @Config(sdk = [29, 30, 36], application = EmptyApplication::class)
@@ -69,7 +69,7 @@ class DisplayUtilsTest {
     private fun withDialog(block: (AlertDialog) -> Unit) {
         Robolectric.buildActivity(Activity::class.java).use { controller ->
             val activity = controller.get()
-            activity.setTheme(R.style.Theme_Light)
+            activity.setTheme(CommonR.style.Theme_Light)
             controller.setup()
             val dialog = AlertDialog.Builder(activity).setView(EditText(activity)).create()
             try {
diff --git a/common/android/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt b/common/android/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
new file mode 100644
index 000000000000..84d306d9dbf9
--- /dev/null
+++ b/common/android/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.settings.enums
+
+import androidx.annotation.StyleRes
+import com.ichi2.anki.common.android.R
+
+sealed interface Theme : PrefEnum {
+    @get:StyleRes
+    val styleResId: Int
+}
+
+/** [R.array.day_theme_values] */
+enum class DayTheme(
+    override val entryResId: Int,
+    override val styleResId: Int,
+) : Theme {
+    LIGHT(R.string.theme_light_value, R.style.Theme_Light),
+    PLAIN(R.string.theme_plain_value, R.style.Theme_Light_Plain),
+    EINK(R.string.theme_eink_scheme_value, R.style.Theme_Light_Eink),
+}
diff --git a/common/android/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt b/common/android/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
new file mode 100644
index 000000000000..e283f979c262
--- /dev/null
+++ b/common/android/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.settings.enums
+
+import com.ichi2.anki.common.android.R
+
+/** [R.array.night_theme_values] */
+enum class NightTheme(
+    override val entryResId: Int,
+    override val styleResId: Int,
+) : Theme {
+    BLACK(R.string.theme_black_value, R.style.Theme_Dark_Black),
+    DARK(R.string.theme_dark_value, R.style.Theme_Dark),
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/theme/Borders.kt b/common/android/src/main/java/com/ichi2/compose/theme/Borders.kt
similarity index 86%
rename from AnkiDroid/src/main/java/com/ichi2/compose/theme/Borders.kt
rename to common/android/src/main/java/com/ichi2/compose/theme/Borders.kt
index 766f8faeb6f7..532aef32daad 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compose/theme/Borders.kt
+++ b/common/android/src/main/java/com/ichi2/compose/theme/Borders.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.core.content.withStyledAttributes
-import com.ichi2.anki.common.android.R as CommonR
+import com.ichi2.anki.common.android.R
 
 /** The XML theme's widget outline; e-ink uses it to distinguish white surfaces. */
 val MaterialTheme.widgetBorder: BorderStroke?
@@ -21,7 +21,7 @@ val MaterialTheme.widgetBorder: BorderStroke?
         val density = LocalDensity.current
         return remember(context, density) {
             var border: BorderStroke? = null
-            context.withStyledAttributes(attrs = intArrayOf(CommonR.attr.widgetStrokeWidth, CommonR.attr.widgetStrokeColor)) {
+            context.withStyledAttributes(attrs = intArrayOf(R.attr.widgetStrokeWidth, R.attr.widgetStrokeColor)) {
                 val width = with(density) { getDimension(0, 0f).toDp() }
                 if (width > 0.dp) {
                     border = BorderStroke(width, Color(getColor(1, android.graphics.Color.TRANSPARENT)))
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/theme/Colors.kt b/common/android/src/main/java/com/ichi2/compose/theme/Colors.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/compose/theme/Colors.kt
rename to common/android/src/main/java/com/ichi2/compose/theme/Colors.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/theme/Dimensions.kt b/common/android/src/main/java/com/ichi2/compose/theme/Dimensions.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/compose/theme/Dimensions.kt
rename to common/android/src/main/java/com/ichi2/compose/theme/Dimensions.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/theme/Theme.kt b/common/android/src/main/java/com/ichi2/compose/theme/Theme.kt
similarity index 80%
rename from AnkiDroid/src/main/java/com/ichi2/compose/theme/Theme.kt
rename to common/android/src/main/java/com/ichi2/compose/theme/Theme.kt
index b3b0cbfffacb..2f5fef958f93 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compose/theme/Theme.kt
+++ b/common/android/src/main/java/com/ichi2/compose/theme/Theme.kt
@@ -15,10 +15,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.withStyledAttributes
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R
 
 /**
  * Wraps [content] in a Material3 [MaterialTheme] populated from the currently
@@ -70,6 +71,7 @@ internal fun Context.toMaterial3ColorScheme(): ColorScheme {
     withStyledAttributes(attrs = R.styleable.ComposeTheme) {
         val isLight = getBoolean(R.styleable.ComposeTheme_isLightTheme, true)
         val base = if (isLight) lightColorScheme() else darkColorScheme()
+        val surface = color(R.styleable.ComposeTheme_colorSurface, base.surface)
         scheme =
             base.copy(
                 primary = color(R.styleable.ComposeTheme_colorPrimary, base.primary),
@@ -92,17 +94,35 @@ internal fun Context.toMaterial3ColorScheme(): ColorScheme {
                 onError = color(R.styleable.ComposeTheme_colorOnError, base.onError),
                 errorContainer = color(R.styleable.ComposeTheme_colorErrorContainer, base.errorContainer),
                 onErrorContainer = color(R.styleable.ComposeTheme_colorOnErrorContainer, base.onErrorContainer),
-                surface = color(R.styleable.ComposeTheme_colorSurface, base.surface),
+                surface = surface,
                 onSurface = color(R.styleable.ComposeTheme_colorOnSurface, base.onSurface),
                 surfaceVariant = color(R.styleable.ComposeTheme_colorSurfaceVariant, base.surfaceVariant),
                 onSurfaceVariant = color(R.styleable.ComposeTheme_colorOnSurfaceVariant, base.onSurfaceVariant),
                 outline = color(R.styleable.ComposeTheme_colorOutline, base.outline),
                 outlineVariant = color(R.styleable.ComposeTheme_colorOutlineVariant, base.outlineVariant),
-                surfaceContainer = color(R.styleable.ComposeTheme_colorSurfaceContainer, base.surfaceContainer),
-                surfaceContainerHigh = color(R.styleable.ComposeTheme_colorSurfaceContainerHigh, base.surfaceContainerHigh),
-                surfaceContainerHighest = color(R.styleable.ComposeTheme_colorSurfaceContainerHighest, base.surfaceContainerHighest),
-                surfaceContainerLow = color(R.styleable.ComposeTheme_colorSurfaceContainerLow, base.surfaceContainerLow),
-                surfaceContainerLowest = color(R.styleable.ComposeTheme_colorSurfaceContainerLowest, base.surfaceContainerLowest),
+                // XML container colors can be overlay tints. Compose uses these as standalone
+                // surfaces (including popup windows), which must not reveal the content behind them.
+                surfaceContainer = color(R.styleable.ComposeTheme_colorSurfaceContainer, base.surfaceContainer).compositeOver(surface),
+                surfaceContainerHigh =
+                    color(
+                        R.styleable.ComposeTheme_colorSurfaceContainerHigh,
+                        base.surfaceContainerHigh,
+                    ).compositeOver(surface),
+                surfaceContainerHighest =
+                    color(
+                        R.styleable.ComposeTheme_colorSurfaceContainerHighest,
+                        base.surfaceContainerHighest,
+                    ).compositeOver(surface),
+                surfaceContainerLow =
+                    color(
+                        R.styleable.ComposeTheme_colorSurfaceContainerLow,
+                        base.surfaceContainerLow,
+                    ).compositeOver(surface),
+                surfaceContainerLowest =
+                    color(
+                        R.styleable.ComposeTheme_colorSurfaceContainerLowest,
+                        base.surfaceContainerLowest,
+                    ).compositeOver(surface),
                 background = color(R.styleable.ComposeTheme_android_colorBackground, base.background),
             )
     }
diff --git a/common/android/src/main/java/com/ichi2/compose/ui/dialogs/AnkiDroidDialog.kt b/common/android/src/main/java/com/ichi2/compose/ui/dialogs/AnkiDroidDialog.kt
index 4a328e8158da..4cb9b0730f6e 100644
--- a/common/android/src/main/java/com/ichi2/compose/ui/dialogs/AnkiDroidDialog.kt
+++ b/common/android/src/main/java/com/ichi2/compose/ui/dialogs/AnkiDroidDialog.kt
@@ -7,10 +7,14 @@ import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.DialogWindowProvider
+import com.ichi2.anki.common.android.R
 
 /**
  * A [BasicAlertDialog] whose content renders inline in Compose previews.
@@ -41,7 +45,15 @@ fun AnkiDroidDialog(
             onDismissRequest = onDismissRequest,
             modifier = modifier,
             properties = properties,
-            content = content,
-        )
+        ) {
+            val window = (LocalView.current.parent as DialogWindowProvider).window
+            // A slide here competes with initial field focus and keyboard positioning.
+            SideEffect {
+                if (window.attributes.windowAnimations != R.style.Animation_AnkiDroidDialog) {
+                    window.setWindowAnimations(R.style.Animation_AnkiDroidDialog)
+                }
+            }
+            content()
+        }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt b/common/android/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt
rename to common/android/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidThemeProvider.kt b/common/android/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidThemeProvider.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidThemeProvider.kt
rename to common/android/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidThemeProvider.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/DialogPreviews.kt b/common/android/src/main/java/com/ichi2/compose/ui/preview/DialogPreviews.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/DialogPreviews.kt
rename to common/android/src/main/java/com/ichi2/compose/ui/preview/DialogPreviews.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt b/common/android/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt
rename to common/android/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/NonLeadingZeroInputFilter.kt b/common/android/src/main/java/com/ichi2/utils/NonLeadingZeroInputFilter.kt
similarity index 95%
rename from AnkiDroid/src/main/java/com/ichi2/anki/ui/NonLeadingZeroInputFilter.kt
rename to common/android/src/main/java/com/ichi2/utils/NonLeadingZeroInputFilter.kt
index 919bf070b583..0b2fc806ff75 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/NonLeadingZeroInputFilter.kt
+++ b/common/android/src/main/java/com/ichi2/utils/NonLeadingZeroInputFilter.kt
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package com.ichi2.anki.ui
+package com.ichi2.utils
 
 import android.text.InputFilter
 import android.text.Spanned
diff --git a/common/android/src/main/java/com/ichi2/utils/NumberRangeDialogTitle.kt b/common/android/src/main/java/com/ichi2/utils/NumberRangeDialogTitle.kt
new file mode 100644
index 000000000000..fe780eeea45b
--- /dev/null
+++ b/common/android/src/main/java/com/ichi2/utils/NumberRangeDialogTitle.kt
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.utils
+
+import android.content.Context
+import android.util.TypedValue
+import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.TextViewCompat
+import com.google.android.material.textview.MaterialTextView
+import com.ichi2.anki.common.utils.dp
+import com.google.android.material.R as MaterialR
+
+/** Preserve the title appearance of number range preferences, including the host theme. */
+fun AlertDialog.Builder.numberRangeTitle(
+    title: CharSequence?,
+    hostContext: Context,
+): AlertDialog.Builder {
+    if (title.isNullOrEmpty()) return this
+    val tv =
+        MaterialTextView(hostContext).apply {
+            text = title
+            setPaddingRelative(start = 24.dp, top = 20.dp, end = 24.dp, bottom = 8.dp)
+            val outValue = TypedValue()
+            val hasStyle = context.theme.resolveAttribute(MaterialR.attr.materialAlertDialogTitleTextStyle, outValue, true)
+            val styleRes = if (hasStyle) outValue.resourceId else 0
+            if (styleRes != 0) {
+                TextViewCompat.setTextAppearance(this, styleRes)
+            } else {
+                TextViewCompat.setTextAppearance(this, MaterialR.style.TextAppearance_Material3_HeadlineSmall)
+            }
+        }
+    return setCustomTitle(tv)
+}
diff --git a/common/android/src/main/java/com/ichi2/utils/ViewPadding.kt b/common/android/src/main/java/com/ichi2/utils/ViewPadding.kt
new file mode 100644
index 000000000000..b0db67102c57
--- /dev/null
+++ b/common/android/src/main/java/com/ichi2/utils/ViewPadding.kt
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.utils
+
+import android.view.View
+import com.ichi2.anki.common.utils.Dp
+
+/**
+ * Sets the relative padding for all dimensions of the view
+ *
+ * The view may add on the space required to display the scrollbars,
+ * depending on the style and visibility of the scrollbars.
+ * So the values returned from `getPadding` calls
+ * may be different from the values set in this call.
+ */
+fun View.setPaddingRelative(px: Int) = setPaddingRelative(px, px, px, px)
+
+/**
+ * Sets the relative padding for all dimensions of the view
+ *
+ * The view may add on the space required to display the scrollbars,
+ * depending on the style and visibility of the scrollbars.
+ * So the values returned from `getPadding` calls
+ * may be different from the values set in this call.
+ */
+@Suppress("unused")
+fun View.setPaddingRelative(dp: Dp) = setPaddingRelative(dp.toPx(context))
+
+/**
+ * Sets the relative padding
+ *
+ * The view may add on the space required to display the scrollbars,
+ * depending on the style and visibility of the scrollbars.
+ * So the values returned from `getPadding` calls
+ * may be different from the values set in this call.
+ */
+// Since we're in Kotlin, this now allows named arguments!
+@Suppress("unused")
+fun View.setPaddingRelative(
+    start: Dp,
+    top: Dp,
+    end: Dp,
+    bottom: Dp,
+) = setPaddingRelative(start.toPx(context), top.toPx(context), end.toPx(context), bottom.toPx(context))
+
+/**
+ * Updates the relative padding for the [View]
+ * This version of the method allows using named parameters to just set one or more axes.
+ *
+ * @see View.setPaddingRelative
+ */
+fun View.updatePaddingRelative(
+    start: Dp? = null,
+    top: Dp? = null,
+    end: Dp? = null,
+    bottom: Dp? = null,
+) {
+    setPaddingRelative(
+        start?.toPx(context) ?: this.paddingStart,
+        top?.toPx(context) ?: this.paddingTop,
+        end?.toPx(context) ?: this.paddingEnd,
+        bottom?.toPx(context) ?: this.paddingBottom,
+    )
+}
diff --git a/common/android/src/main/res/anim/dialog_fade_in.xml b/common/android/src/main/res/anim/dialog_fade_in.xml
new file mode 100644
index 000000000000..9ef0e7de0bab
--- /dev/null
+++ b/common/android/src/main/res/anim/dialog_fade_in.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromAlpha="0.0"
+    android:toAlpha="1.0"
+    android:duration="@android:integer/config_shortAnimTime" />
diff --git a/common/android/src/main/res/anim/dialog_fade_out.xml b/common/android/src/main/res/anim/dialog_fade_out.xml
new file mode 100644
index 000000000000..765c80542ce5
--- /dev/null
+++ b/common/android/src/main/res/anim/dialog_fade_out.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.0"
+    android:duration="@android:integer/config_shortAnimTime" />
diff --git a/AnkiDroid/src/main/res/color/faded_primary.xml b/common/android/src/main/res/color/faded_primary.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/faded_primary.xml
rename to common/android/src/main/res/color/faded_primary.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_remove.xml b/common/android/src/main/res/drawable/ic_remove.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_remove.xml
rename to common/android/src/main/res/drawable/ic_remove.xml
diff --git a/AnkiDroid/src/main/res/values-v29/theme_dark.xml b/common/android/src/main/res/values-v29/theme_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values-v29/theme_dark.xml
rename to common/android/src/main/res/values-v29/theme_dark.xml
diff --git a/AnkiDroid/src/main/res/values-v29/theme_light.xml b/common/android/src/main/res/values-v29/theme_light.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values-v29/theme_light.xml
rename to common/android/src/main/res/values-v29/theme_light.xml
diff --git a/AnkiDroid/src/main/res/values-v29/theme_plain.xml b/common/android/src/main/res/values-v29/theme_plain.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values-v29/theme_plain.xml
rename to common/android/src/main/res/values-v29/theme_plain.xml
diff --git a/AnkiDroid/src/main/res/values/compose_theme_attrs.xml b/common/android/src/main/res/values/compose_theme_attrs.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values/compose_theme_attrs.xml
rename to common/android/src/main/res/values/compose_theme_attrs.xml
diff --git a/common/android/src/main/res/values/dialog_styles.xml b/common/android/src/main/res/values/dialog_styles.xml
new file mode 100644
index 000000000000..0b43e59e60d1
--- /dev/null
+++ b/common/android/src/main/res/values/dialog_styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<resources>
+    <style name="Animation.AnkiDroidDialog" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/dialog_fade_in</item>
+        <item name="android:windowExitAnimation">@anim/dialog_fade_out</item>
+    </style>
+</resources>
diff --git a/common/android/src/main/res/values/theme_black.xml b/common/android/src/main/res/values/theme_black.xml
index e78ca81fcbc7..545a43b2f0e5 100644
--- a/common/android/src/main/res/values/theme_black.xml
+++ b/common/android/src/main/res/values/theme_black.xml
@@ -6,4 +6,146 @@
     <color name="theme_black_primary_light">#151515</color>
     <color name="theme_black_primary_text">#fff</color> <!-- Alternative: #808080 -->
     <color name="theme_black_row_current">#1a1a1a</color>
+
+    <style name="Base.Theme.Dark.Black" parent="Theme_Dark">
+        <!-- Android colors -->
+        <item name="colorPrimary">@color/material_blue_400</item>
+        <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorAccent">@color/material_blue_500</item>
+        <item name="colorSecondaryContainer">#252525</item>
+        <item name="colorSurfaceVariant">#252525</item>
+        <item name="colorOnSurfaceVariant">#CCCCCC</item>
+        <item name="colorOutlineVariant">#555555</item>
+        <item name="colorTertiary">#CCCCCC</item>
+        <item name="colorOnTertiary">#000000</item>
+        <item name="colorSurfaceContainerHigh">#151515</item>
+        <item name="android:textColor">@color/text_color_dark</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
+        <item name="android:colorBackground">@color/theme_black_primary</item>
+        <item name="android:windowBackground">@color/theme_black_primary</item>
+        <item name="preferenceCategoryTitleTextColor">?attr/colorAccent</item>
+        <!-- Action bar styles -->
+        <item name="appBarColor">@color/theme_black_primary</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionBarTextColor">@color/white</item>
+        <item name="actionBarPopupTextColor">@color/theme_black_primary_text</item>
+        <item name="actionModeBackground">@color/theme_black_primary_dark</item>
+        <!-- Tab layout -->
+        <item name="tabLayoutBackgroundColor">@color/theme_black_primary_dark</item>
+        <item name="tabActiveIconColor">@color/material_blue_500</item>
+        <!-- Deck list colors and divider -->
+        <item name="currentDeckBackground">@drawable/item_background_selected</item>
+        <item name="currentDeckBackgroundColor">@color/theme_black_row_current</item>
+        <item name="focusedRowBackgroundColor">@color/theme_black_row_current</item>
+        <item name="dynDeckColor">@color/material_light_blue_500</item>
+        <item name="deckDivider">@drawable/divider_black</item>
+        <item name="expandRef">@drawable/ic_chevron_right_white</item>
+        <item name="collapseRef">@drawable/ic_expand_more_white</item>
+        <!-- Count colors -->
+        <item name="newCountColor">@color/material_blue_600</item>
+        <item name="learnCountColor">@color/material_red_400</item>
+        <item name="reviewCountColor">@color/material_green_400</item>
+        <item name="buryCountColor">@color/disabled_gray_dark</item>
+        <item name="zeroCountColor">#202020</item>
+        <!-- Study Screen colors -->
+        <item name="showAnswerButtonBackground">#0c1215</item>
+        <item name="showAnswerColor">@color/theme_black_primary</item>
+        <item name="topBarColor">@color/theme_black_primary</item>
+        <item name="maxTimerColor">@color/material_red_300</item>
+        <item name="answerButtonTextColor">@color/theme_black_primary_text</item>
+        <item name="againButtonTextColor">@color/material_red_400</item>
+        <item name="hardButtonTextColor">@color/white</item>
+        <item name="goodButtonTextColor">@color/material_green_400</item>
+        <item name="easyButtonTextColor">@color/material_blue_700</item>
+
+        <item name="alternativeBackgroundColor">#0C0C0C</item>
+        <item name="againTextColor">@color/material_red_200</item>
+        <item name="hardTextColor">@color/material_orange_200</item>
+        <item name="goodTextColor">@color/material_light_green_200</item>
+        <item name="easyTextColor">@color/material_light_blue_A100</item>
+        <item name="againBackgroundColor">#170e0e</item>
+        <item name="hardBackgroundColor">#19120c</item>
+        <item name="goodBackgroundColor">#0e1310</item>
+        <item name="easyBackgroundColor">#0c1317</item>
+        <!-- Study Screen button drawables -->
+        <item name="againButtonRef">@drawable/footer_button_all_black</item>
+        <item name="hardButtonRef">@drawable/footer_button_all_black</item>
+        <item name="goodButtonRef">@drawable/footer_button_all_black</item>
+        <item name="easyButtonRef">@drawable/footer_button_all_black</item>
+        <item name="againButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
+        <item name="hardButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
+        <item name="goodButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
+        <item name="easyButtonRippleRef">@drawable/footer_button_all_black_ripple</item>
+        <!-- Card Browser Colors -->
+        <item name="cardBrowserDivider">@color/white</item>
+        <!-- Browser colors -->
+        <item name="suspendedColor">#A8A634</item>
+        <item name="selectedColor">#a86634</item>
+        <item name="markedColor">#391080</item>
+        <!-- Note editor colors -->
+        <item name="duplicateColor">#855</item>
+        <!-- Note editor colors -->
+        <item name="editTextBackgroundColor">#EE5C5C5C</item>
+        <item name="editTextHighlightColor">@color/material_light_blue_900</item>
+        <item name="toolbarBackgroundColor">#616161</item>
+        <item name="toolbarIconColor">@color/white</item>
+        <item name="buttonShadowColor">#726B6B</item>
+        <item name="buttonRippleColor">#BABABA</item>
+        <item name="buttonForegroundColor">#363636</item>
+        <!-- FAB -->
+        <item name="fab_normal">#ff303030</item>
+        <item name="fab_pressed">#c8303030</item> <!-- 55 less opacity than fab_normal -->
+        <!-- Images -->
+        <item name="navDrawerImage">@drawable/nav_drawer_logo_black_theme</item>
+        <!-- Dialog styles -->
+        <item name="android:listPreferredItemHeight">56dip</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.AnkiDroid.AlertDialog.Black</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog.Black</item>
+        <!--Custom Tabs colors-->
+        <item name="customTabNavBarColor">#000000</item>
+        <item name="popupBackgroundColor">@color/popup_background_theme_black</item>
+        <item name="android:statusBarColor">@color/black</item>
+
+        <item name="editTextDisabled">@color/material_grey_700</item>
+        <item name="android:navigationBarColor">@color/black</item>
+
+        <!-- Snackbar -->
+        <item name="snackbarTextViewStyle">@style/SnackbarTextStyleBlack</item>
+        <item name="snackbarBackgroundTintColor">#ff303030</item>
+        <item name="snackbarButtonTextColor">@color/material_light_blue_300</item>
+
+        <!-- Introduction -->
+        <item name="introductionLogoTransparent">#55111111</item>
+
+        <!-- Card-->
+        <item name="cardViewStyle">@style/BlackCardBackground</item>
+
+        <!-- ProgressDialog-->
+        <item name="dialogBackground">@color/theme_black_primary_light</item>
+        <item name="progressDialogButtonTextColor">@color/material_light_blue_400</item>
+
+
+        <item name="incrementerButtonBackground">@color/material_blue_grey_900</item>
+    </style>
+
+    <style name="SnackbarTextStyleBlack" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="BlackCardBackground" parent="CardView">
+        <item name="cardBackgroundColor">@color/theme_black_primary_light</item>
+    </style>
+
+    <style name="ThemeOverlay.AnkiDroid.AlertDialog.Black" parent="ThemeOverlay.AnkiDroid.AlertDialog">
+        <item name="android:colorBackground">@color/theme_black_primary_light</item>
+    </style>
+
+    <style name="ThemeOverlay.App.BottomSheetDialog.Black" parent="ThemeOverlay.App.BottomSheetDialog">
+        <item name="android:colorBackground">@color/theme_black_primary_light</item>
+        <item name="elevationOverlayEnabled">false</item>
+    </style>
+
+    <style name="Theme_Dark.Black" parent="Base.Theme.Dark.Black"/>
 </resources>
diff --git a/common/android/src/main/res/values/theme_dark.xml b/common/android/src/main/res/values/theme_dark.xml
index d513b08ac719..f643d99d9a92 100644
--- a/common/android/src/main/res/values/theme_dark.xml
+++ b/common/android/src/main/res/values/theme_dark.xml
@@ -9,4 +9,188 @@
     <color name="theme_dark_row_current">#393939</color>
     <color name="theme_dark_drawer_row_current">#33999999</color>
     <color name="theme_dark_drawer_item">#DEFFFFFF</color>
+
+    <style name="Base.Theme.Dark" parent="@style/Theme.Material3.Dark.NoActionBar">
+        <!-- Android colors -->
+        <item name="colorPrimary">@color/material_blue_400</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorPrimaryDark">@color/theme_dark_primary_dark</item>
+        <item name="colorSurface">?android:colorBackground</item>
+        <item name="colorAccent">@color/material_blue_400</item>
+        <item name="colorOnSurface">@color/white</item>
+        <item name="colorPrimaryContainer">@color/white</item> <!-- Switch thumb color when disabled and being pressed -->
+        <item name="colorOnPrimaryContainer">@color/white</item> <!-- FAB icons -->
+
+        <item name="android:textColor">@color/text_color_dark</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
+        <item name="android:colorBackground">@color/material_theme_grey</item>
+        <item name="android:windowBackground">@color/material_theme_grey</item>
+        <item name="colorSecondaryContainer">#3C5A6E</item>
+        <item name="colorSurfaceVariant">#263E50</item>
+        <item name="colorOnSurfaceVariant">#D4D4D4</item>
+        <item name="colorOutlineVariant">#5B819B</item>
+        <item name="colorTertiary">#78CAFF</item>
+        <item name="colorOnTertiary">#00324D</item>
+        <item name="colorOnSecondaryContainer">@color/white</item>
+
+        <item name="colorSurfaceContainerHighest">?attr/colorSurfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">#424C54</item>
+        <item name="colorSurfaceContainer">#0F42A5F5</item>
+        <item name="colorSurfaceContainerLow">?android:attr/colorBackground</item>
+        <!-- Widget colors -->
+        <item name="widgetColorActivated">?attr/colorAccent</item>
+        <item name="preferenceCategoryTitleTextColor">?attr/colorAccent</item>
+        <!-- Navigation drawer -->
+        <item name="navDrawerItemColor">@color/drawer_item_text_dark</item>
+        <item name="navDrawerItemBackgroundColor">@drawable/drawer_item_background_dark</item>
+        <!-- Menu -->
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+        <item name="popupMenuStyle">@style/PopupMenuStyle</item>
+        <item name="spinnerStyle">@style/SpinnerStyle</item>
+        <!-- Action bar styles -->
+        <item name="appBarColor">@color/theme_dark_primary</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionBarTextColor">@color/white</item>
+        <item name="actionBarPopupTextColor">@color/theme_dark_primary_text</item>
+        <item name="actionModeBackground">@color/theme_dark_primary</item>
+        <!-- Tab layout -->
+        <item name="tabLayoutBackgroundColor">@color/theme_dark_primary</item>
+        <item name="tabActiveIconColor">@color/material_blue_500</item>
+        <!-- Deck list colors and divider -->
+        <item name="currentDeckBackground">@drawable/item_background_selected</item>
+        <item name="currentDeckBackgroundColor">@color/theme_dark_row_current</item>
+        <item name="focusedRowBackgroundColor">@color/theme_dark_row_current</item>
+        <item name="dynDeckColor">@color/material_light_blue_500</item>
+        <item name="deckDivider">@drawable/divider_dark</item>
+        <item name="expandRef">@drawable/ic_chevron_right_white</item>
+        <item name="collapseRef">@drawable/ic_expand_more_white</item>
+        <!-- Count colors -->
+        <item name="newCountColor">@color/material_indigo_200</item>
+        <item name="learnCountColor">@color/material_red_200</item>
+        <item name="reviewCountColor">@color/material_green_200</item>
+        <item name="buryCountColor">@color/disabled_gray_dark</item>
+        <item name="zeroCountColor">#404040</item>
+        <!-- Study Screen colors -->
+        <item name="showAnswerButtonBackground">#22333f</item>
+        <item name="againButtonBackground">@color/material_red_800</item>
+        <item name="hardButtonBackground">@color/material_blue_grey_800</item>
+        <item name="goodButtonBackground">@color/material_green_800</item>
+        <item name="easyButtonBackground">@color/material_light_blue_800</item>
+        <item name="topBarColor">@color/theme_dark_primary_light</item>
+        <item name="maxTimerColor">@color/material_red_300</item>
+        <item name="answerButtonTextColor">@color/white</item>
+        <item name="againButtonTextColor">@color/white</item>
+        <item name="hardButtonTextColor">@color/white</item>
+        <item name="goodButtonTextColor">@color/white</item>
+        <item name="easyButtonTextColor">@color/white</item>
+
+        <item name="alternativeBackgroundColor">#2a2a2a</item>
+        <item name="againTextColor">@color/material_red_200</item>
+        <item name="hardTextColor">@color/material_orange_200</item>
+        <item name="goodTextColor">@color/material_light_green_200</item>
+        <item name="easyTextColor">@color/material_light_blue_A100</item>
+        <item name="againBackgroundColor">#462828</item>
+        <item name="hardBackgroundColor">#4e3122</item>
+        <item name="goodBackgroundColor">#2c3b2c</item>
+        <item name="easyBackgroundColor">#223946</item>
+        <item name="againIconColor">?againTextColor</item>
+        <item name="hardIconColor">?hardTextColor</item>
+        <item name="goodIconColor">?goodTextColor</item>
+        <item name="easyIconColor">?easyTextColor</item>
+        <!-- Study Screen button drawables -->
+        <item name="showAnswerColor">@color/material_blue_grey_800</item>
+        <item name="againButtonRef">@drawable/footer_button_again_dark</item>
+        <item name="hardButtonRef">@drawable/footer_button_hard_dark</item>
+        <item name="goodButtonRef">@drawable/footer_button_good_dark</item>
+        <item name="easyButtonRef">@drawable/footer_button_easy_dark</item>
+        <item name="againButtonRippleRef">@drawable/footer_button_ripple</item>
+        <item name="hardButtonRippleRef">@drawable/footer_button_ripple</item>
+        <item name="goodButtonRippleRef">@drawable/footer_button_ripple</item>
+        <item name="easyButtonRippleRef">@drawable/footer_button_ripple</item>
+        <!-- Card Browser Colors -->
+        <item name="cardBrowserDivider">@color/white</item>
+        <!-- Browser colors -->
+        <item name="suspendedColor">@color/material_grey_700</item>
+        <item name="buriedColor">#612B09</item>
+        <item name="markedColor">@color/material_deep_purple_400</item>
+        <!-- Note editor colors -->
+        <item name="duplicateColor">#855</item>
+        <item name="editTextBackgroundColor">#EE5C5C5C</item>
+        <item name="editTextHighlightColor">@color/material_light_blue_900</item>
+        <item name="toolbarBackgroundColor">#616161</item>
+        <item name="toolbarIconColor">@color/white</item>
+        <item name="buttonShadowColor">#bdbdbd</item>
+        <item name="buttonRippleColor">#BABABA</item>
+        <item name="buttonForegroundColor">#757575</item>
+        <!-- FAB -->
+        <item name="fab_normal">@color/material_light_blue_700</item>
+        <item name="fab_pressed">@color/material_light_blue_900</item>
+        <!-- Images -->
+        <item name="navDrawerImage">@drawable/nav_drawer_logo_dark_theme</item>
+        <!-- Dialog styles -->
+        <item name="android:listPreferredItemHeight">56dip</item>
+        <item name="dialogCornerRadius">@dimen/dialog_corner_radius</item>
+        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item>
+        <item name="textAllCaps">false</item>
+        <item name="clozeColor">#1976D2</item>
+        <!--Custom Tabs colors-->
+        <item name="customTabNavBarColor">@color/material_grey_800</item>
+        <item name="popupBackgroundColor">@color/popup_background_theme_dark</item>
+        <item name="editTextDisabled">@color/material_grey_500</item>
+        <item name="overflowAndPopupMenuIconColor">#9effffff</item>
+        <!-- StatusBar -->
+        <item name="android:statusBarColor">@color/theme_dark_primary</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <!-- Navbar -->
+        <item name="android:navigationBarColor">@color/material_theme_grey</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+        <item name="android:navigationBarColor">@color/black</item>
+
+        <!-- Snackbar. Attributes snackbarStyle, snackbarTextViewStyle and snackbarButtonStyle
+             must be *all* present in a theme (or its parent) in order for the snackbar
+             to pick up the proper layout that uses these attributes. -->
+        <item name="snackbarStyle">@style/SnackbarStyle</item>
+        <item name="snackbarTextViewStyle">@style/Widget.MaterialComponents.Snackbar.TextView</item>
+        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
+        <item name="snackbarBackgroundTintColor">#cfcfcf</item>
+        <item name="snackbarButtonTextColor">@color/material_light_blue_900</item>
+
+        <!-- Introduction -->
+        <item name="introductionLogoTransparent">#883d3d3d</item>
+
+        <!-- Widget styles -->
+        <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.Material3</item>
+        <item name="sliderStyle">@style/SliderStyle</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.AnkiDroid</item>
+
+        <!-- ProgressDialog-->
+        <item name="dialogBackground">#ff303030</item>
+        <item name="progressDialogButtonTextColor">@color/material_light_blue_400</item>
+
+        <item name="checkMediaListBackground">@color/material_grey_700</item>
+        <item name="checkMediaListForeground">@color/white</item>
+
+        <!-- AlertDialogTheme-->
+        <item name="alertDialogTheme">@style/ThemeOverlay.AnkiDroid.AlertDialog</item>
+        <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout</item>
+
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
+
+        <item name="incrementerButtonBackground">@color/material_theme_grey</item>
+
+        <!-- Reminder troubleshooting -->
+        <item name="reminderTroubleshootingOk">@color/google_green_300</item>
+        <item name="reminderTroubleshootingWarning">@color/google_yellow_300</item>
+
+        <item name="badgeErrorColor">#f45000</item>
+        <item name="badgeWarningColor">#ff5e13</item>
+        <item name="widgetStrokeWidth">0dp</item>
+        <item name="widgetStrokeColor">@color/transparent</item>
+        <item name="studyScreenElevation">0.8dp</item>
+        <item name="whiteboardToolbarCardStyle">?attr/materialCardViewStyle</item>
+    </style>
+
+    <style name="Theme_Dark" parent="Base.Theme.Dark"/>
 </resources>
diff --git a/AnkiDroid/src/main/res/values/theme_eink.xml b/common/android/src/main/res/values/theme_eink.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values/theme_eink.xml
rename to common/android/src/main/res/values/theme_eink.xml
diff --git a/AnkiDroid/src/main/res/values/theme_light.xml b/common/android/src/main/res/values/theme_light.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values/theme_light.xml
rename to common/android/src/main/res/values/theme_light.xml
diff --git a/common/android/src/main/res/values/theme_plain.xml b/common/android/src/main/res/values/theme_plain.xml
index 5f7298a32d04..32fd0232d9a9 100644
--- a/common/android/src/main/res/values/theme_plain.xml
+++ b/common/android/src/main/res/values/theme_plain.xml
@@ -6,4 +6,94 @@
     <color name="theme_plain_primary_light">#F5F5F5</color>
     <color name="theme_plain_accent">#607D8B</color>
     <color name="theme_plain_primary_text">#212121</color>
+
+    <style name="Base.Theme.Light.Plain">
+        <!-- Android colors -->
+        <item name="colorPrimary">@color/theme_plain_primary</item>
+        <item name="colorPrimaryDark">@color/theme_plain_primary_dark</item>
+        <item name="colorAccent">@color/theme_plain_accent</item>
+        <item name="colorSurfaceContainer">#0F9E9E9E</item>
+        <item name="colorSecondaryContainer">#DDDDDD</item>
+        <item name="colorSurfaceVariant">#EEEEEE</item>
+        <item name="colorOnSurfaceVariant">#555555</item>
+        <item name="colorOutlineVariant">#BBBBBB</item>
+        <item name="colorTertiary">#555555</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorSurfaceContainerHigh">#F4F4F4</item>
+        <item name="android:textColor">@color/text_color_light</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
+        <item name="preferenceCategoryTitleTextColor">?attr/colorAccent</item>
+        <!-- Widget colors -->
+        <item name="widgetColorActivated">?attr/colorAccent</item>
+        <!-- Action bar styles -->
+        <item name="actionBarPopupTextColor">@color/theme_plain_primary_text</item>
+        <item name="actionModeBackground">@color/theme_plain_primary</item>
+        <!-- Tab layout -->
+        <item name="tabLayoutBackgroundColor">@color/theme_plain_primary</item>
+        <item name="tabActiveIconColor">@color/white</item>
+        <!-- Study Screen colors -->
+        <item name="topBarColor">@color/theme_plain_primary_light</item>
+        <item name="againTextColor">@color/material_grey_800</item>
+        <item name="hardTextColor">@color/material_grey_800</item>
+        <item name="goodTextColor">@color/material_grey_800</item>
+        <item name="easyTextColor">@color/material_grey_800</item>
+        <item name="againBackgroundColor">@color/material_grey_300</item>
+        <item name="hardBackgroundColor">@color/material_grey_300</item>
+        <item name="goodBackgroundColor">@color/material_grey_300</item>
+        <item name="easyBackgroundColor">@color/material_grey_300</item>
+        <item name="againIconColor">@color/material_red_900</item>
+        <item name="hardIconColor">#B33800</item>
+        <item name="goodIconColor">@color/material_green_900</item>
+        <item name="easyIconColor">@color/material_light_blue_900</item>
+        <!-- Study Screen button drawables -->
+        <item name="showAnswerButtonBackground">@color/theme_plain_primary</item>
+        <item name="showAnswerColor">@color/theme_plain_primary</item>
+        <item name="againButtonRef">@drawable/footer_button_all_plain</item>
+        <item name="hardButtonRef">@drawable/footer_button_all_plain</item>
+        <item name="goodButtonRef">@drawable/footer_button_all_plain</item>
+        <item name="easyButtonRef">@drawable/footer_button_all_plain</item>
+        <item name="againButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
+        <item name="hardButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
+        <item name="goodButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
+        <item name="easyButtonRippleRef">@drawable/footer_button_all_plain_ripple</item>
+        <!-- Card Browser Colors -->
+        <item name="cardBrowserDivider">#CCCCCC</item>
+        <!-- Note editor colors -->
+        <item name="editTextBackgroundColor">#EBCCCCCC</item>
+        <item name="editTextHighlightColor">@color/material_grey_300</item>
+        <item name="toolbarBackgroundColor">#D6D7D7</item>
+        <item name="toolbarIconColor">@color/black</item>
+        <item name="buttonShadowColor">#FFAAAAAA</item>
+        <item name="buttonRippleColor">#595959</item>
+        <item name="buttonForegroundColor">#D6D7D7</item>
+        <!-- FAB -->
+        <item name="fab_normal">@color/theme_plain_accent</item>
+        <item name="fab_pressed">@color/theme_plain_accent</item> <!-- No change in opacity on FAB pressed to avoid Android's material shadow artifact on translucent backgrounds -->
+        <!--Custom Tabs colors-->
+        <item name="customTabNavBarColor">@color/material_grey_500</item>
+        <item name="overflowAndPopupMenuIconColor">?attr/colorPrimary</item>
+        <!-- StatusBar -->
+        <item name="android:statusBarColor">@color/theme_plain_primary</item>
+        <!-- Navbar -->
+        <item name="android:navigationBarColor">@color/semi_transparent_black</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+
+        <item name="currentDeckBackground">@drawable/item_background_selected</item>
+
+        <item name="snackbarButtonTextColor">#96bdce</item>
+
+        <!-- Introduction -->
+        <item name="introductionLogoTransparent">#99FFFFFF</item>
+
+        <!-- Browser Options Dialog-->
+        <item name="colorSurface">@color/white</item>
+
+        <!-- ProgressDialog-->
+        <item name="dialogBackground">@color/white</item>
+        <item name="progressDialogButtonTextColor">@color/theme_plain_primary</item>
+
+        <item name="incrementerButtonBackground">@color/theme_plain_primary</item>
+    </style>
+
+    <style name="Theme_Light.Plain" parent="Base.Theme.Light.Plain"/>
 </resources>
diff --git a/AnkiDroid/src/test/java/com/ichi2/compose/theme/DimensionsTest.kt b/common/android/src/test/java/com/ichi2/compose/theme/DimensionsTest.kt
similarity index 100%
rename from AnkiDroid/src/test/java/com/ichi2/compose/theme/DimensionsTest.kt
rename to common/android/src/test/java/com/ichi2/compose/theme/DimensionsTest.kt
diff --git a/AnkiDroid/src/test/java/com/ichi2/compose/theme/ThemeTest.kt b/common/android/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
similarity index 79%
rename from AnkiDroid/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
rename to common/android/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
index 399620874b5e..2e39e4338fc0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
+++ b/common/android/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
@@ -10,13 +10,15 @@ import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.content.ContextCompat
 import androidx.test.core.app.ApplicationProvider
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R
+import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.anki.settings.enums.NightTheme
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
-import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Verifies that the four AnkiDroid XML themes (light, plain, dark, black) are
@@ -33,17 +35,34 @@ class ThemeTest {
 
     private fun themed(themeRes: Int) = ContextThemeWrapper(appContext, themeRes)
 
+    @Test
+    @Config(sdk = [24, Config.TARGET_SDK])
+    fun `surface containers are opaque in every app theme`() {
+        for (theme in DayTheme.entries + NightTheme.entries) {
+            val scheme = themed(theme.styleResId).toMaterial3ColorScheme()
+            for (color in listOf(
+                scheme.surfaceContainer,
+                scheme.surfaceContainerHigh,
+                scheme.surfaceContainerHighest,
+                scheme.surfaceContainerLow,
+                scheme.surfaceContainerLowest,
+            )) {
+                assertEquals(1f, color.alpha, "${theme.name}: popup surfaces must hide underlying content")
+            }
+        }
+    }
+
     @Test
     fun `light theme bridges colorPrimary to scheme primary`() {
         val scheme = themed(R.style.Theme_Light).toMaterial3ColorScheme()
-        val expected = ContextCompat.getColor(appContext, CommonR.color.material_light_blue_500)
+        val expected = ContextCompat.getColor(appContext, R.color.material_light_blue_500)
         assertEquals(expected, scheme.primary.toArgb())
     }
 
     @Test
     fun `dark theme bridges colorPrimary to scheme primary`() {
         val scheme = themed(R.style.Theme_Dark).toMaterial3ColorScheme()
-        val expected = ContextCompat.getColor(appContext, CommonR.color.material_blue_400)
+        val expected = ContextCompat.getColor(appContext, R.color.material_blue_400)
         assertEquals(expected, scheme.primary.toArgb())
     }
 
@@ -89,7 +108,7 @@ class ThemeTest {
     fun `light theme bridges fab_normal to the fab container color`() {
         val context = themed(R.style.Theme_Light)
         val colors = context.toAnkiDroidColors(context.toMaterial3ColorScheme())
-        val expected = ContextCompat.getColor(appContext, CommonR.color.material_light_blue_700)
+        val expected = ContextCompat.getColor(appContext, R.color.material_light_blue_700)
         assertEquals(expected, colors.fabContainer.toArgb())
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 240693d6aeba..f6210d26de15 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -74,7 +74,7 @@ androidxWebkit = "1.16.0"
 # https://developer.android.com/jetpack/androidx/releases/work
 androidxWork = "2.12.0"
 # https://github.com/ankidroid/Anki-Android-Backend/
-ankiBackend = '0.1.73-anki26.09.3'
+ankiBackend = '0.1.74-anki26.09.3'
 autoService = "1.1.1"
 autoServiceAnnotations = "1.1.1"
 # https://github.com/skydoves/ColorPickerView/releases
diff --git a/note-editor/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialog.kt b/note-editor/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialog.kt
index 43736cedc0e1..46529b6f8e52 100644
--- a/note-editor/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialog.kt
+++ b/note-editor/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialog.kt
@@ -50,11 +50,17 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.clearAndSetSemantics
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
+import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.anki.settings.enums.Theme
 import com.ichi2.compose.ui.dialogs.AnkiDroidDialog
+import com.ichi2.compose.ui.preview.AnkiDroidPreview
+import com.ichi2.compose.ui.preview.AnkiDroidThemeProvider
 import com.ichi2.anki.common.android.R as CommonR
 
 /** Lets the user choose a scrolling, stacked or hidden [ToolbarLayoutMode] for the note editor. */
@@ -271,3 +277,63 @@ private fun PreviewIcon(
         tint = MaterialTheme.colorScheme.onSurface,
     )
 }
+
+@Preview(name = "Scroll")
+@Composable
+private fun ToolbarLayoutDialogPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.SCROLL,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}
+
+@Preview(name = "Stack")
+@Composable
+private fun ToolbarLayoutDialogStackPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.STACK,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}
+
+@Preview(name = "Hidden")
+@Composable
+private fun ToolbarLayoutDialogHiddenPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.HIDDEN,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}
+
+@Preview(name = "Large text - short window", widthDp = 320, heightDp = 240, fontScale = 2f)
+@Composable
+private fun ToolbarLayoutDialogLargeTextPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.HIDDEN,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}