app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt

@@ -184,10 +184,14 @@ private fun ColumnScope.SortPage(
         MR.strings.action_sort_random to LibrarySort.Type.Random,
     ).plus(trackerSortOption).map { (titleRes, mode) ->
         if (mode == LibrarySort.Type.Random) {
+            val enabledIcon = if (sortingMode == LibrarySort.Type.Random) {
+                Icons.Default.Refresh
+            } else {
+                null
+            }
             BaseSortItem(
                 label = stringResource(titleRes),
-                icon = Icons.Default.Refresh
-                    .takeIf { sortingMode == LibrarySort.Type.Random },
+                icon = enabledIcon,
                 onClick = {
                     screenModel.setSort(category, mode, LibrarySort.Direction.Ascending)
                 },

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt

@@ -302,15 +302,16 @@ class LibraryScreenModel(
                     item1Score.compareTo(item2Score)
                 }
                 LibrarySort.Type.Random -> {
-                    error("Why Are We Still Here? Just To Suffer?")
+                    error("A comparator should not be requested for the random sort style. Instead, intercept this " +
+                        "case and call .shuffle()")
                 }
             }
         }
 
         return mapValues { (key, value) ->
-            if (key.sort.type == LibrarySort.Type.Random) {
-                return@mapValues value.shuffled(Random(libraryPreferences.randomSortSeed().get()))
-            }
+           if (key.sort.type == LibrarySort.Type.Random) {
+               return@mapValues value.shuffled(Random(libraryPreferences.currentRandomSortSeed().get()))
+           }
 
             val comparator = key.sort.comparator()
                 .let { if (key.sort.isAscending) it else it.reversed() }

domain/src/main/java/tachiyomi/domain/category/interactor/SetSortModeForCategory.kt

@@ -17,7 +17,7 @@ class SetSortModeForCategory(
         val category = categoryId?.let { categoryRepository.get(it) }
         val flags = (category?.flags ?: 0) + type + direction
         if (type == LibrarySort.Type.Random) {
-            preferences.randomSortSeed().set(Random.nextInt())
+            preferences.currentRandomSortSeed().set(Random.nextInt())
         }
         if (category != null && preferences.categorizedDisplaySettings().get()) {
             categoryRepository.updatePartial(

domain/src/main/java/tachiyomi/domain/library/model/LibrarySortMode.kt

@@ -31,7 +31,7 @@ data class LibrarySort(
         data object ChapterFetchDate : Type(0b00011000)
         data object DateAdded : Type(0b00011100)
         data object TrackerMean : Type(0b00100000)
-        data object Random : Type(0b00111100)
+        data object Random : Type(0b00100100)
 
         companion object {
             fun valueOf(flag: Long): Type {

domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt

@@ -26,7 +26,7 @@ class LibraryPreferences(
         LibrarySort.Serializer::deserialize,
     )
 
-    fun randomSortSeed() = preferenceStore.getInt("library_random_sort_seed", 0)
+    fun currentRandomSortSeed() = preferenceStore.getInt("library_random_sort_seed", 0)
 
     fun portraitColumns() = preferenceStore.getInt("pref_library_columns_portrait_key", 0)
 

presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt

@@ -17,6 +17,7 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDownward
 import androidx.compose.material.icons.filled.ArrowUpward
+import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material.icons.rounded.CheckBox
 import androidx.compose.material.icons.rounded.CheckBoxOutlineBlank
 import androidx.compose.material.icons.rounded.DisabledByDefault