diff --git a/app/src/main/java/app/gamenative/PrefManager.kt b/app/src/main/java/app/gamenative/PrefManager.kt
index 5ba1a36910..f3634f6222 100644
--- a/app/src/main/java/app/gamenative/PrefManager.kt
+++ b/app/src/main/java/app/gamenative/PrefManager.kt
@@ -1302,6 +1302,23 @@ object PrefManager {
             setPref(CUSTOM_GAME_MANUAL_FOLDERS, Json.encodeToString(value))
         }
 
+    // Games the user has marked as favorite, stored as a set of LibraryItem.appId values so they
+    // work across every source (Steam, GOG, Epic, Amazon, custom games) without needing an account.
+    private val FAVORITE_APP_IDS = stringPreferencesKey("favorite_app_ids")
+    var favoriteAppIds: Set<String>
+        get() {
+            val value = getPref(FAVORITE_APP_IDS, "[]")
+            return try {
+                Json.decodeFromString<Set<String>>(value)
+            } catch (e: Exception) {
+                Timber.w(e, "Failed to decode favorite app ids; falling back to empty set")
+                emptySet()
+            }
+        }
+        set(value) {
+            setPref(FAVORITE_APP_IDS, Json.encodeToString(value))
+        }
+
     // Add new setting for Wine debug logging
     private val ENABLE_WINE_DEBUG = booleanPreferencesKey("enable_wine_debug")
     var enableWineDebug: Boolean
