diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
index c2ad4f637..9fc19d52d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
@@ -101,7 +101,8 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
                     errors.add(Date() to "${manga.title} - ${e.message}")
                 }
             } else {
-                errors.add(Date() to "${manga.title} - ${context.getString(R.string.tracker_not_logged_in, service?.name)}")
+                val serviceName = service?.nameRes()?.let { context.getString(it) }
+                errors.add(Date() to "${manga.title} - ${context.getString(R.string.tracker_not_logged_in, serviceName)}")
             }
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt
index e482196ba..4cb30234c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt
@@ -41,7 +41,7 @@ class FullBackupRestoreValidator : AbstractBackupRestoreValidator() {
         val missingTrackers = trackers
             .mapNotNull { trackManager.getService(it) }
             .filter { !it.isLogged }
-            .map { it.name }
+            .map { context.getString(it.nameRes()) }
             .sorted()
 
         return Results(missingSources, missingTrackers)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt
index f1b7cbf12..ab757059c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt
@@ -45,7 +45,7 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() {
         val missingTrackers = trackers
             .mapNotNull { trackManager.getService(it) }
             .filter { !it.isLogged }
-            .map { it.name }
+            .map { context.getString(it.nameRes()) }
             .sorted()
 
         return Results(missingSources, missingTrackers)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index 937690eaa..57378b9bb 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -123,7 +123,7 @@ object PreferenceKeys {
 
     const val filterCompleted = "pref_filter_library_completed"
 
-    const val filterTracking = "pref_filter_library_tracking"
+    const val filterTracked = "pref_filter_library_tracked"
 
     const val filterStarted = "pref_filter_library_started"
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 25e6bef1f..7ec4bbaba 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -221,7 +221,7 @@ class PreferencesHelper(val context: Context) {
 
     fun filterCompleted() = flowPrefs.getInt(Keys.filterCompleted, ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
 
-    fun filterTracking(name: String) = flowPrefs.getInt("${Keys.filterTracking}_$name", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
+    fun filterTracking(name: Int) = flowPrefs.getInt("${Keys.filterTracked}_$name", ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
 
     fun filterStarted() = flowPrefs.getInt(Keys.filterStarted, ExtendedNavigationView.Item.TriStateGroup.State.IGNORE.value)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
index 884fdf4c0..972685909 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.data.track
 import androidx.annotation.CallSuper
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.model.TrackSearch
@@ -19,7 +20,8 @@ abstract class TrackService(val id: Int) {
         get() = networkService.client
 
     // Name of the manga sync service to display
-    abstract val name: String
+    @StringRes
+    abstract fun nameRes(): Int
 
     // Application and remote support for reading dates
     open val supportsReadingDates: Boolean = false
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
index 6cdc17889..aecf53888 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.track.anilist
 
 import android.content.Context
 import android.graphics.Color
+import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -31,8 +32,6 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
         const val POINT_3 = "POINT_3"
     }
 
-    override val name = "AniList"
-
     private val json: Json by injectLazy()
 
     private val interceptor by lazy { AnilistInterceptor(this, getPassword()) }
@@ -51,6 +50,9 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
         }
     }
 
+    @StringRes
+    override fun nameRes() = R.string.tracker_anilist
+
     override fun getLogo() = R.drawable.ic_tracker_anilist
 
     override fun getLogoColor() = Color.rgb(18, 25, 35)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
index ff54e6eab..a65af7702 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.track.bangumi
 
 import android.content.Context
 import android.graphics.Color
+import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -13,14 +14,15 @@ import uy.kohesive.injekt.injectLazy
 
 class Bangumi(private val context: Context, id: Int) : TrackService(id) {
 
-    override val name = "Bangumi"
-
     private val json: Json by injectLazy()
 
     private val interceptor by lazy { BangumiInterceptor(this) }
 
     private val api by lazy { BangumiApi(client, interceptor) }
 
+    @StringRes
+    override fun nameRes() = R.string.tracker_bangumi
+
     override fun getScoreList(): List<String> {
         return IntRange(0, 10).map(Int::toString)
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
index 7cd4473df..66edfce25 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.track.kitsu
 
 import android.content.Context
 import android.graphics.Color
+import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -25,7 +26,8 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
         const val DEFAULT_SCORE = 0f
     }
 
-    override val name = "Kitsu"
+    @StringRes
+    override fun nameRes() = R.string.tracker_kitsu
 
     private val json: Json by injectLazy()
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt
index 83db110f5..9c8f8d7f6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.track.mdlist
 
 import android.content.Context
 import android.graphics.Color
+import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
@@ -24,7 +25,8 @@ class MdList(private val context: Context, id: Int) : TrackService(id) {
     private val mdex by lazy { MdUtil.getEnabledMangaDex() }
     private val db: DatabaseHelper by injectLazy()
 
-    override val name = context.getString(R.string.mdlist)
+    @StringRes
+    override fun nameRes(): Int = R.string.mdlist
 
     override fun getLogo(): Int {
         return R.drawable.ic_tracker_mangadex_logo
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
index bae8eda31..cfbc25247 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.track.myanimelist
 
 import android.content.Context
 import android.graphics.Color
+import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -30,8 +31,8 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
     private val interceptor by lazy { MyAnimeListInterceptor(this, getPassword()) }
     private val api by lazy { MyAnimeListApi(client, interceptor) }
 
-    override val name: String
-        get() = "MyAnimeList"
+    @StringRes
+    override fun nameRes() = R.string.tracker_myanimelist
 
     override val supportsReadingDates: Boolean = true
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
index eebe0eb46..aec1b462b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.track.shikimori
 
 import android.content.Context
 import android.graphics.Color
+import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -25,14 +26,15 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
         const val DEFAULT_SCORE = 0
     }
 
-    override val name = "Shikimori"
-
     private val json: Json by injectLazy()
 
     private val interceptor by lazy { ShikimoriInterceptor(this) }
 
     private val api by lazy { ShikimoriApi(client, interceptor) }
 
+    @StringRes
+    override fun nameRes() = R.string.tracker_shikimori
+
     override fun getScoreList(): List<String> {
         return IntRange(0, 10).map(Int::toString)
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
index 6ea5679ef..1e3215c49 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@@ -50,7 +50,7 @@ class LibraryCategoryAdapter(view: LibraryCategoryView, val controller: LibraryC
     private val hasLoggedServices by lazy {
         trackManager.hasLoggedServices()
     }
-    private val services = trackManager.services.map { it.name }
+    private val services = trackManager.services.map { service -> service.id to controller.activity!!.getString(service.nameRes()) }.toMap()
 
     // Keep compatibility as searchText field was replaced when we upgraded FlexibleAdapter
     var searchText
@@ -98,7 +98,7 @@ class LibraryCategoryAdapter(view: LibraryCategoryView, val controller: LibraryC
         preferences.filterCompleted().get() == Filter.TriState.STATE_IGNORE &&
         preferences.filterStarted().get() == Filter.TriState.STATE_IGNORE &&
         preferences.filterUnread().get() == Filter.TriState.STATE_IGNORE &&
-        services.all { preferences.filterTracking(it).get() == Filter.TriState.STATE_IGNORE } &&
+        services.all { preferences.filterTracking(it.key).get() == Filter.TriState.STATE_IGNORE } &&
         preferences.filterLewd().get() == Filter.TriState.STATE_IGNORE
 
     // EXH -->
@@ -237,8 +237,8 @@ class LibraryCategoryAdapter(view: LibraryCategoryView, val controller: LibraryC
             val trackService = trackManager.getService(it.sync_id)
             if (trackService != null) {
                 val status = trackService.getStatus(it.status)
-                val name = trackService.name
-                return@any status.contains(constraint, true) || name.contains(constraint, true)
+                val name = services[it.sync_id]
+                return@any status.contains(constraint, true) || name?.contains(constraint, true) == true
             }
             return@any false
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
index d92bf4be7..298673e38 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
@@ -12,36 +12,20 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IFilterable
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.LibraryManga
-import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.preference.PreferenceValues.DisplayMode
-import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.databinding.SourceComfortableGridItemBinding
 import eu.kanade.tachiyomi.databinding.SourceCompactGridItemBinding
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.online.NamespaceSource
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
-import exh.metadata.metadata.base.RaisedTag
-import exh.source.getMainSource
-import exh.util.SourceTagsUtil
-import exh.util.getRaisedTags
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
 class LibraryItem(val manga: LibraryManga, private val libraryDisplayMode: Preference<DisplayMode>) :
-    AbstractFlexibleItem<LibraryHolder<*>>(), IFilterable<Pair<String, Boolean>> {
+    AbstractFlexibleItem<LibraryHolder<*>>(), IFilterable<String> {
 
     private val sourceManager: SourceManager = Injekt.get()
 
-    // SY -->
-    private val trackManager: TrackManager = Injekt.get()
-    private val db: DatabaseHelper = Injekt.get()
-    private val source by lazy {
-        sourceManager.get(manga.source)
-    }
-    // SY <--
-
     var downloadCount = -1
     var unreadCount = -1
 
@@ -114,77 +98,18 @@ class LibraryItem(val manga: LibraryManga, private val libraryDisplayMode: Prefe
      * @param constraint the query to apply.
      * @return true if the manga should be included, false otherwise.
      */
-    override fun filter(constraint: Pair<String, Boolean>): Boolean {
-        return manga.title.contains(constraint.first, true) ||
-            (manga.author?.contains(constraint.first, true) ?: false) ||
-            (manga.artist?.contains(constraint.first, true) ?: false) ||
-            (source?.name?.contains(constraint.first, true) ?: false) ||
-            (Injekt.get<TrackManager>().hasLoggedServices() && filterTracks(constraint.first, db.getTracks(manga).executeAsBlocking())) ||
-            constraint.second && ehContainsGenre(constraint.first)
-    }
-
-    private fun filterTracks(constraint: String, tracks: List<Track>): Boolean {
-        return tracks.any {
-            val trackService = trackManager.getService(it.sync_id)
-            if (trackService != null) {
-                val status = trackService.getStatus(it.status)
-                val name = trackService.name
-                return@any status.contains(constraint, true) || name.contains(constraint, true)
+    override fun filter(constraint: String): Boolean {
+        return manga.title.contains(constraint, true) ||
+            (manga.author?.contains(constraint, true) ?: false) ||
+            (manga.artist?.contains(constraint, true) ?: false) ||
+            sourceManager.getOrStub(manga.source).name.contains(constraint, true) ||
+            if (constraint.contains(",")) {
+                constraint.split(",").all { containsGenre(it.trim(), manga.getGenres()) }
+            } else {
+                containsGenre(constraint, manga.getGenres())
             }
-            return@any false
-        }
     }
 
-    private fun ehContainsGenre(constraint: String): Boolean {
-        val genres = manga.getGenres()
-        val raisedTags = if (source?.getMainSource() is NamespaceSource) {
-            manga.getRaisedTags(genres)
-        } else null
-        return if (constraint.contains(" ") || constraint.contains("\"")) {
-            var cleanConstraint = ""
-            var ignoreSpace = false
-            for (i in constraint.trim().toLowerCase()) {
-                when (i) {
-                    ' ' -> {
-                        cleanConstraint = if (!ignoreSpace) {
-                            "$cleanConstraint,"
-                        } else {
-                            "$cleanConstraint "
-                        }
-                    }
-                    '"' -> {
-                        ignoreSpace = !ignoreSpace
-                    }
-                    else -> {
-                        cleanConstraint += i.toString()
-                    }
-                }
-            }
-            cleanConstraint.split(",").all {
-                if (raisedTags == null) containsGenre(it.trim(), genres) else containsRaisedGenre(
-                    SourceTagsUtil.parseTag(it.trim()),
-                    raisedTags
-                )
-            }
-        } else if (raisedTags == null) {
-            containsGenre(constraint, genres)
-        } else {
-            containsRaisedGenre(SourceTagsUtil.parseTag(constraint), raisedTags)
-        }
-    }
-
-    private fun containsRaisedGenre(tag: RaisedTag, genres: List<RaisedTag>): Boolean {
-        val genre = genres.find {
-            (it.namespace?.toLowerCase() == tag.namespace?.toLowerCase() && it.name.toLowerCase() == tag.name.toLowerCase())
-        }
-        return if (tag.type == SourceTagsUtil.TAG_TYPE_EXCLUDE) {
-            genre == null
-        } else {
-            genre != null
-        }
-    }
-    // SY <--
-
     private fun containsGenre(tag: String, genres: List<String>?): Boolean {
         return if (tag.startsWith("-")) {
             genres?.find {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index 9c469f119..547f93bca 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -165,7 +165,7 @@ class LibraryPresenter(
         val filterCompleted = preferences.filterCompleted().get()
         val loggedInServices = trackManager.services.filter { trackService -> trackService.isLogged }
             .associate { trackService ->
-                Pair(trackService.id, preferences.filterTracking(trackService.name).get())
+                Pair(trackService.id, preferences.filterTracking(trackService.id).get())
             }
         val isNotAnyLoggedIn = !loggedInServices.values.any()
         // SY -->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
index 52562d628..3c5bfcf09 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
@@ -10,12 +10,6 @@ import eu.kanade.tachiyomi.data.preference.PreferenceValues.DisplayMode
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
-import eu.kanade.tachiyomi.data.track.anilist.Anilist
-import eu.kanade.tachiyomi.data.track.bangumi.Bangumi
-import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
-import eu.kanade.tachiyomi.data.track.mdlist.MdList
-import eu.kanade.tachiyomi.data.track.myanimelist.MyAnimeList
-import eu.kanade.tachiyomi.data.track.shikimori.Shikimori
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView.Item.TriStateGroup.State
 import eu.kanade.tachiyomi.widget.TabbedBottomSheetDialog
@@ -90,7 +84,7 @@ class LibrarySettingsSheet(
             private val downloaded = Item.TriStateGroup(R.string.action_filter_downloaded, this)
             private val unread = Item.TriStateGroup(R.string.action_filter_unread, this)
             private val completed = Item.TriStateGroup(R.string.completed, this)
-            private val trackFilters: Map<String, Item.TriStateGroup>
+            private val trackFilters: Map<Int, Item.TriStateGroup>
 
             // SY -->
             private val started = Item.TriStateGroup(R.string.started, this)
@@ -106,7 +100,7 @@ class LibrarySettingsSheet(
                     .also { services ->
                         val size = services.size
                         trackFilters = services.associate { service ->
-                            Pair(service.name, Item.TriStateGroup(getServiceResId(service, size), this))
+                            Pair(service.id, Item.TriStateGroup(getServiceResId(service, size), this))
                         }
                         val list: MutableList<Item> = mutableListOf(downloaded, unread, completed, started, lewd)
                         if (size > 1) list.add(Item.Header(R.string.action_filter_tracked))
@@ -116,19 +110,7 @@ class LibrarySettingsSheet(
             }
 
             private fun getServiceResId(service: TrackService, size: Int): Int {
-                return if (size > 1) getServiceResId(service) else R.string.action_filter_tracked
-            }
-
-            private fun getServiceResId(service: TrackService): Int {
-                return when (service) {
-                    is Anilist -> R.string.anilist
-                    is MyAnimeList -> R.string.my_anime_list
-                    is Kitsu -> R.string.kitsu
-                    is Bangumi -> R.string.bangumi
-                    is Shikimori -> R.string.shikimori
-                    is MdList -> R.string.mdlist
-                    else -> R.string.unknown
-                }
+                return if (size > 1) service.nameRes() else R.string.action_filter_tracked
             }
 
             override fun initModels() {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt
index 5600c9bf6..950d2dc60 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt
@@ -71,7 +71,7 @@ class SettingsTrackingController :
         return initThenAdd(
             LoginPreference(context).apply {
                 key = Keys.trackUsername(service.id)
-                title = service.name
+                titleRes = service.nameRes()
             },
             {
                 onClick {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
index d59b3510d..62e287f94 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
@@ -15,18 +15,19 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
 class TrackLoginDialog(
-    @StringRes titleRes: Int? = null,
-    titleFormatArgs: Any? = null,
     @StringRes usernameLabelRes: Int? = null,
     bundle: Bundle? = null
-) : LoginDialogPreference(titleRes, titleFormatArgs, usernameLabelRes, bundle) {
+) : LoginDialogPreference(usernameLabelRes, bundle) {
 
-    private val service = Injekt.get<TrackManager>().getService(args.getInt("key"))!!
+    private val service = Injekt.get<TrackManager>().getService(args.getInt("serviceId"))!!
 
     constructor(service: TrackService) : this(service, null)
 
     constructor(service: TrackService, @StringRes usernameLabelRes: Int?) :
-        this(R.string.login_title, service.name, usernameLabelRes, bundleOf("key" to service.id))
+        this(usernameLabelRes, bundleOf("serviceId" to service.id))
+
+    @StringRes
+    override fun getTitleName(): Int = service.nameRes()
 
     override fun setCredentialsOnView(view: View) {
         binding?.username?.setText(service.getUsername())
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLogoutDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLogoutDialog.kt
index 187069bd9..308dbd08d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLogoutDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLogoutDialog.kt
@@ -14,13 +14,14 @@ import uy.kohesive.injekt.api.get
 
 class TrackLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) {
 
-    private val service = Injekt.get<TrackManager>().getService(args.getInt("key"))!!
+    private val service = Injekt.get<TrackManager>().getService(args.getInt("serviceId"))!!
 
-    constructor(service: TrackService) : this(bundleOf("key" to service.id))
+    constructor(service: TrackService) : this(bundleOf("serviceId" to service.id))
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
+        val serviceName = activity!!.getString(service.nameRes())
         return MaterialDialog(activity!!)
-            .title(text = activity!!.getString(R.string.logout_title, service.name))
+            .title(text = activity!!.getString(R.string.logout_title, serviceName))
             .positiveButton(R.string.logout) {
                 service.logout()
                 (targetController as? Listener)?.trackLogoutDialogClosed(service)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
index af9fbf5da..0943f97db 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
@@ -10,14 +10,13 @@ import com.afollestad.materialdialogs.customview.customView
 import com.bluelinelabs.conductor.ControllerChangeHandler
 import com.bluelinelabs.conductor.ControllerChangeType
 import com.dd.processbutton.iml.ActionProcessButton
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.PrefAccountLoginBinding
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import uy.kohesive.injekt.injectLazy
 
 abstract class LoginDialogPreference(
-    @StringRes private val titleRes: Int? = null,
-    private val titleFormatArgs: Any? = null,
     @StringRes private val usernameLabelRes: Int? = null,
     bundle: Bundle? = null
 ) : DialogController(bundle) {
@@ -29,14 +28,12 @@ abstract class LoginDialogPreference(
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
         binding = PrefAccountLoginBinding.inflate(LayoutInflater.from(activity!!))
-        var dialog = MaterialDialog(activity!!)
+        val titleName = activity!!.getString(getTitleName())
+        val dialog = MaterialDialog(activity!!)
+            .title(text = activity!!.getString(R.string.login_title, titleName))
             .customView(view = binding!!.root)
             .negativeButton(android.R.string.cancel)
 
-        if (titleRes != null) {
-            dialog = dialog.title(text = activity!!.getString(titleRes, titleFormatArgs))
-        }
-
         onViewCreated(dialog.view)
 
         return dialog
@@ -64,6 +61,9 @@ abstract class LoginDialogPreference(
         binding = null
     }
 
+    @StringRes
+    protected abstract fun getTitleName(): Int
+
     protected abstract fun checkLogin()
 
     protected abstract fun setCredentialsOnView(view: View)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c1f18b3b7..1961f6271 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -564,6 +564,11 @@
     <string name="no_chapters_error">No chapters found</string>
 
     <!-- Tracking Screen -->
+    <string name="tracker_anilist" translatable="false">AniList</string>
+    <string name="tracker_myanimelist" translatable="false">MyAnimeList</string>
+    <string name="tracker_kitsu" translatable="false">Kitsu</string>
+    <string name="tracker_bangumi" translatable="false">Bangumi</string>
+    <string name="tracker_shikimori" translatable="false">Shikimori</string>
     <string name="manga_tracking_tab">Tracking</string>
     <plurals name="num_trackers">
         <item quantity="one">1 tracker</item>
@@ -749,11 +754,4 @@
     <string name="spen_previous_page">Previous page</string>
     <string name="spen_next_page">Next page</string>
 
-    <!-- Tracker names -->
-    <string name="anilist" translatable="false">AniList</string>
-    <string name="my_anime_list" translatable="false">MyAnimeList</string>
-    <string name="kitsu" translatable="false">Kitsu</string>
-    <string name="bangumi" translatable="false">Bangumi</string>
-    <string name="shikimori" translatable="false">Shikimori</string>
-
 </resources>