diff --git a/app/src/main/java/app/gamenative/data/FavoritesManager.kt b/app/src/main/java/app/gamenative/data/FavoritesManager.kt
new file mode 100644
index 0000000000..31f726da80
--- /dev/null
+++ b/app/src/main/java/app/gamenative/data/FavoritesManager.kt
@@ -0,0 +1,90 @@
+package app.gamenative.data
+
+import app.gamenative.PrefManager
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+/**
+ * Keeps track of which games the user has marked as favorite.
+ *
+ * Favorites are stored as a set of [LibraryItem.appId] values, so they work across every source
+ * (Steam, GOG, Epic, Amazon and custom games) without needing an account. The current set is
+ * exposed as a [StateFlow] so the library list and the game cards update as soon as it changes,
+ * while [PrefManager] keeps the values on disk between sessions.
+ *
+ * The saved set is loaded off the main thread, so building this singleton (which happens the first
+ * time a card or the detail menu is drawn) never blocks the UI on a disk read. Until the load
+ * finishes the set is simply empty. If the user stars a game in that short window, the edit is
+ * recorded and replayed on top of the loaded set, so an early toggle can never drop previously
+ * saved favorites.
+ */
+object FavoritesManager {
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+    private val _favorites = MutableStateFlow<Set<String>>(emptySet())
+
+    /** The set of favorited app ids. Observe this to react to changes. */
+    val favorites: StateFlow<Set<String>> = _favorites.asStateFlow()
+
+    private val _loaded = MutableStateFlow(false)
+
+    /**
+     * Whether the saved set has finished loading from disk. Observe this to tell a genuinely empty
+     * favorites set apart from one that simply hasn't loaded yet, so the UI doesn't flash an
+     * "empty" state before the stored favorites arrive.
+     */
+    val loaded: StateFlow<Boolean> = _loaded.asStateFlow()
+
+    private val lock = Any()
+
+    /** Edits made before the saved set finished loading, kept so they can be replayed on top of it. */
+    private val pendingEdits = LinkedHashMap<String, Boolean>()
+
+    init {
+        scope.launch {
+            val stored = PrefManager.favoriteAppIds
+            synchronized(lock) {
+                var result = stored
+                for ((appId, favorite) in pendingEdits) {
+                    result = FavoritesUtils.apply(result, appId, favorite)
+                }
+                val hadPendingEdits = pendingEdits.isNotEmpty()
+                pendingEdits.clear()
+                // Publish the loaded set before flipping the loaded flag, so an observer that reacts
+                // to `loaded` never sees `true` while `favorites` is still the initial empty set
+                // (which would briefly render the "no favorites yet" empty state).
+                _favorites.value = result
+                _loaded.value = true
+                // Persist inside the lock so a concurrent toggle cannot be overwritten by a stale
+                // snapshot written after the lock is released.
+                if (hadPendingEdits) {
+                    PrefManager.favoriteAppIds = result
+                }
+            }
+        }
+    }
+
+    fun isFavorite(appId: String): Boolean = _favorites.value.contains(appId)
+
+    /** Adds the game if it is not a favorite yet, or removes it if it already is. */
+    fun toggle(appId: String) = setFavorite(appId, !isFavorite(appId))
+
+    fun setFavorite(appId: String, favorite: Boolean) {
+        synchronized(lock) {
+            val updated = FavoritesUtils.apply(_favorites.value, appId, favorite)
+            if (updated == _favorites.value) return
+            _favorites.value = updated
+            if (_loaded.value) {
+                PrefManager.favoriteAppIds = updated
+            } else {
+                // Still loading: record the intent so the load replays it on top of the saved set.
+                pendingEdits[appId] = favorite
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/app/gamenative/data/FavoritesUtils.kt b/app/src/main/java/app/gamenative/data/FavoritesUtils.kt
new file mode 100644
index 0000000000..3d2981d681
--- /dev/null
+++ b/app/src/main/java/app/gamenative/data/FavoritesUtils.kt
@@ -0,0 +1,26 @@
+package app.gamenative.data
+
+/**
+ * Pure helpers for the favorites feature.
+ *
+ * The logic is kept here, separate from [FavoritesManager] and the library view model, so it can
+ * be reasoned about and unit tested on its own without touching storage or Android state.
+ */
+internal object FavoritesUtils {
+
+    /** Returns the favorites set after adding or removing [appId]. */
+    fun apply(current: Set<String>, appId: String, favorite: Boolean): Set<String> =
+        if (favorite) current + appId else current - appId
+
+    /** Keeps only the [items] whose id (via [id]) is in [favorites], preserving order. */
+    fun <T> filter(items: List<T>, favorites: Set<String>, id: (T) -> String): List<T> =
+        items.filter { id(it) in favorites }
+
+    /** Counts how many of the [items] are in [favorites]. */
+    fun <T> count(items: List<T>, favorites: Set<String>, id: (T) -> String): Int =
+        items.count { id(it) in favorites }
+
+    /** Counts how many [favorites] are present in [eligibleIds] (the intersection size). */
+    fun countPresent(favorites: Set<String>, eligibleIds: Set<String>): Int =
+        favorites.count { it in eligibleIds }
+}
diff --git a/app/src/main/java/app/gamenative/ui/PluviaMain.kt b/app/src/main/java/app/gamenative/ui/PluviaMain.kt
index 1db8e407da..4c466d631f 100644
--- a/app/src/main/java/app/gamenative/ui/PluviaMain.kt
+++ b/app/src/main/java/app/gamenative/ui/PluviaMain.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -16,8 +17,10 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -32,6 +35,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -133,7 +137,7 @@ import kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
 
 private const val PENDING_LAUNCH_TIMEOUT_MS = 10_000L
-private const val SNACKBAR_SHOW_TIMEOUT_MS = 15_000L
+private const val SNACKBAR_SHOW_TIMEOUT_MS = 6_000L
 
 /** Used to suspend preLaunchApp while the user decides on large workshop updates. */
 private var workshopUpdateDeferred: CompletableDeferred<Boolean>? = null
@@ -1127,13 +1131,17 @@ fun PluviaMain(
     var exitSnackbarVisible by remember { mutableStateOf(false) }
 
     LaunchedEffect(snackbarController) {
-        SnackbarManager.messages.collect { message ->
-            if (
-                withTimeoutOrNull(SNACKBAR_SHOW_TIMEOUT_MS) {
-                    snackbarController.hostState.showSnackbar(message)
-                } == null
-            ) {
-                Timber.w("[Snackbar]: Display timed out before dismissal")
+        SnackbarManager.events.collect { event ->
+            val result = withTimeoutOrNull(SNACKBAR_SHOW_TIMEOUT_MS) {
+                snackbarController.hostState.showSnackbar(
+                    message = event.message,
+                    actionLabel = event.actionLabel,
+                )
+            }
+            when {
+                result == null -> Timber.w("[Snackbar]: Display timed out before dismissal")
+                result == SnackbarResult.ActionPerformed -> event.onAction?.invoke()
+                else -> {}
             }
             // snackbar dismissed (timeout or new message) — reset exit flag
             exitSnackbarVisible = false
@@ -1561,17 +1569,44 @@ fun PluviaMain(
                         modifier = Modifier.fillMaxWidth(),
                         contentAlignment = Alignment.BottomCenter,
                     ) {
+                        val actionLabel = data.visuals.actionLabel
                         Surface(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(horizontal = 16.dp),
                             shape = RoundedCornerShape(24.dp),
                             color = MaterialTheme.colorScheme.surfaceContainerHigh,
                             shadowElevation = 4.dp,
                         ) {
-                            Text(
-                                text = data.visuals.message,
-                                modifier = Modifier.padding(horizontal = 24.dp, vertical = 12.dp),
-                                color = MaterialTheme.colorScheme.onSurface,
-                                style = MaterialTheme.typography.bodyMedium,
-                            )
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                modifier = Modifier.padding(
+                                    start = 24.dp,
+                                    end = if (actionLabel != null) 8.dp else 24.dp,
+                                ),
+                            ) {
+                                Text(
+                                    text = data.visuals.message,
+                                    modifier = Modifier
+                                        .weight(1f)
+                                        .padding(vertical = 12.dp),
+                                    color = MaterialTheme.colorScheme.onSurface,
+                                    style = MaterialTheme.typography.bodyMedium,
+                                    maxLines = 2,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                                if (actionLabel != null) {
+                                    TextButton(onClick = { data.performAction() }) {
+                                        Text(
+                                            text = actionLabel,
+                                            color = MaterialTheme.colorScheme.primary,
+                                            style = MaterialTheme.typography.labelLarge,
+                                            maxLines = 1,
+                                            softWrap = false,
+                                        )
+                                    }
+                                }
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/java/app/gamenative/ui/data/LibraryState.kt b/app/src/main/java/app/gamenative/ui/data/LibraryState.kt
index ec17d918a5..d22d91d4ef 100644
--- a/app/src/main/java/app/gamenative/ui/data/LibraryState.kt
+++ b/app/src/main/java/app/gamenative/ui/data/LibraryState.kt
@@ -71,6 +71,7 @@ data class LibraryState(
     val epicCount: Int = 0,
     val amazonCount: Int = 0,
     val localCount: Int = 0,
+    val favoritesCount: Int = 0,
 )
 
 /**
diff --git a/app/src/main/java/app/gamenative/ui/enums/AppOptionMenuType.kt b/app/src/main/java/app/gamenative/ui/enums/AppOptionMenuType.kt
index 1f846481e9..41b8344a7f 100644
--- a/app/src/main/java/app/gamenative/ui/enums/AppOptionMenuType.kt
+++ b/app/src/main/java/app/gamenative/ui/enums/AppOptionMenuType.kt
@@ -35,4 +35,6 @@ enum class AppOptionMenuType(@StringRes val title: Int) {
     ManageWorkshop(R.string.option_manage_workshop),
     ManageMods(R.string.option_manage_mods),
     ChangeBranch(R.string.change_branch),
+    AddToFavorites(R.string.option_add_to_favorites),
+    RemoveFromFavorites(R.string.option_remove_from_favorites),
 }
diff --git a/app/src/main/java/app/gamenative/ui/enums/LibraryTab.kt b/app/src/main/java/app/gamenative/ui/enums/LibraryTab.kt
index f617b77abf..0fc1b8ef32 100644
--- a/app/src/main/java/app/gamenative/ui/enums/LibraryTab.kt
+++ b/app/src/main/java/app/gamenative/ui/enums/LibraryTab.kt
@@ -37,6 +37,15 @@ enum class LibraryTab(
         showAmazon = true,
         installedOnly = false,
     ),
+    FAVORITES(
+        labelResId = R.string.tab_favorites,
+        showCustom = true,
+        showSteam = true,
+        showGoG = true,
+        showEpic = true,
+        showAmazon = true,
+        installedOnly = false,
+    ),
     STEAM(
         labelResId = R.string.tab_steam,
         showCustom = false,
diff --git a/app/src/main/java/app/gamenative/ui/model/LibraryViewModel.kt b/app/src/main/java/app/gamenative/ui/model/LibraryViewModel.kt
index 884332a57d..a1a92e038c 100644
--- a/app/src/main/java/app/gamenative/ui/model/LibraryViewModel.kt
+++ b/app/src/main/java/app/gamenative/ui/model/LibraryViewModel.kt
@@ -12,6 +12,8 @@ import app.gamenative.PluviaApp
 import app.gamenative.PrefManager
 import app.gamenative.R
 import app.gamenative.data.GameCompatibilityStatus
+import app.gamenative.data.FavoritesManager
+import app.gamenative.data.FavoritesUtils
 import app.gamenative.data.GameSource
 import app.gamenative.data.LibraryItem
 import app.gamenative.data.gog.GogRecommendationsRepository
@@ -70,6 +72,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
@@ -113,6 +116,11 @@ class LibraryViewModel @Inject constructor(
     @Volatile private var paginationCurrentPage: Int = 0
     @Volatile private var lastPageInCurrentFilter: Int = 0
 
+    // App ids across every source the Favorites tab shows (gated only by credentials), cached from
+    // the last filter pass so a favorite toggle can update the badge count without rebuilding the
+    // whole library list when the user isn't on the Favorites tab.
+    @Volatile private var favoriteEligibleAppIds: Set<String> = emptySet()
+
     // Complete and unfiltered app list
     private var appList: List<SteamApp> = emptyList()
     private var gogGameList: List<GOGGame> = emptyList()
@@ -177,6 +185,23 @@ class LibraryViewModel @Inject constructor(
             }
         }
 
+        // Keep the Favorites tab and its badge in sync as the user stars or unstars games. When the
+        // user is actually viewing the Favorites tab we rebuild the list so its contents change;
+        // otherwise only the badge count can change, so we update that cheaply instead of running a
+        // full (and visibly loading) re-filter of the entire library.
+        viewModelScope.launch(Dispatchers.IO) {
+            FavoritesManager.favorites
+                .drop(1)
+                .collect { favorites ->
+                    if (_state.value.currentTab == LibraryTab.FAVORITES) {
+                        onFilterApps(paginationCurrentPage)
+                    } else {
+                        val count = FavoritesUtils.countPresent(favorites, favoriteEligibleAppIds)
+                        _state.update { it.copy(favoritesCount = count) }
+                    }
+                }
+        }
+
         @OptIn(ExperimentalCoroutinesApi::class)
         viewModelScope.launch(Dispatchers.IO) {
             // Re-create the underlying DAO Flow whenever the EXPIRED filter is toggled,
@@ -946,12 +971,20 @@ class LibraryViewModel @Inject constructor(
             // sources can't match it — keep them out of the combined list (and their tab counts).
             val steamCollectionSelected = allowedSteamAppIds != null
 
+            val favoriteIds = FavoritesManager.favorites.value
+
             val combined = buildList {
                 if (includeSteam) addAll(steamEntries)
                 if (includeOpen && !steamCollectionSelected) addAll(customEntries)
                 if (includeGOG && !steamCollectionSelected) addAll(gogEntries)
                 if (includeEpic && !steamCollectionSelected) addAll(epicEntries)
                 if (includeAmazon && !steamCollectionSelected) addAll(amazonEntries)
+            }.let { entries ->
+                if (currentTab == app.gamenative.ui.enums.LibraryTab.FAVORITES) {
+                    FavoritesUtils.filter(entries, favoriteIds) { it.item.appId }
+                } else {
+                    entries
+                }
             }.sortedWith(sortComparator).mapIndexed { idx, entry ->
                 entry.item.copy(index = idx, isInstalled = entry.isInstalled)
             }
@@ -961,11 +994,15 @@ class LibraryViewModel @Inject constructor(
 
             // Determine how many pages and slice the list for incremental loading
             val pageSize = PrefManager.itemsPerPage
-            // Update internal pagination state
-            paginationCurrentPage = paginationPage
             lastPageInCurrentFilter = if (totalFound == 0) 0 else (totalFound - 1) / pageSize
+            // Clamp the requested page to the valid range. Removing favorites (or any other filter
+            // change) can shrink the list so the previously shown page no longer exists; without
+            // this the pager could report a current page past the last one.
+            val clampedPage = paginationPage.coerceIn(0, lastPageInCurrentFilter)
+            // Update internal pagination state
+            paginationCurrentPage = clampedPage
             // Calculate how many items to show: (pagesLoaded * pageSize)
-            val endIndex = min((paginationPage + 1) * pageSize, totalFound)
+            val endIndex = min((clampedPage + 1) * pageSize, totalFound)
             var pagedList = combined.take(endIndex)
 
             // Prepend the hero (featured > recommendation) as first item on ALL tab when
@@ -1019,10 +1056,23 @@ class LibraryViewModel @Inject constructor(
             // Fetch compatibility for current page games
             fetchCompatibilityForPage(pagedList.map { it.name })
 
+            // App ids across every source the Favorites tab shows (all sources, gated only by
+            // credentials). Cache it so a later favorite toggle can recount the badge cheaply, and
+            // use it here so the badge matches the tab contents even when a source is hidden from
+            // the library through user preferences.
+            val favoriteEligible = buildList {
+                addAll(steamEntries)
+                addAll(customEntries)
+                if (GOGService.hasStoredCredentials(context)) addAll(gogEntries)
+                if (EpicService.hasStoredCredentials(context)) addAll(epicEntries)
+                if (AmazonService.hasStoredCredentials(context)) addAll(amazonEntries)
+            }.mapTo(mutableSetOf()) { it.item.appId }
+            favoriteEligibleAppIds = favoriteEligible
+
             _state.update {
                 it.copy(
                     appInfoList = pagedList,
-                    currentPaginationPage = paginationPage + 1, // visual display is not 0 indexed
+                    currentPaginationPage = clampedPage + 1, // visual display is not 0 indexed
                     lastPaginationPage = lastPageInCurrentFilter + 1,
                     totalAppsInFilter = totalFound,
                     isLoading = false, // Loading complete
@@ -1039,6 +1089,7 @@ class LibraryViewModel @Inject constructor(
                     amazonCount = if (currentState.showAmazonInLibrary && AmazonService.hasStoredCredentials(context)) amazonEntries.size else 0,
                     localCount = if (currentState.showCustomGamesInLibrary) customEntries.size else 0,
                     steamCollectionCounts = steamCollectionCounts,
+                    favoritesCount = FavoritesUtils.countPresent(favoriteIds, favoriteEligible),
                 )
             }
         }
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/LibraryScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/LibraryScreen.kt
index fa908eae7f..68cefc527d 100644
--- a/app/src/main/java/app/gamenative/ui/screen/library/LibraryScreen.kt
+++ b/app/src/main/java/app/gamenative/ui/screen/library/LibraryScreen.kt
@@ -74,6 +74,7 @@ import app.gamenative.PrefManager
 import app.gamenative.PluviaApp
 import app.gamenative.R
 import app.gamenative.data.GameCompatibilityStatus
+import app.gamenative.data.FavoritesManager
 import app.gamenative.data.GameSource
 import app.gamenative.data.LibraryItem
 import app.gamenative.events.AndroidEvent
@@ -94,6 +95,7 @@ import app.gamenative.service.SteamService
 import app.gamenative.ui.screen.library.components.LibraryCarouselPane
 import app.gamenative.ui.screen.library.components.LibraryDetailPane
 import app.gamenative.ui.screen.library.components.LibraryListPane
+import app.gamenative.ui.screen.library.components.LibraryFavoritesEmptyState
 import app.gamenative.ui.screen.library.components.RecommendationDisclosureDialog
 import app.gamenative.ui.screen.library.components.LibraryOptionsPanel
 import app.gamenative.ui.screen.library.components.LibrarySearchBar
@@ -949,6 +951,13 @@ private fun LibraryScreenContent(
                     LibraryTab.LOCAL -> PrefManager.customGamesCount == 0
                     else -> false
                 }
+                // Favorites tab has its own empty state. Only show it once favorites have loaded and
+                // the list has settled, so a genuinely empty tab is explained instead of flashing a
+                // blank screen (or the empty message before stored favorites arrive).
+                val favorites by FavoritesManager.favorites.collectAsStateWithLifecycle()
+                val favoritesLoaded by FavoritesManager.loaded.collectAsStateWithLifecycle()
+                val showFavoritesEmptyState = state.currentTab == LibraryTab.FAVORITES &&
+                    favoritesLoaded && !state.isLoading && state.appInfoList.isEmpty()
                 if (showEmptyStateSplash) {
                     val (messageResId, buttonResId, onAction) = when (state.currentTab) {
                         LibraryTab.STEAM -> Triple(
@@ -984,6 +993,24 @@ private fun LibraryScreenContent(
                         onSignInClick = onAction,
                         modifier = Modifier.fillMaxSize(),
                     )
+                } else if (showFavoritesEmptyState) {
+                    if (favorites.isEmpty()) {
+                        LibraryFavoritesEmptyState(
+                            titleResId = R.string.favorites_empty_title,
+                            messageResId = R.string.favorites_empty_message,
+                            actionLabelResId = R.string.favorites_empty_action,
+                            onAction = { onTabChanged(LibraryTab.ALL) },
+                            modifier = Modifier.fillMaxSize(),
+                        )
+                    } else {
+                        // Favorites exist but none are visible — filtered out by the current search
+                        // or unavailable (source logged out / game removed).
+                        LibraryFavoritesEmptyState(
+                            titleResId = R.string.favorites_empty_filtered_title,
+                            messageResId = R.string.favorites_empty_filtered_message,
+                            modifier = Modifier.fillMaxSize(),
+                        )
+                    }
                 } else {
                     // Library list (content scrolls behind tab bar)
                     if (currentPaneType == PaneType.CAROUSEL) {
@@ -1048,6 +1075,7 @@ private fun LibraryScreenContent(
                         currentTab = state.currentTab,
                         tabCounts = mapOf(
                             LibraryTab.ALL to state.allCount,
+                            LibraryTab.FAVORITES to state.favoritesCount,
                             LibraryTab.STEAM to state.steamCount,
                             LibraryTab.GOG to state.gogCount,
                             LibraryTab.EPIC to state.epicCount,
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/appscreen/BaseAppScreen.kt b/app/src/main/java/app/gamenative/ui/screen/library/appscreen/BaseAppScreen.kt
index 03d6f40f59..4fbeff16db 100644
--- a/app/src/main/java/app/gamenative/ui/screen/library/appscreen/BaseAppScreen.kt
+++ b/app/src/main/java/app/gamenative/ui/screen/library/appscreen/BaseAppScreen.kt
@@ -22,11 +22,13 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.core.content.FileProvider
 import androidx.core.net.toUri
 import app.gamenative.PluviaApp
 import app.gamenative.R
 import app.gamenative.data.GameSource
+import app.gamenative.data.FavoritesManager
 import app.gamenative.data.LibraryItem
 import app.gamenative.events.AndroidEvent
 import app.gamenative.mods.ModContainerResolver
@@ -36,6 +38,7 @@ import app.gamenative.ui.component.dialog.NexusModsDialog
 import app.gamenative.ui.data.AppMenuOption
 import app.gamenative.ui.data.GameDisplayInfo
 import app.gamenative.ui.enums.AppOptionMenuType
+import app.gamenative.ui.screen.library.components.toggleFavoriteWithUndo
 import app.gamenative.ui.util.ContainerConfigTransfer
 import app.gamenative.ui.util.SnackbarManager
 import app.gamenative.utils.DiagnosticsLog
@@ -720,6 +723,23 @@ abstract class BaseAppScreen {
         return emptyList()
     }
 
+    @Composable
+    private fun getFavoriteOption(libraryItem: LibraryItem): AppMenuOption {
+        val context = LocalContext.current
+        val favorites by FavoritesManager.favorites.collectAsStateWithLifecycle()
+        val isFavorite = favorites.contains(libraryItem.appId)
+        return AppMenuOption(
+            optionType = if (isFavorite) {
+                AppOptionMenuType.RemoveFromFavorites
+            } else {
+                AppOptionMenuType.AddToFavorites
+            },
+            onClick = {
+                toggleFavoriteWithUndo(context, libraryItem.appId, libraryItem.name)
+            },
+        )
+    }
+
     @Composable
     private fun getSubmitFeedbackOption(context: Context, libraryItem: LibraryItem): AppMenuOption {
         return AppMenuOption(
@@ -960,6 +980,7 @@ abstract class BaseAppScreen {
         }
 
         // Always available options
+        menuOptions.add(getFavoriteOption(libraryItem))
         menuOptions.add(getSubmitFeedbackOption(context, libraryItem))
         menuOptions.add(getGetSupportOption(context))
 
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/components/FavoriteActions.kt b/app/src/main/java/app/gamenative/ui/screen/library/components/FavoriteActions.kt
new file mode 100644
index 0000000000..3b05139735
--- /dev/null
+++ b/app/src/main/java/app/gamenative/ui/screen/library/components/FavoriteActions.kt
@@ -0,0 +1,31 @@
+package app.gamenative.ui.screen.library.components
+
+import android.content.Context
+import app.gamenative.R
+import app.gamenative.data.FavoritesManager
+import app.gamenative.ui.util.SnackbarManager
+
+/**
+ * Toggles the favorite state for [appId], and when a game is being *removed* shows a snackbar with
+ * an "Undo" action that puts it back. Adding a favorite is silent (the filled star is confirmation
+ * enough); only removals get the safety net, since an accidental un-star is easy to miss.
+ *
+ * [gameName] is used to make the message specific ("Removed <game> from favorites"); when it is
+ * null or blank a generic message is shown instead.
+ */
+internal fun toggleFavoriteWithUndo(context: Context, appId: String, gameName: String?) {
+    val wasFavorite = FavoritesManager.isFavorite(appId)
+    FavoritesManager.toggle(appId)
+    if (wasFavorite) {
+        val message = if (gameName.isNullOrBlank()) {
+            context.getString(R.string.favorite_removed)
+        } else {
+            context.getString(R.string.favorite_removed_named, gameName)
+        }
+        SnackbarManager.show(
+            message = message,
+            actionLabel = context.getString(R.string.undo),
+            onAction = { FavoritesManager.setFavorite(appId, true) },
+        )
+    }
+}
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/components/FavoriteStarButton.kt b/app/src/main/java/app/gamenative/ui/screen/library/components/FavoriteStarButton.kt
new file mode 100644
index 0000000000..e1eb4cf0e0
--- /dev/null
+++ b/app/src/main/java/app/gamenative/ui/screen/library/components/FavoriteStarButton.kt
@@ -0,0 +1,136 @@
+package app.gamenative.ui.screen.library.components
+
+import android.view.HapticFeedbackConstants
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.material.icons.filled.StarOutline
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import app.gamenative.R
+import app.gamenative.data.FavoritesManager
+import app.gamenative.ui.component.focusRing
+
+/**
+ * A star button that shows whether a game is a favorite and toggles it when tapped.
+ *
+ * It observes [FavoritesManager] directly, so it can be dropped onto any card or screen without
+ * threading callbacks through the surrounding composables.
+ *
+ * @param gameName used to build a contextual accessibility label ("Add <game> to favorites") and
+ *   the removal snackbar. When null the button falls back to generic labels.
+ * @param onImage when true, the icon uses a light tint and sits on a subtle circular scrim so it
+ *   stays readable on top of cover art.
+ */
+@Composable
+internal fun FavoriteStarButton(
+    appId: String,
+    modifier: Modifier = Modifier,
+    gameName: String? = null,
+    iconSize: Int = 20,
+    onImage: Boolean = false,
+) {
+    val context = LocalContext.current
+    val view = LocalView.current
+    val favorites by FavoritesManager.favorites.collectAsStateWithLifecycle()
+    val loaded by FavoritesManager.loaded.collectAsStateWithLifecycle()
+    val isFavorite = appId in favorites
+
+    val tint = when {
+        isFavorite -> MaterialTheme.colorScheme.primary
+        onImage -> Color.White.copy(alpha = 0.85f)
+        else -> MaterialTheme.colorScheme.onSurfaceVariant
+    }
+
+    val contentDescription = when {
+        gameName.isNullOrBlank() -> stringResource(
+            if (isFavorite) R.string.favorite_remove else R.string.favorite_add,
+        )
+        isFavorite -> stringResource(R.string.favorite_remove_named, gameName)
+        else -> stringResource(R.string.favorite_add_named, gameName)
+    }
+
+    // Pop the star when it is turned on by the user, but never when the favorite state simply
+    // settles for the first time. Favorites load asynchronously (starting from an empty set), so a
+    // plain "first composition" guard would still let every already-favorited card pop the moment
+    // the load completes. Instead we only animate a genuine false->true transition observed *after*
+    // the set has loaded, tracking the last state we acted on.
+    val scale = remember { Animatable(1f) }
+    var lastFavoriteState by remember { mutableStateOf<Boolean?>(null) }
+    LaunchedEffect(isFavorite, loaded) {
+        if (!loaded) return@LaunchedEffect
+        val previous = lastFavoriteState
+        lastFavoriteState = isFavorite
+        if (previous == false && isFavorite) {
+            scale.snapTo(0.6f)
+            scale.animateTo(
+                targetValue = 1f,
+                animationSpec = spring(
+                    dampingRatio = Spring.DampingRatioMediumBouncy,
+                    stiffness = Spring.StiffnessMediumLow,
+                ),
+            )
+        }
+    }
+
+    // Own the interaction source so a D-pad / controller focus draws a visible ring on the button
+    // (the star is often the only focusable overlay on a cover, so it needs its own affordance).
+    val interactionSource = remember { MutableInteractionSource() }
+
+    IconButton(
+        onClick = {
+            // A light context-click tick suits a quick toggle; LongPress would feel too heavy.
+            view.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK)
+            toggleFavoriteWithUndo(context, appId, gameName)
+        },
+        modifier = modifier.focusRing(interactionSource, CircleShape),
+        interactionSource = interactionSource,
+    ) {
+        val icon = @Composable {
+            Icon(
+                imageVector = if (isFavorite) Icons.Filled.Star else Icons.Filled.StarOutline,
+                contentDescription = contentDescription,
+                tint = tint,
+                modifier = Modifier
+                    .size(iconSize.dp)
+                    .scale(scale.value),
+            )
+        }
+        if (onImage) {
+            // Scrim keeps the star legible over bright or busy cover art without enlarging the
+            // 48dp touch target the surrounding IconButton already provides.
+            Box(
+                modifier = Modifier
+                    .background(Color.Black.copy(alpha = 0.32f), CircleShape)
+                    .padding(4.dp),
+            ) {
+                icon()
+            }
+        } else {
+            icon()
+        }
+    }
+}
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/components/GameOptionsPanel.kt b/app/src/main/java/app/gamenative/ui/screen/library/components/GameOptionsPanel.kt
index 461238a961..91b9a5a0cf 100644
--- a/app/src/main/java/app/gamenative/ui/screen/library/components/GameOptionsPanel.kt
+++ b/app/src/main/java/app/gamenative/ui/screen/library/components/GameOptionsPanel.kt
@@ -54,6 +54,8 @@ import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.material.icons.filled.Storage
 import androidx.compose.material.icons.filled.Sync
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.material.icons.filled.StarOutline
 import androidx.compose.material.icons.filled.Update
 import androidx.compose.material.icons.filled.VerifiedUser
 import androidx.compose.material3.HorizontalDivider
@@ -351,6 +353,8 @@ private fun getIconForOption(type: AppOptionMenuType): ImageVector {
         AppOptionMenuType.ManageWorkshop -> Icons.Default.Build
         AppOptionMenuType.ManageMods -> Icons.Default.Extension
         AppOptionMenuType.ChangeBranch -> Icons.AutoMirrored.Filled.CallSplit
+        AppOptionMenuType.AddToFavorites -> Icons.Filled.StarOutline
+        AppOptionMenuType.RemoveFromFavorites -> Icons.Filled.Star
     }
 }
 
@@ -368,6 +372,8 @@ private fun groupOptions(options: List<AppMenuOption>): Map<OptionCategory, List
             AppOptionMenuType.RunContainer,
             AppOptionMenuType.CreateShortcut,
             AppOptionMenuType.ExportFrontend,
+            AppOptionMenuType.AddToFavorites,
+            AppOptionMenuType.RemoveFromFavorites,
             -> quickActions.add(option)
 
             // Game Management
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryFavoritesEmptyState.kt b/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryFavoritesEmptyState.kt
new file mode 100644
index 0000000000..e53312017b
--- /dev/null
+++ b/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryFavoritesEmptyState.kt
@@ -0,0 +1,82 @@
+package app.gamenative.ui.screen.library.components
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.StarOutline
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import app.gamenative.R
+
+/**
+ * Empty state shown on the Favorites tab. Explains how favorites work and, when the user simply
+ * hasn't added any yet, offers a way back to the full library so the tab never reads as broken or
+ * still loading.
+ *
+ * @param titleResId headline shown in bold.
+ * @param messageResId supporting line explaining what to do (or why nothing is shown).
+ * @param actionLabelResId optional button label; when null no button is shown.
+ * @param onAction invoked when the optional button is pressed.
+ */
+@Composable
+internal fun LibraryFavoritesEmptyState(
+    @StringRes titleResId: Int,
+    @StringRes messageResId: Int,
+    modifier: Modifier = Modifier,
+    @StringRes actionLabelResId: Int? = null,
+    onAction: (() -> Unit)? = null,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colorScheme.surface)
+            .padding(32.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Icon(
+            imageVector = Icons.Filled.StarOutline,
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier.size(64.dp),
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        Text(
+            text = stringResource(titleResId),
+            style = MaterialTheme.typography.titleLarge,
+            color = MaterialTheme.colorScheme.onSurface,
+            textAlign = TextAlign.Center,
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        Text(
+            text = stringResource(messageResId),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center,
+        )
+        if (actionLabelResId != null && onAction != null) {
+            Spacer(modifier = Modifier.height(24.dp))
+            OutlinedButton(
+                onClick = onAction,
+                modifier = Modifier.padding(horizontal = 24.dp),
+            ) {
+                Text(stringResource(actionLabelResId))
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryGridCard.kt b/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryGridCard.kt
index 6ab394aca6..9b61c4da19 100644
--- a/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryGridCard.kt
+++ b/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryGridCard.kt
@@ -367,6 +367,16 @@ internal fun GridViewCard(
                             .padding(top = topIconPadding, end = topIconPadding),
                         iconSize = if (isCapsule) 14 else 12,
                     )
+
+                    FavoriteStarButton(
+                        appId = appInfo.appId,
+                        gameName = appInfo.name,
+                        modifier = Modifier
+                            .align(Alignment.BottomEnd)
+                            .padding(end = 2.dp, bottom = 2.dp),
+                        iconSize = if (isCapsule) 18 else 20,
+                        onImage = true,
+                    )
                 }
             }
         }
diff --git a/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryListCard.kt b/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryListCard.kt
index 585e131bd2..6c8ec5f64a 100644
--- a/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryListCard.kt
+++ b/app/src/main/java/app/gamenative/ui/screen/library/components/LibraryListCard.kt
@@ -198,6 +198,14 @@ internal fun ListViewCard(
                     showLabel = true,
                 )
             }
+
+            if (!appInfo.isRecommended) {
+                FavoriteStarButton(
+                    appId = appInfo.appId,
+                    gameName = appInfo.name,
+                    iconSize = 22,
+                )
+            }
         }
     }
     }
diff --git a/app/src/main/java/app/gamenative/ui/util/SnackbarManager.kt b/app/src/main/java/app/gamenative/ui/util/SnackbarManager.kt
index f021be11d0..b2e091676d 100644
--- a/app/src/main/java/app/gamenative/ui/util/SnackbarManager.kt
+++ b/app/src/main/java/app/gamenative/ui/util/SnackbarManager.kt
@@ -8,11 +8,26 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import timber.log.Timber
 
 object SnackbarManager {
-    private val _messages = Channel<String>(capacity = Channel.BUFFERED)
-    val messages = _messages.receiveAsFlow()
-
-    fun show(message: String) {
-        if (_messages.trySend(message).isFailure) {
+    /**
+     * A snackbar request. [actionLabel] and [onAction] are optional; when both are provided the
+     * snackbar shows an action button (e.g. "Undo") that invokes [onAction] when tapped.
+     */
+    data class Event(
+        val message: String,
+        val actionLabel: String? = null,
+        val onAction: (() -> Unit)? = null,
+    )
+
+    private val _events = Channel<Event>(capacity = Channel.BUFFERED)
+    val events = _events.receiveAsFlow()
+
+    fun show(message: String) = show(Event(message))
+
+    fun show(message: String, actionLabel: String?, onAction: () -> Unit) =
+        show(Event(message, actionLabel, onAction))
+
+    fun show(event: Event) {
+        if (_events.trySend(event).isFailure) {
             Timber.w("[Snackbar]: Dropping message because the buffer is full")
         }
     }
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 48a704eaa0..4161f1f955 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1969,4 +1969,20 @@
     <string name="steam_collections_offline">Viser senest synkroniserede samlinger. Opret forbindelse for at opdatere.</string>
     <string name="steam_collections_clear">Ryd</string>
     <string name="steam_collections_smart_unsupported">Kun standardsamlinger vises. Smarte samlinger understøttes ikke endnu.</string>
+    
+    <string name="tab_favorites">Favoritter</string>
+    <string name="favorites_empty_title">Ingen favoritter endnu</string>
+    <string name="favorites_empty_message">Tryk på stjernen på et spil for at tilføje det her for hurtig adgang.</string>
+    <string name="favorites_empty_action">Gennemse alle spil</string>
+    <string name="favorites_empty_filtered_title">Ingen favoritter at vise</string>
+    <string name="favorites_empty_filtered_message">Ingen favoritspil matcher den aktuelle søgning eller filtre.</string>
+    <string name="option_add_to_favorites">Føj til favoritter</string>
+    <string name="option_remove_from_favorites">Fjern fra favoritter</string>
+    <string name="favorite_add">Føj til favoritter</string>
+    <string name="favorite_remove">Fjern fra favoritter</string>
+    <string name="favorite_add_named">Føj %1$s til favoritter</string>
+    <string name="favorite_remove_named">Fjern %1$s fra favoritter</string>
+    <string name="favorite_removed">Fjernet fra favoritter</string>
+    <string name="favorite_removed_named">Fjernede %1$s fra favoritter</string>
+    <string name="undo">Fortryd</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6315d3fa03..abff7d3167 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2039,4 +2039,20 @@
     <string name="steam_collections_offline">Es werden die zuletzt synchronisierten Sammlungen angezeigt. Zum Aktualisieren verbinden.</string>
     <string name="steam_collections_clear">Löschen</string>
     <string name="steam_collections_smart_unsupported">Es werden nur Standardsammlungen angezeigt. Intelligente Sammlungen werden noch nicht unterstützt.</string>
+    
+    <string name="tab_favorites">Favoriten</string>
+    <string name="favorites_empty_title">Noch keine Favoriten</string>
+    <string name="favorites_empty_message">Tippe bei einem Spiel auf den Stern, um es für den schnellen Zugriff hier hinzuzufügen.</string>
+    <string name="favorites_empty_action">Alle Spiele durchsuchen</string>
+    <string name="favorites_empty_filtered_title">Keine Favoriten anzuzeigen</string>
+    <string name="favorites_empty_filtered_message">Keine Favoriten-Spiele entsprechen der aktuellen Suche oder den Filtern.</string>
+    <string name="option_add_to_favorites">Zu Favoriten hinzufügen</string>
+    <string name="option_remove_from_favorites">Aus Favoriten entfernen</string>
+    <string name="favorite_add">Zu Favoriten hinzufügen</string>
+    <string name="favorite_remove">Aus Favoriten entfernen</string>
+    <string name="favorite_add_named">%1$s zu Favoriten hinzufügen</string>
+    <string name="favorite_remove_named">%1$s aus Favoriten entfernen</string>
+    <string name="favorite_removed">Aus Favoriten entfernt</string>
+    <string name="favorite_removed_named">%1$s aus Favoriten entfernt</string>
+    <string name="undo">Rückgängig</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d8abd02c18..2ae01ad0d6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2097,4 +2097,20 @@
     <string name="steam_collections_offline">Mostrando las últimas colecciones sincronizadas. Conéctate para actualizar.</string>
     <string name="steam_collections_clear">Borrar</string>
     <string name="steam_collections_smart_unsupported">Solo se muestran las colecciones estándar. Las colecciones inteligentes aún no son compatibles.</string>
+    
+    <string name="tab_favorites">Favoritos</string>
+    <string name="favorites_empty_title">Aún no hay favoritos</string>
+    <string name="favorites_empty_message">Toca la estrella de cualquier juego para añadirlo aquí y acceder rápidamente.</string>
+    <string name="favorites_empty_action">Ver todos los juegos</string>
+    <string name="favorites_empty_filtered_title">No hay favoritos para mostrar</string>
+    <string name="favorites_empty_filtered_message">Ningún juego favorito coincide con la búsqueda o los filtros actuales.</string>
+    <string name="option_add_to_favorites">Añadir a favoritos</string>
+    <string name="option_remove_from_favorites">Quitar de favoritos</string>
+    <string name="favorite_add">Añadir a favoritos</string>
+    <string name="favorite_remove">Quitar de favoritos</string>
+    <string name="favorite_add_named">Añadir %1$s a favoritos</string>
+    <string name="favorite_remove_named">Quitar %1$s de favoritos</string>
+    <string name="favorite_removed">Quitado de favoritos</string>
+    <string name="favorite_removed_named">%1$s quitado de favoritos</string>
+    <string name="undo">Deshacer</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e939d53fb2..d01097b74e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2099,4 +2099,20 @@
     <string name="steam_collections_offline">Affichage des dernières collections synchronisées. Connectez-vous pour mettre à jour.</string>
     <string name="steam_collections_clear">Effacer</string>
     <string name="steam_collections_smart_unsupported">Seules les collections standard sont affichées. Les collections dynamiques ne sont pas encore prises en charge.</string>
+    
+    <string name="tab_favorites">Favoris</string>
+    <string name="favorites_empty_title">Aucun favori pour l’instant</string>
+    <string name="favorites_empty_message">Appuyez sur l’étoile d’un jeu pour l’ajouter ici et y accéder rapidement.</string>
+    <string name="favorites_empty_action">Parcourir tous les jeux</string>
+    <string name="favorites_empty_filtered_title">Aucun favori à afficher</string>
+    <string name="favorites_empty_filtered_message">Aucun jeu favori ne correspond à la recherche ou aux filtres actuels.</string>
+    <string name="option_add_to_favorites">Ajouter aux favoris</string>
+    <string name="option_remove_from_favorites">Retirer des favoris</string>
+    <string name="favorite_add">Ajouter aux favoris</string>
+    <string name="favorite_remove">Retirer des favoris</string>
+    <string name="favorite_add_named">Ajouter %1$s aux favoris</string>
+    <string name="favorite_remove_named">Retirer %1$s des favoris</string>
+    <string name="favorite_removed">Retiré des favoris</string>
+    <string name="favorite_removed_named">%1$s retiré des favoris</string>
+    <string name="undo">Annuler</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 761f8a3fff..5dfc7fc546 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2090,4 +2090,20 @@
     <string name="steam_collections_offline">Visualizzazione delle ultime raccolte sincronizzate. Connettiti per aggiornare.</string>
     <string name="steam_collections_clear">Cancella</string>
     <string name="steam_collections_smart_unsupported">Vengono mostrate solo le raccolte standard. Le raccolte intelligenti non sono ancora supportate.</string>
+    
+    <string name="tab_favorites">Preferiti</string>
+    <string name="favorites_empty_title">Ancora nessun preferito</string>
+    <string name="favorites_empty_message">Tocca la stella su un gioco per aggiungerlo qui e accedervi rapidamente.</string>
+    <string name="favorites_empty_action">Sfoglia tutti i giochi</string>
+    <string name="favorites_empty_filtered_title">Nessun preferito da mostrare</string>
+    <string name="favorites_empty_filtered_message">Nessun gioco preferito corrisponde alla ricerca o ai filtri attuali.</string>
+    <string name="option_add_to_favorites">Aggiungi ai preferiti</string>
+    <string name="option_remove_from_favorites">Rimuovi dai preferiti</string>
+    <string name="favorite_add">Aggiungi ai preferiti</string>
+    <string name="favorite_remove">Rimuovi dai preferiti</string>
+    <string name="favorite_add_named">Aggiungi %1$s ai preferiti</string>
+    <string name="favorite_remove_named">Rimuovi %1$s dai preferiti</string>
+    <string name="favorite_removed">Rimosso dai preferiti</string>
+    <string name="favorite_removed_named">%1$s rimosso dai preferiti</string>
+    <string name="undo">Annulla</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5d0ac0b3ac..1ffbdb47aa 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2056,4 +2056,20 @@
     <string name="steam_collections_offline">最後に同期されたコレクションを表示しています。更新するには接続してください。</string>
     <string name="steam_collections_clear">クリア</string>
     <string name="steam_collections_smart_unsupported">標準コレクションのみ表示されます。スマートコレクションはまだ対応していません。</string>
+    
+    <string name="tab_favorites">お気に入り</string>
+    <string name="favorites_empty_title">お気に入りはまだありません</string>
+    <string name="favorites_empty_message">ゲームの星アイコンをタップすると、ここに追加してすぐにアクセスできます。</string>
+    <string name="favorites_empty_action">すべてのゲームを見る</string>
+    <string name="favorites_empty_filtered_title">表示するお気に入りがありません</string>
+    <string name="favorites_empty_filtered_message">現在の検索やフィルターに一致するお気に入りのゲームはありません。</string>
+    <string name="option_add_to_favorites">お気に入りに追加</string>
+    <string name="option_remove_from_favorites">お気に入りから削除</string>
+    <string name="favorite_add">お気に入りに追加</string>
+    <string name="favorite_remove">お気に入りから削除</string>
+    <string name="favorite_add_named">%1$s をお気に入りに追加</string>
+    <string name="favorite_remove_named">%1$s をお気に入りから削除</string>
+    <string name="favorite_removed">お気に入りから削除しました</string>
+    <string name="favorite_removed_named">%1$s をお気に入りから削除しました</string>
+    <string name="undo">元に戻す</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ac9606d772..675919de54 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2097,4 +2097,20 @@
     <string name="steam_collections_offline">마지막으로 동기화된 컬렉션을 표시하고 있습니다. 업데이트하려면 연결하세요.</string>
     <string name="steam_collections_clear">지우기</string>
     <string name="steam_collections_smart_unsupported">표준 컬렉션만 표시됩니다. 스마트 컬렉션은 아직 지원되지 않습니다.</string>
+    
+    <string name="tab_favorites">즐겨찾기</string>
+    <string name="favorites_empty_title">아직 즐겨찾기가 없습니다</string>
+    <string name="favorites_empty_message">게임의 별 아이콘을 눌러 여기에 추가하고 빠르게 이용하세요.</string>
+    <string name="favorites_empty_action">모든 게임 보기</string>
+    <string name="favorites_empty_filtered_title">표시할 즐겨찾기가 없습니다</string>
+    <string name="favorites_empty_filtered_message">현재 검색어나 필터와 일치하는 즐겨찾기 게임이 없습니다.</string>
+    <string name="option_add_to_favorites">즐겨찾기에 추가</string>
+    <string name="option_remove_from_favorites">즐겨찾기에서 제거</string>
+    <string name="favorite_add">즐겨찾기에 추가</string>
+    <string name="favorite_remove">즐겨찾기에서 제거</string>
+    <string name="favorite_add_named">%1$s을(를) 즐겨찾기에 추가</string>
+    <string name="favorite_remove_named">%1$s을(를) 즐겨찾기에서 제거</string>
+    <string name="favorite_removed">즐겨찾기에서 제거됨</string>
+    <string name="favorite_removed_named">%1$s을(를) 즐겨찾기에서 제거함</string>
+    <string name="undo">실행 취소</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4535d6cd88..c8721c1e3d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2097,4 +2097,20 @@
     <string name="steam_collections_offline">Wyświetlanie ostatnio zsynchronizowanych kolekcji. Połącz się, aby zaktualizować.</string>
     <string name="steam_collections_clear">Wyczyść</string>
     <string name="steam_collections_smart_unsupported">Wyświetlane są tylko standardowe kolekcje. Kolekcje inteligentne nie są jeszcze obsługiwane.</string>
+    
+    <string name="tab_favorites">Ulubione</string>
+    <string name="favorites_empty_title">Brak ulubionych</string>
+    <string name="favorites_empty_message">Dotknij gwiazdki przy grze, aby dodać ją tutaj i mieć szybki dostęp.</string>
+    <string name="favorites_empty_action">Przeglądaj wszystkie gry</string>
+    <string name="favorites_empty_filtered_title">Brak ulubionych do wyświetlenia</string>
+    <string name="favorites_empty_filtered_message">Żadna ulubiona gra nie pasuje do bieżącego wyszukiwania ani filtrów.</string>
+    <string name="option_add_to_favorites">Dodaj do ulubionych</string>
+    <string name="option_remove_from_favorites">Usuń z ulubionych</string>
+    <string name="favorite_add">Dodaj do ulubionych</string>
+    <string name="favorite_remove">Usuń z ulubionych</string>
+    <string name="favorite_add_named">Dodaj %1$s do ulubionych</string>
+    <string name="favorite_remove_named">Usuń %1$s z ulubionych</string>
+    <string name="favorite_removed">Usunięto z ulubionych</string>
+    <string name="favorite_removed_named">Usunięto %1$s z ulubionych</string>
+    <string name="undo">Cofnij</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b7087eeda5..f1c895ea83 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1969,4 +1969,20 @@
     <string name="steam_collections_offline">Exibindo as últimas coleções sincronizadas. Conecte-se para atualizar.</string>
     <string name="steam_collections_clear">Limpar</string>
     <string name="steam_collections_smart_unsupported">Apenas coleções padrão são exibidas. Coleções inteligentes ainda não são compatíveis.</string>
+    
+    <string name="tab_favorites">Favoritos</string>
+    <string name="favorites_empty_title">Ainda não há favoritos</string>
+    <string name="favorites_empty_message">Toque na estrela de qualquer jogo para adicioná-lo aqui e acessá-lo rapidamente.</string>
+    <string name="favorites_empty_action">Ver todos os jogos</string>
+    <string name="favorites_empty_filtered_title">Nenhum favorito para mostrar</string>
+    <string name="favorites_empty_filtered_message">Nenhum jogo favorito corresponde à busca ou aos filtros atuais.</string>
+    <string name="option_add_to_favorites">Adicionar aos favoritos</string>
+    <string name="option_remove_from_favorites">Remover dos favoritos</string>
+    <string name="favorite_add">Adicionar aos favoritos</string>
+    <string name="favorite_remove">Remover dos favoritos</string>
+    <string name="favorite_add_named">Adicionar %1$s aos favoritos</string>
+    <string name="favorite_remove_named">Remover %1$s dos favoritos</string>
+    <string name="favorite_removed">Removido dos favoritos</string>
+    <string name="favorite_removed_named">%1$s removido dos favoritos</string>
+    <string name="undo">Desfazer</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 4b1d7ef0d4..cd46b517ab 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -2100,4 +2100,20 @@
     <string name="steam_collections_offline">Se afișează ultimele colecții sincronizate. Conectează-te pentru a actualiza.</string>
     <string name="steam_collections_clear">Șterge</string>
     <string name="steam_collections_smart_unsupported">Sunt afișate doar colecțiile standard. Colecțiile inteligente nu sunt încă acceptate.</string>
+    
+    <string name="tab_favorites">Favorite</string>
+    <string name="favorites_empty_title">Încă nu ai favorite</string>
+    <string name="favorites_empty_message">Atinge steaua de pe orice joc pentru a-l adăuga aici pentru acces rapid.</string>
+    <string name="favorites_empty_action">Răsfoiește toate jocurile</string>
+    <string name="favorites_empty_filtered_title">Nicio favorită de afișat</string>
+    <string name="favorites_empty_filtered_message">Niciun joc favorit nu corespunde căutării sau filtrelor curente.</string>
+    <string name="option_add_to_favorites">Adaugă la favorite</string>
+    <string name="option_remove_from_favorites">Elimină de la favorite</string>
+    <string name="favorite_add">Adaugă la favorite</string>
+    <string name="favorite_remove">Elimină de la favorite</string>
+    <string name="favorite_add_named">Adaugă %1$s la favorite</string>
+    <string name="favorite_remove_named">Elimină %1$s de la favorite</string>
+    <string name="favorite_removed">Eliminat de la favorite</string>
+    <string name="favorite_removed_named">%1$s eliminat de la favorite</string>
+    <string name="undo">Anulează</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 89272bf8c5..ed90057b1d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2025,4 +2025,20 @@ https://gamenative.app
     <string name="steam_collections_offline">Показаны последние синхронизированные коллекции. Подключитесь для обновления.</string>
     <string name="steam_collections_clear">Очистить</string>
     <string name="steam_collections_smart_unsupported">Показаны только обычные коллекции. Умные коллекции пока не поддерживаются.</string>
+    
+    <string name="tab_favorites">Избранное</string>
+    <string name="favorites_empty_title">Пока нет избранного</string>
+    <string name="favorites_empty_message">Нажмите на звёздочку у любой игры, чтобы добавить её сюда для быстрого доступа.</string>
+    <string name="favorites_empty_action">Просмотреть все игры</string>
+    <string name="favorites_empty_filtered_title">Нет избранного для показа</string>
+    <string name="favorites_empty_filtered_message">Нет избранных игр, соответствующих текущему поиску или фильтрам.</string>
+    <string name="option_add_to_favorites">Добавить в избранное</string>
+    <string name="option_remove_from_favorites">Удалить из избранного</string>
+    <string name="favorite_add">Добавить в избранное</string>
+    <string name="favorite_remove">Удалить из избранного</string>
+    <string name="favorite_add_named">Добавить %1$s в избранное</string>
+    <string name="favorite_remove_named">Удалить %1$s из избранного</string>
+    <string name="favorite_removed">Удалено из избранного</string>
+    <string name="favorite_removed_named">%1$s удалено из избранного</string>
+    <string name="undo">Отменить</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index bc977015dd..b671970603 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2093,4 +2093,20 @@
     <string name="steam_collections_offline">Показано останні синхронізовані колекції. Підключіться, щоб оновити.</string>
     <string name="steam_collections_clear">Очистити</string>
     <string name="steam_collections_smart_unsupported">Показано лише звичайні колекції. Розумні колекції ще не підтримуються.</string>
+    
+    <string name="tab_favorites">Вибране</string>
+    <string name="favorites_empty_title">Ще немає вибраного</string>
+    <string name="favorites_empty_message">Натисніть зірочку на будь-якій грі, щоб додати її сюди для швидкого доступу.</string>
+    <string name="favorites_empty_action">Переглянути всі ігри</string>
+    <string name="favorites_empty_filtered_title">Немає вибраного для показу</string>
+    <string name="favorites_empty_filtered_message">Немає вибраних ігор, що відповідають поточному пошуку або фільтрам.</string>
+    <string name="option_add_to_favorites">Додати до вибраного</string>
+    <string name="option_remove_from_favorites">Видалити з вибраного</string>
+    <string name="favorite_add">Додати до вибраного</string>
+    <string name="favorite_remove">Видалити з вибраного</string>
+    <string name="favorite_add_named">Додати %1$s до вибраного</string>
+    <string name="favorite_remove_named">Видалити %1$s з вибраного</string>
+    <string name="favorite_removed">Видалено з вибраного</string>
+    <string name="favorite_removed_named">%1$s видалено з вибраного</string>
+    <string name="undo">Скасувати</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ef3891881b..86ea506322 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2117,4 +2117,20 @@
     <string name="steam_collections_offline">正在显示上次同步的收藏集。请连接以更新。</string>
     <string name="steam_collections_clear">清除</string>
     <string name="steam_collections_smart_unsupported">仅显示标准收藏集。智能收藏集尚不受支持。</string>
+    
+    <string name="tab_favorites">收藏</string>
+    <string name="favorites_empty_title">还没有收藏</string>
+    <string name="favorites_empty_message">点击任意游戏上的星标即可将其添加到这里，方便快速访问。</string>
+    <string name="favorites_empty_action">浏览所有游戏</string>
+    <string name="favorites_empty_filtered_title">没有可显示的收藏</string>
+    <string name="favorites_empty_filtered_message">没有符合当前搜索或筛选条件的收藏游戏。</string>
+    <string name="option_add_to_favorites">添加到收藏</string>
+    <string name="option_remove_from_favorites">从收藏中移除</string>
+    <string name="favorite_add">添加到收藏</string>
+    <string name="favorite_remove">从收藏中移除</string>
+    <string name="favorite_add_named">将 %1$s 添加到收藏</string>
+    <string name="favorite_remove_named">将 %1$s 从收藏中移除</string>
+    <string name="favorite_removed">已从收藏中移除</string>
+    <string name="favorite_removed_named">已将 %1$s 从收藏中移除</string>
+    <string name="undo">撤销</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 05650862d7..190f7436f5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2108,4 +2108,20 @@
     <string name="steam_collections_offline">正在顯示上次同步的收藏。請連線以更新。</string>
     <string name="steam_collections_clear">清除</string>
     <string name="steam_collections_smart_unsupported">僅顯示標準收藏。智慧型收藏尚不支援。</string>
+    
+    <string name="tab_favorites">收藏</string>
+    <string name="favorites_empty_title">還沒有收藏</string>
+    <string name="favorites_empty_message">點擊任何遊戲上的星號即可將其加入這裡，方便快速存取。</string>
+    <string name="favorites_empty_action">瀏覽所有遊戲</string>
+    <string name="favorites_empty_filtered_title">沒有可顯示的收藏</string>
+    <string name="favorites_empty_filtered_message">沒有符合目前搜尋或篩選條件的收藏遊戲。</string>
+    <string name="option_add_to_favorites">加入收藏</string>
+    <string name="option_remove_from_favorites">從收藏中移除</string>
+    <string name="favorite_add">加入收藏</string>
+    <string name="favorite_remove">從收藏中移除</string>
+    <string name="favorite_add_named">將 %1$s 加入收藏</string>
+    <string name="favorite_remove_named">將 %1$s 從收藏中移除</string>
+    <string name="favorite_removed">已從收藏中移除</string>
+    <string name="favorite_removed_named">已將 %1$s 從收藏中移除</string>
+    <string name="undo">復原</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dfd5518d88..f0a8fa17bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources>
     <string name="app_name">GameNative</string>
     <string name="login_user">User Login</string>
     <string name="login_2fa">Two Factor</string>
@@ -109,6 +109,12 @@
     <string name="tab_recommended">Recommended</string>
     <string name="gog_rec_empty">Add or play some games to get GOG recommendations based on your library.</string>
     <string name="tab_all">All</string>
+    <string name="tab_favorites">Favorites</string>
+    <string name="favorites_empty_title">No favorites yet</string>
+    <string name="favorites_empty_message">Tap the star on any game to add it here for quick access.</string>
+    <string name="favorites_empty_action">Browse all games</string>
+    <string name="favorites_empty_filtered_title">No favorites to show</string>
+    <string name="favorites_empty_filtered_message">No favorite games match the current search or filters.</string>
     <string name="tab_steam">Steam</string>
     <string name="tab_gog">GOG</string>
     <string name="tab_epic">Epic</string>
@@ -1622,6 +1628,15 @@
     <string name="option_reset_to_defaults">Reset container</string>
     <string name="option_get_support">Get support</string>
     <string name="option_submit_feedback">Submit feedback</string>
+    <string name="option_add_to_favorites">Add to favorites</string>
+    <string name="option_remove_from_favorites">Remove from favorites</string>
+    <string name="favorite_add">Add to favorites</string>
+    <string name="favorite_remove">Remove from favorites</string>
+    <string name="favorite_add_named">Add %1$s to favorites</string>
+    <string name="favorite_remove_named">Remove %1$s from favorites</string>
+    <string name="favorite_removed">Removed from favorites</string>
+    <string name="favorite_removed_named">Removed %1$s from favorites</string>
+    <string name="undo">Undo</string>
     <string name="option_reset_drm">Reset DRM</string>
     <string name="option_use_known_config">Use known config</string>
     <string name="option_import_saves">Import saves</string>
diff --git a/app/src/test/java/app/gamenative/data/FavoritesUtilsTest.kt b/app/src/test/java/app/gamenative/data/FavoritesUtilsTest.kt
new file mode 100644
index 0000000000..74700ec859
--- /dev/null
+++ b/app/src/test/java/app/gamenative/data/FavoritesUtilsTest.kt
@@ -0,0 +1,120 @@
+package app.gamenative.data
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class FavoritesUtilsTest {
+
+    private data class Game(val appId: String, val name: String)
+
+    @Test
+    fun apply_addsAppIdWhenFavoriteIsTrue() {
+        val result = FavoritesUtils.apply(setOf("a"), "b", favorite = true)
+
+        assertEquals(setOf("a", "b"), result)
+    }
+
+    @Test
+    fun apply_removesAppIdWhenFavoriteIsFalse() {
+        val result = FavoritesUtils.apply(setOf("a", "b"), "b", favorite = false)
+
+        assertEquals(setOf("a"), result)
+    }
+
+    @Test
+    fun apply_isIdempotentWhenAlreadyInDesiredState() {
+        val current = setOf("a")
+
+        assertEquals(current, FavoritesUtils.apply(current, "a", favorite = true))
+        assertEquals(current, FavoritesUtils.apply(current, "b", favorite = false))
+    }
+
+    @Test
+    fun filter_keepsOnlyFavoritesAndPreservesOrder() {
+        val games = listOf(
+            Game(appId = "1", name = "First"),
+            Game(appId = "2", name = "Second"),
+            Game(appId = "3", name = "Third"),
+        )
+
+        val result = FavoritesUtils.filter(games, favorites = setOf("3", "1")) { it.appId }
+
+        assertEquals(listOf("First", "Third"), result.map { it.name })
+    }
+
+    @Test
+    fun filter_returnsEmptyWhenNothingIsFavorited() {
+        val games = listOf(Game(appId = "1", name = "First"))
+
+        val result = FavoritesUtils.filter(games, favorites = emptySet()) { it.appId }
+
+        assertTrue(result.isEmpty())
+    }
+
+    @Test
+    fun count_matchesTheNumberOfFavoritedItems() {
+        val games = listOf(
+            Game(appId = "1", name = "First"),
+            Game(appId = "2", name = "Second"),
+            Game(appId = "3", name = "Third"),
+        )
+
+        val count = FavoritesUtils.count(games, favorites = setOf("1", "3", "missing")) { it.appId }
+
+        assertEquals(2, count)
+    }
+
+    @Test
+    fun count_ignoresFavoriteIdsThatAreNotInTheList() {
+        val games = listOf(Game(appId = "1", name = "First"))
+
+        val count = FavoritesUtils.count(games, favorites = setOf("99")) { it.appId }
+
+        assertEquals(0, count)
+        assertFalse(count == games.size)
+    }
+
+    @Test
+    fun countPresent_countsOnlyFavoritesInEligibleSet() {
+        val count = FavoritesUtils.countPresent(
+            favorites = setOf("1", "2", "3", "orphan"),
+            eligibleIds = setOf("2", "3", "4"),
+        )
+
+        assertEquals(2, count)
+    }
+
+    @Test
+    fun countPresent_isZeroWhenNoOverlap() {
+        val count = FavoritesUtils.countPresent(
+            favorites = setOf("1", "2"),
+            eligibleIds = setOf("3", "4"),
+        )
+
+        assertEquals(0, count)
+    }
+
+    @Test
+    fun countPresent_isZeroWhenFavoritesEmpty() {
+        val count = FavoritesUtils.countPresent(
+            favorites = emptySet(),
+            eligibleIds = setOf("1", "2"),
+        )
+
+        assertEquals(0, count)
+    }
+
+    @Test
+    fun countPresent_ignoresOrphanedFavoritesNotInEligibleSet() {
+        // Favorited games that have disappeared from the library (uninstalled source, revoked
+        // credentials) must not inflate the badge beyond what the tab can actually show.
+        val count = FavoritesUtils.countPresent(
+            favorites = setOf("a", "b", "c"),
+            eligibleIds = emptySet(),
+        )
+
+        assertEquals(0, count)
+    }
+}