diff --git a/app/src/androidTest/java/org/fdroid/ui/screenshots/DiscoverScreenshotTest.kt b/app/src/androidTest/java/org/fdroid/ui/screenshots/DiscoverScreenshotTest.kt
index fd7e553ff..ee3670d6c 100644
--- a/app/src/androidTest/java/org/fdroid/ui/screenshots/DiscoverScreenshotTest.kt
+++ b/app/src/androidTest/java/org/fdroid/ui/screenshots/DiscoverScreenshotTest.kt
@@ -1,5 +1,6 @@
 package org.fdroid.ui.screenshots
 
+import java.text.Collator
 import org.fdroid.ui.discover.Discover
 import org.fdroid.ui.discover.LoadedDiscoverModel
 import org.junit.Test
@@ -16,12 +17,16 @@ class DiscoverScreenshotTest(localeName: String) : LocalizedScreenshotTest(local
   @Test
   fun appDetails() =
     screenshotTest("1_Discover") { localeList ->
+      val collator = Collator.getInstance(localeList.get(0))
       val model =
         LoadedDiscoverModel(
           newApps = getNewApps(localeList),
           recentlyUpdatedApps = getRecentlyUpdatedApps(localeList),
           mostDownloadedApps = getMostDownloadedApps(localeList),
-          categories = getCategoryItems(localeList).groupBy { it.group },
+          categories =
+            getCategoryItems(localeList).filter { it.featured }.sortedWith { c1, c2 ->
+              collator.compare(c1.name, c2.name)
+            },
           hasRepoIssues = false,
         )
       Discover(discoverModel = model, onListTap = {}, onAppTap = {}, onNav = {})
diff --git a/app/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
deleted file mode 100644
index fd22601d2..000000000
--- a/app/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.fdroid.ui.categories
-
-import androidx.annotation.StringRes
-import org.fdroid.R
-
-data class CategoryGroup(val id: String, @get:StringRes val name: Int)
-
-object CategoryGroups {
-  val productivity = CategoryGroup("productivity", R.string.category_group_productivity)
-  val tools = CategoryGroup("tools", R.string.category_group_tools)
-  val wallets = CategoryGroup("wallets", R.string.category_group_wallets)
-  val media = CategoryGroup("media", R.string.category_group_media)
-  val communication = CategoryGroup("communication", R.string.category_group_communication)
-  val device = CategoryGroup("device", R.string.category_group_device)
-  val network = CategoryGroup("network", R.string.category_group_network)
-  val storage = CategoryGroup("storage", R.string.category_group_storage)
-  val interests = CategoryGroup("interests", R.string.category_group_interests)
-  val misc = CategoryGroup("misc", R.string.category_group_misc)
-}
diff --git a/app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
index 34d9bae11..2d593ff45 100644
--- a/app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
@@ -153,81 +153,31 @@ data class CategoryItem(val id: String, val name: String) {
         else -> Icons.Default.Category
       }
 
-  val group: CategoryGroup
+  val featured: Boolean
     get() =
       when (id) {
-        "AI Chat" -> CategoryGroups.tools
-        "App Manager" -> CategoryGroups.device
-        "App Store & Updater" -> CategoryGroups.device
-        "Battery" -> CategoryGroups.device
-        "Bookmark" -> CategoryGroups.storage
-        "Browser" -> CategoryGroups.network
-        "Calculator" -> CategoryGroups.tools
-        "Calendar & Agenda" -> CategoryGroups.productivity
-        "Clock" -> CategoryGroups.productivity
-        "Cloud Storage & File Sync" -> CategoryGroups.storage
-        "Connectivity" -> CategoryGroups.network
-        "Contact" -> CategoryGroups.communication
-        "Development" -> CategoryGroups.interests
-        "DNS & Hosts" -> CategoryGroups.network
-        "Draw" -> CategoryGroups.interests
-        "Ebook Reader" -> CategoryGroups.media
-        "Email" -> CategoryGroups.communication
-        "File Encryption & Vault" -> CategoryGroups.storage
-        "File Transfer" -> CategoryGroups.storage
-        "Finance Manager" -> CategoryGroups.wallets
-        "Firewall" -> CategoryGroups.network
-        "Flashlight" -> CategoryGroups.tools
-        "Forum" -> CategoryGroups.communication
-        "Gallery" -> CategoryGroups.storage
-        "Games" -> CategoryGroups.media
-        "Graphics" -> CategoryGroups.interests
-        "Habit Tracker" -> CategoryGroups.productivity
-        "Icon Pack" -> CategoryGroups.device
-        "Internet" -> CategoryGroups.network
-        "Inventory" -> CategoryGroups.tools
-        "Keyboard & IME" -> CategoryGroups.device
-        "Launcher" -> CategoryGroups.device
-        "Local Media Player" -> CategoryGroups.media
-        "Location Tracker & Sharer" -> CategoryGroups.tools
-        "Messaging" -> CategoryGroups.communication
-        "Money" -> CategoryGroups.wallets
-        "Multimedia" -> CategoryGroups.media
-        "Music Practice Tool" -> CategoryGroups.interests
-        "Navigation" -> CategoryGroups.tools
-        "Network Analyzer" -> CategoryGroups.network
-        "News" -> CategoryGroups.interests
-        "Note" -> CategoryGroups.storage
-        "Online Media Player" -> CategoryGroups.media
-        "Pass Wallet" -> CategoryGroups.wallets
-        "Password & 2FA" -> CategoryGroups.device
-        "Phone & SMS" -> CategoryGroups.communication
-        "Podcast" -> CategoryGroups.media
-        "Public Transport" -> CategoryGroups.tools
-        "Radio" -> CategoryGroups.media
-        "Reading" -> CategoryGroups.media
-        "Recipe Manager" -> CategoryGroups.interests
-        "Religion" -> CategoryGroups.interests
-        "Remote Controller" -> CategoryGroups.tools
-        "Science & Education" -> CategoryGroups.interests
-        "Security" -> CategoryGroups.device
-        "Shopping List" -> CategoryGroups.tools
-        "Social Network" -> CategoryGroups.communication
-        "Sports & Health" -> CategoryGroups.interests
-        "System" -> CategoryGroups.device
-        "Task" -> CategoryGroups.productivity
-        "Text Editor" -> CategoryGroups.productivity
-        "Theming" -> CategoryGroups.device
-        "Time" -> CategoryGroups.productivity
-        "Translation & Dictionary" -> CategoryGroups.tools
-        "Voice & Video Chat" -> CategoryGroups.communication
-        "Unit Convertor" -> CategoryGroups.tools
-        "VPN & Proxy" -> CategoryGroups.network
-        "Wallet" -> CategoryGroups.wallets
-        "Wallpaper" -> CategoryGroups.device
-        "Weather" -> CategoryGroups.tools
-        "Workout" -> CategoryGroups.interests
-        "Writing" -> CategoryGroups.productivity
-        else -> CategoryGroups.misc
+        "Browser" -> true
+        "Calendar & Agenda" -> true
+        "Cloud Storage & File Sync" -> true
+        "Email" -> true
+        "File Encryption & Vault" -> true
+        "File Transfer" -> true
+        "Firewall" -> true
+        "Games" -> true
+        "Local Media Player" -> true
+        "Location Tracker & Sharer" -> true
+        "Messaging" -> true
+        "Navigation" -> true
+        "News" -> true
+        "Password & 2FA" -> true
+        "Podcast" -> true
+        "Public Transport" -> true
+        "Radio" -> true
+        "Social Network" -> true
+        "Translation & Dictionary" -> true
+        "Voice & Video Chat" -> true
+        "VPN & Proxy" -> true
+        "Weather" -> true
+        else -> false
       }
 }
diff --git a/app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 4eb791d9e..8398d3b5c 100644
--- a/app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -1,86 +1,71 @@
 package org.fdroid.ui.categories
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
 import org.fdroid.ui.FDroidContent
-import org.fdroid.ui.lists.AppListType
-import org.fdroid.ui.navigation.NavigationKey
 
 @Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 fun CategoryList(
-  categoryMap: Map<CategoryGroup, List<CategoryItem>>?,
+  categoryList: List<CategoryItem>?,
   onNav: (NavKey) -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  AnimatedVisibility(!categoryMap.isNullOrEmpty()) {
-    Column(modifier = modifier.padding(top = 20.dp)) {
-      Text(
-        text = stringResource(R.string.main_menu__categories),
-        style = MaterialTheme.typography.titleLarge,
-        modifier = Modifier.padding(bottom = 8.dp, start = 16.dp, end = 16.dp),
-      )
-      // we'll sort the groups here, because before we didn't have the context to get names
-      val res = LocalResources.current
-      val sortedMap =
-        remember(categoryMap) {
-          val comparator = compareBy<CategoryGroup> { res.getString(it.name) }
-          categoryMap?.toSortedMap(comparator)
-        }
-      sortedMap?.forEach { (group, categories) ->
+  val onAllCategories = { /* TODO */ }
+  AnimatedVisibility(!categoryList.isNullOrEmpty()) {
+    Column(modifier = modifier) {
+      Row(
+        verticalAlignment = CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier =
+          Modifier.fillMaxWidth().clickable(onClick = onAllCategories).padding(horizontal = 16.dp),
+      ) {
         Text(
-          text = stringResource(group.name),
-          style = MaterialTheme.typography.titleMedium,
-          modifier = Modifier.fillMaxWidth().padding(16.dp, 2.dp),
+          text = stringResource(R.string.categories_features),
+          style = MaterialTheme.typography.titleMediumEmphasized,
+          fontSize = 20.sp,
         )
-        ChipFlowRow(modifier = Modifier.padding(start = 16.dp, bottom = 12.dp)) {
-          categories.forEach { category ->
-            CategoryChip(
-              categoryItem = category,
-              onClick = {
-                val type = AppListType.Category(category.name, category.id)
-                val navKey = NavigationKey.AppList(type)
-                onNav(navKey)
-              },
-            )
-          }
-        }
+        TextButton(onClick = onAllCategories) { Text(stringResource(R.string.see_all)) }
+      }
+      if (categoryList != null) {
+        // FIXME: A LazyColumn would be better, but we can't use this inside a scrollable column
+        Column { categoryList.forEach { categoryItem -> CategoryRow(categoryItem, onNav) } }
       }
     }
   }
 }
 
-@Preview
 @Composable
+@PreviewLightDark
 fun CategoryListPreview() {
   FDroidContent {
     val categories =
-      mapOf(
-        CategoryGroups.productivity to
-          listOf(
-            CategoryItem("App Store & Updater", "App Store & Updater"),
-            CategoryItem("Browser", "Browser"),
-            CategoryItem("Calendar & Agenda", "Calendar & Agenda"),
-          ),
-        CategoryGroups.media to
-          listOf(
-            CategoryItem("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
-            CategoryItem("Connectivity", "Connectivity"),
-            CategoryItem("Development", "Development"),
-            CategoryItem("doesn't exist", "Foo bar"),
-          ),
+      listOf(
+        CategoryItem("App Store & Updater", "App Store & Updater"),
+        CategoryItem("Browser", "Browser"),
+        CategoryItem("Calendar & Agenda", "Calendar & Agenda"),
+        CategoryItem("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
+        CategoryItem("Connectivity", "Connectivity"),
+        CategoryItem("Development", "Development"),
+        CategoryItem("doesn't exist", "Foo bar"),
       )
     CategoryList(categories, {})
   }
diff --git a/app/src/main/kotlin/org/fdroid/ui/categories/CategoryRow.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryRow.kt
new file mode 100644
index 000000000..f9d0dbe8d
--- /dev/null
+++ b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryRow.kt
@@ -0,0 +1,40 @@
+package org.fdroid.ui.categories
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.navigation.NavigationKey
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun CategoryRow(categoryItem: CategoryItem, onNav: (NavKey) -> Unit) {
+  ListItem(
+    leadingContent = {
+      Icon(
+        imageVector = categoryItem.imageVector,
+        contentDescription = null,
+        tint = MaterialTheme.colorScheme.primary,
+        modifier = Modifier.semantics { hideFromAccessibility() },
+      )
+    },
+    onClick = {
+      val type = AppListType.Category(categoryItem.name, categoryItem.id)
+      val navKey = NavigationKey.AppList(type)
+      onNav(navKey)
+    },
+    modifier = Modifier.padding(horizontal = 16.dp),
+  ) {
+    Text(text = categoryItem.name, maxLines = 2, overflow = TextOverflow.Ellipsis)
+  }
+}
diff --git a/app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index 89cf54f67..b8f2d13b0 100644
--- a/app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -1,6 +1,7 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -11,11 +12,14 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.automirrored.filled.ArrowForward
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -27,6 +31,7 @@ import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.InstalledBadge
@@ -41,20 +46,28 @@ fun AppCarousel(
   onTitleTap: () -> Unit,
   onAppTap: (AppDiscoverItem) -> Unit,
 ) {
-  Column(verticalArrangement = spacedBy(8.dp), modifier = modifier) {
+  Column(verticalArrangement = spacedBy(10.dp), modifier = modifier) {
     Row(
       verticalAlignment = CenterVertically,
-      modifier =
-        Modifier.fillMaxWidth()
-          .clickable(onClick = onTitleTap)
-          .padding(horizontal = 16.dp, vertical = 8.dp),
+      horizontalArrangement = Arrangement.SpaceBetween,
+      modifier = Modifier.fillMaxWidth().clickable(onClick = onTitleTap).padding(horizontal = 16.dp),
     ) {
-      Text(text = title, style = MaterialTheme.typography.headlineSmall)
-      Icon(
-        imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
-        modifier = Modifier.semantics { hideFromAccessibility() },
-        contentDescription = null,
-      )
+      Text(text = title, style = MaterialTheme.typography.titleMediumEmphasized, fontSize = 20.sp)
+      IconButton(
+        onClick = onTitleTap,
+        shape = CircleShape,
+        colors =
+          IconButtonDefaults.iconButtonColors(
+            containerColor = MaterialTheme.colorScheme.surfaceContainer
+          ),
+        modifier = Modifier.size(48.dp).padding(6.dp),
+      ) {
+        Icon(
+          imageVector = Icons.AutoMirrored.Filled.ArrowForward,
+          modifier = Modifier.semantics { hideFromAccessibility() },
+          contentDescription = null,
+        )
+      }
     }
     LazyRow(
       contentPadding = PaddingValues(horizontal = 16.dp),
@@ -82,7 +95,13 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
           },
       )
     }
-    Text(text = app.name, style = MaterialTheme.typography.bodySmall, minLines = 2, maxLines = 2)
+    Text(
+      text = app.name,
+      style = MaterialTheme.typography.bodySmall,
+      minLines = 2,
+      maxLines = 2,
+      lineHeight = 14.sp,
+    )
   }
 }
 
diff --git a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
index 70f491a94..5e6a3b462 100644
--- a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
@@ -1,19 +1,21 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
 import org.fdroid.ui.categories.CategoryList
 import org.fdroid.ui.lists.AppListType
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
+@OptIn(ExperimentalMaterial3Api::class)
 fun DiscoverContent(
   discoverModel: LoadedDiscoverModel,
   onListTap: (AppListType) -> Unit,
@@ -21,7 +23,7 @@ fun DiscoverContent(
   onNav: (NavKey) -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  Column(modifier = modifier) {
+  Column(verticalArrangement = spacedBy(18.dp), modifier = modifier) {
     AnimatedVisibility(discoverModel.newApps.isNotEmpty()) {
       val listNew = AppListType.New(stringResource(R.string.app_list_new))
       AppCarousel(
@@ -53,7 +55,7 @@ fun DiscoverContent(
         )
     }
     CategoryList(
-      categoryMap = discoverModel.categories,
+      categoryList = discoverModel.categories,
       onNav = onNav,
       modifier = Modifier.fillMaxWidth(),
     )
diff --git a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverModel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverModel.kt
index 141ef8b15..9af011d42 100644
--- a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverModel.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverModel.kt
@@ -2,7 +2,6 @@ package org.fdroid.ui.discover
 
 import org.fdroid.download.NetworkState
 import org.fdroid.repo.RepoUpdateState
-import org.fdroid.ui.categories.CategoryGroup
 import org.fdroid.ui.categories.CategoryItem
 
 sealed class DiscoverModel
@@ -20,6 +19,6 @@ data class LoadedDiscoverModel(
   val newApps: List<AppDiscoverItem>,
   val recentlyUpdatedApps: List<AppDiscoverItem>,
   val mostDownloadedApps: List<AppDiscoverItem>?,
-  val categories: Map<CategoryGroup, List<CategoryItem>>?,
+  val categories: List<CategoryItem>?,
   val hasRepoIssues: Boolean,
 ) : DiscoverModel()
diff --git a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 68a1c0f63..21bdbb840 100644
--- a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -88,7 +88,7 @@ fun DiscoverPresenter(
       newApps = newApps ?: emptyList(),
       recentlyUpdatedApps = recentlyUpdatedApps ?: emptyList(),
       mostDownloadedApps = mostDownloadedApps,
-      categories = categories?.groupBy { it.group },
+      categories = categories,
       hasRepoIssues = hasRepoIssuesFlow.collectAsState(false).value,
     )
   } else {
diff --git a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index bb66e6baf..75609d1aa 100644
--- a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -71,8 +71,13 @@ constructor(
   private val categories =
     db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
       categories
-        .map { category ->
-          CategoryItem(id = category.id, name = category.getName(localeList) ?: "Unknown Category")
+        .mapNotNull { category ->
+          val item =
+            CategoryItem(
+              id = category.id,
+              name = category.getName(localeList) ?: "Unknown Category",
+            )
+          if (item.featured) item else null
         }
         .sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e3b6c2e80..24a6bcf90 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -686,16 +686,6 @@
     <string name="app_list_author">تطبيقات بواسطة %s</string>
     <string name="search_placeholder">ابحث…</string>
     <string name="search_no_results">لم يُعثر على أي تطبيقات\n\nحاول استخدام كلمات بحث أقل أو أضف المزيد من المستودعات</string>
-    <string name="category_group_productivity">إنتاجية</string>
-    <string name="category_group_tools">أدوات</string>
-    <string name="category_group_wallets">المالية والمحافظ</string>
-    <string name="category_group_media">الترفيه والإعلام</string>
-    <string name="category_group_communication">اتصال</string>
-    <string name="category_group_device">الجهاز</string>
-    <string name="category_group_network">الشبكة</string>
-    <string name="category_group_storage">الملفات والتخزين</string>
-    <string name="category_group_interests">اهتمامات</string>
-    <string name="category_group_misc">متنوّع</string>
     <string name="author_by">بواسطة %1$s</string>
     <string name="last_updated">آخر تحديث: %1$s</string>
     <string name="last_updated_with_size">آخر تحديث: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 8fb0852fc..8dca95640 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -628,16 +628,6 @@
     <string name="app_list_author">Приложения от %s</string>
     <string name="search_placeholder">Търсене…</string>
     <string name="search_no_results">Не са намерени приложения\n\nСъкратете търсенето или добавете повече хранилища</string>
-    <string name="category_group_productivity">Продуктивност</string>
-    <string name="category_group_tools">Инструменти</string>
-    <string name="category_group_wallets">Финанси и портфейли</string>
-    <string name="category_group_media">Забавление и медия</string>
-    <string name="category_group_communication">Разговори</string>
-    <string name="category_group_device">Устройство</string>
-    <string name="category_group_network">Мрежа</string>
-    <string name="category_group_storage">Файлове и хранилища</string>
-    <string name="category_group_interests">Интереси</string>
-    <string name="category_group_misc">Разни</string>
     <string name="author_by">От %1$s</string>
     <string name="last_updated">Последно обновяване: %1$s</string>
     <string name="last_updated_with_size">Последно обновяване: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 48d62c959..a500e2ecf 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -510,8 +510,6 @@
     <string name="app_list_all">সমস্ত অ্যাপস</string>
     <string name="app_list_most_downloaded">সর্বাধিক ডাউনলোডকৃত</string>
     <string name="search_placeholder">অনুসন্ধান করুন</string>
-    <string name="category_group_tools">সরঞ্জামসমূহ</string>
-    <string name="category_group_interests">পছন্দসমূহ</string>
     <string name="app_name_basic">F-Droid সাধারণ</string>
     <string name="app_name_full_nightly">F-Nightly</string>
     <string name="app_name_basic_nightly">F-Nightly Basic</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 2b51c25ff..c865c65b4 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -639,16 +639,6 @@
     <string name="app_list_author">Aplicacions per %s</string>
     <string name="search_placeholder">Cerca…</string>
     <string name="search_no_results">No s\'han trobat aplicacions\n\nProva d\'emprar menys termes de cerca o d\'afegir més repositoris</string>
-    <string name="category_group_productivity">Productivitat</string>
-    <string name="category_group_tools">Eines</string>
-    <string name="category_group_wallets">Finances i carteres</string>
-    <string name="category_group_media">Entreteniment i mitjans</string>
-    <string name="category_group_communication">Comunicació</string>
-    <string name="category_group_device">Dispositiu</string>
-    <string name="category_group_network">Xarxa</string>
-    <string name="category_group_storage">Arxius i emmagatzematge</string>
-    <string name="category_group_interests">Interessos</string>
-    <string name="category_group_misc">Miscel·lània</string>
     <string name="author_by">Per %1$s</string>
     <string name="last_updated">Últimes actualitzacions: %1$s</string>
     <string name="last_updated_with_size">Últimes actualitzacions: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9195620ec..d3f866a41 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -642,16 +642,6 @@
     <string name="app_list_author">Aplikace od vývojáře %s</string>
     <string name="search_placeholder">Hledat…</string>
     <string name="search_no_results">Nenalezeny žádné aplikace\n\nZkuste použít méně slov nebo přidat další repozitáře</string>
-    <string name="category_group_productivity">Produktivita</string>
-    <string name="category_group_tools">Nástroje</string>
-    <string name="category_group_wallets">Finance a peněženky</string>
-    <string name="category_group_media">Zábava a média</string>
-    <string name="category_group_communication">Komunikace</string>
-    <string name="category_group_device">Zařízení</string>
-    <string name="category_group_network">Síť</string>
-    <string name="category_group_storage">Soubory a úložiště</string>
-    <string name="category_group_interests">Zájmy</string>
-    <string name="category_group_misc">Různé</string>
     <string name="author_by">Od %1$s</string>
     <string name="last_updated">Naposledy aktualizováno: %1$s</string>
     <string name="last_updated_with_size">Naposledy aktualizováno: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 48025cf24..274c75124 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -622,33 +622,23 @@
     <string name="app_list_all">Alle apps</string>
     <string name="app_list_new">Nye apps</string>
     <string name="my_apps_export_installed_apps">Eksportér appliste</string>
-    <string name="category_group_tools">Værktøjer</string>
     <string name="author_by">Af %1$s</string>
-    <string name="category_group_communication">Kommunikation</string>
-    <string name="category_group_network">Netværk</string>
     <string name="donate_title">Donér</string>
     <string name="installed_version">Installeret version:</string>
     <string name="technical_info">Teknisk information</string>
-    <string name="category_group_device">Enhed</string>
     <string name="anti_features_title">Denne app har anti-funktioner</string>
     <string name="status_install_preparing">Forbereder installation…</string>
     <string name="package_name">Pakkenavn:</string>
-    <string name="category_group_productivity">Produktivitet</string>
     <string name="last_updated">Sidst opdateret: %1$s</string>
-    <string name="category_group_media">Underholdning &amp; Medier</string>
     <string name="app_list_recently_updated">Nyligt opdateret</string>
     <string name="app_list_most_downloaded">Mest hentede</string>
-    <string name="category_group_interests">Interesser</string>
     <string name="last_updated_with_size">Sidst opdateret: %1$s (%2$s)</string>
     <string name="whats_new_title">Nyheder</string>
-    <string name="category_group_storage">Filer &amp; Lagring</string>
-    <string name="category_group_misc">Diverse</string>
     <string name="crash_dialog_title_old">F-Droid er brudt sammen</string>
     <string name="call_to_action_keepandroidopen">F-Droid er truet. Google ændrer hvordan du kan installere apps på din enhed. Vi har brug for din hjælp.</string>
     <string name="call_to_action_keepandroidopen_url">https://keepandroidopen.org</string>
     <string name="ipfsgw_summary_new">Hent apps ved brug af IPFS-webendpoints</string>
     <string name="search_no_results">Ingen apps fundet\n\nPrøv færre søgeord eller tilføj flere repositories</string>
-    <string name="category_group_wallets">Økonomi og tegnebøger</string>
     <string name="developer_contact">Udviklerkontakt</string>
     <string name="first_start_loading">Henter app-repositories…</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 38427ffee..e8b147775 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -638,16 +638,6 @@
     <string name="app_list_author">Apps von %s</string>
     <string name="search_placeholder">Suchen …</string>
     <string name="search_no_results">Keine Apps gefunden\n\nVersuche es mit weniger Suchbegriffen oder füge weitere Repositorys hinzu</string>
-    <string name="category_group_productivity">Produktivität</string>
-    <string name="category_group_tools">Werkzeuge</string>
-    <string name="category_group_wallets">Finanzen und Wallets</string>
-    <string name="category_group_media">Unterhaltung und Medien</string>
-    <string name="category_group_communication">Kommunikation</string>
-    <string name="category_group_device">Gerät</string>
-    <string name="category_group_network">Netzwerk</string>
-    <string name="category_group_storage">Dateien und Speicher</string>
-    <string name="category_group_interests">Interessen</string>
-    <string name="category_group_misc">Verschiedenes</string>
     <string name="author_by">Von %1$s</string>
     <string name="last_updated">Zuletzt aktualisiert: %1$s</string>
     <string name="last_updated_with_size">Zuletzt aktualisiert: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 612673fc7..ca841166a 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -627,16 +627,6 @@
     <string name="app_list_author">Εφαρμογές από %s</string>
     <string name="search_placeholder">Αναζήτησε…</string>
     <string name="search_no_results">Δεν βρέθηκαν εφαρμογές\n\nΔοκιμάστε να χρησιμοποιήσετε λιγότερους όρους αναζήτησης ή προσθέστε περισσότερα αποθετήρια</string>
-    <string name="category_group_productivity">Παραγωγικότητα</string>
-    <string name="category_group_tools">Εργαλεία</string>
-    <string name="category_group_wallets">Οικονομικά &amp; Πορτοφόλια</string>
-    <string name="category_group_media">Ψυχαγωγία &amp; Μέσα</string>
-    <string name="category_group_communication">Επικοινωνία</string>
-    <string name="category_group_device">Συσκευή</string>
-    <string name="category_group_network">Δίκτυο</string>
-    <string name="category_group_storage">Αρχεία &amp; Αποθηκευτικός Χώρος</string>
-    <string name="category_group_interests">Ενδιαφέροντα</string>
-    <string name="category_group_misc">Διάφορα</string>
     <string name="author_by">Από %1$s</string>
     <string name="last_updated">Τελευταία ενημέρωση: %1$s</string>
     <string name="last_updated_with_size">Τελευταία ενημέρωση: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index d0c622c40..8096b928d 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -647,16 +647,6 @@
     <string name="app_list_author">Apps by %s</string>
     <string name="search_placeholder">Search…</string>
     <string name="search_no_results">No apps found\n\nTry to use less search terms or add more repositories</string>
-    <string name="category_group_productivity">Productivity</string>
-    <string name="category_group_tools">Tools</string>
-    <string name="category_group_wallets">Finances &amp; Wallets</string>
-    <string name="category_group_media">Entertainment &amp; Media</string>
-    <string name="category_group_communication">Communication</string>
-    <string name="category_group_device">Device</string>
-    <string name="category_group_network">Network</string>
-    <string name="category_group_storage">Files &amp; Storage</string>
-    <string name="category_group_interests">Interests</string>
-    <string name="category_group_misc">Miscellaneous</string>
     <string name="author_by">By %1$s</string>
     <string name="last_updated">Last updated: %1$s</string>
     <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index a633fe869..f0c33e10e 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -628,16 +628,6 @@
     <string name="app_list_author">Aplikaĵoj fare de %s</string>
     <string name="search_placeholder">Serĉi…</string>
     <string name="search_no_results">Trovis neniun aplikaĵon\n\nProvu uzi malpli da serĉvortoj aŭ aldoni pliajn deponejojn</string>
-    <string name="category_group_productivity">Oficejo</string>
-    <string name="category_group_tools">Utilaĵoj</string>
-    <string name="category_group_wallets">Financoj</string>
-    <string name="category_group_media">Distro kaj aŭdvidaĵoj</string>
-    <string name="category_group_communication">Komunikado</string>
-    <string name="category_group_device">Aparato</string>
-    <string name="category_group_network">Reto</string>
-    <string name="category_group_storage">Dosieroj kaj konservado</string>
-    <string name="category_group_interests">Interesiĝoj</string>
-    <string name="category_group_misc">Diversaĵoj</string>
     <string name="author_by">Fare de %1$s</string>
     <string name="last_updated">Lasta ĝisdatigo: %1$s</string>
     <string name="last_updated_with_size">Lasta ĝisdatigo: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 04144e5ed..9cf153289 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -665,16 +665,6 @@
     <string name="app_list_author">Aplicaciones por %s</string>
     <string name="search_placeholder">Buscar…</string>
     <string name="search_no_results">No se encontraron apps\n\nIntenta usar menos términos de búsqueda o agrega más repositorios</string>
-    <string name="category_group_productivity">Productividad</string>
-    <string name="category_group_tools">Herramientas</string>
-    <string name="category_group_wallets">Financias y Carteras</string>
-    <string name="category_group_media">Entretenimiento y Medios</string>
-    <string name="category_group_communication">Comunicación</string>
-    <string name="category_group_device">Dispositivo</string>
-    <string name="category_group_network">Red</string>
-    <string name="category_group_storage">Archivos y Almacenamiento</string>
-    <string name="category_group_interests">Intereses</string>
-    <string name="category_group_misc">Misceláneo</string>
     <string name="author_by">Por %1$s</string>
     <string name="last_updated">Últimamente actualizado: %1$s</string>
     <string name="last_updated_with_size">Últimamente actualizado: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 6ddce00b9..79bdb80d0 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -644,16 +644,6 @@
     <string name="app_list_author">Rakendused arendajalt %s</string>
     <string name="search_placeholder">Otsi…</string>
     <string name="search_no_results">Rakendusi ei leidu\n\nProovi kasutada laiemaid otsingutingimusi või lisa veel rakenduste hoidlaid</string>
-    <string name="category_group_productivity">Tarbetarkvara</string>
-    <string name="category_group_tools">Tarvikud</string>
-    <string name="category_group_wallets">Rahandus ja rahataskud</string>
-    <string name="category_group_media">Meelelahutus ja meedia</string>
-    <string name="category_group_communication">Suhtlus</string>
-    <string name="category_group_device">Nutiseade ja süsteem</string>
-    <string name="category_group_network">Võrgundus</string>
-    <string name="category_group_storage">Failid ja andmeruum</string>
-    <string name="category_group_interests">Huvid ja hobid</string>
-    <string name="category_group_misc">Varia</string>
     <string name="author_by">Arendajalt %1$s</string>
     <string name="last_updated">Viimati uuendatud: %1$s</string>
     <string name="last_updated_with_size">Viimati uuendatud: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 630addd63..ba49a9e1c 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -653,16 +653,6 @@
     <string name="app_list_author">%s araberako aplikazioak</string>
     <string name="search_placeholder">Bilatu…</string>
     <string name="search_no_results">Ez da aplikaziorik aurkitu\n\nSaiatu bilaketa termino gutxiagorekin edo biltegi gehiagorekin</string>
-    <string name="category_group_productivity">Produktibitatea</string>
-    <string name="category_group_tools">Tresnak</string>
-    <string name="category_group_wallets">Finantza eta diru-zorroak</string>
-    <string name="category_group_media">Entretenimendu eta multimedia</string>
-    <string name="category_group_communication">Komunikazioa</string>
-    <string name="category_group_device">Gailua</string>
-    <string name="category_group_network">Sarea</string>
-    <string name="category_group_storage">Fitxategiak eta biltegiratzea</string>
-    <string name="category_group_interests">Interesak</string>
-    <string name="category_group_misc">Denetarik</string>
     <string name="author_by">%1$s-ek egina</string>
     <string name="last_updated">Azken eguneraketa: %1$s</string>
     <string name="last_updated_with_size">Azken eguneraketa: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index f4aa4cbd5..292fd2d8a 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -630,15 +630,6 @@
     <string name="app_list_author">کاره‌های %s</string>
     <string name="search_placeholder">جست‌وجو…</string>
     <string name="search_no_results">هیچ کارهٔ مطابقی وجود ندارد\n\nتلاش برای استفاده از عبارت‌های جست‌وجوی کم‌تر یا افزودن مخزن‌های بیش‌تر</string>
-    <string name="category_group_productivity">بهره‌وری</string>
-    <string name="category_group_tools">ابزارها</string>
-    <string name="category_group_wallets">مالی و کیف‌پول</string>
-    <string name="category_group_media">سرگرمی و رسانه</string>
-    <string name="category_group_communication">ارتباطات</string>
-    <string name="category_group_device">افزاره</string>
-    <string name="category_group_network">شبکه</string>
-    <string name="category_group_storage">پرونده‌ها و ذخیره‌سازی</string>
-    <string name="category_group_misc">متفرّقه</string>
     <string name="author_by">به دست %1$s</string>
     <string name="last_updated">آخرین به‌روز رسانی: %1$s</string>
     <string name="last_updated_with_size">آخرین به‌روز رسانی: %1$s‏ (%2$s)</string>
@@ -650,7 +641,6 @@
     <string name="technical_info">اطّلاعات فنی</string>
     <string name="package_name">نام بسته:</string>
     <string name="installed_version">نگارش نصب شده:</string>
-    <string name="category_group_interests">سهام</string>
     <string name="filter">پالایش</string>
     <string name="filter_selected">گزیده</string>
     <string name="category">دسته</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3234f25bb..91bc02bd5 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -617,13 +617,6 @@
     <string name="app_list_all">Kaikki sovellukset</string>
     <string name="app_list_author">Tekjiän %s sovellukset</string>
     <string name="search_placeholder">Etsi…</string>
-    <string name="category_group_wallets">Raha ja lompakot</string>
-    <string name="category_group_media">Viihde ja media</string>
-    <string name="category_group_communication">Viestintä</string>
-    <string name="category_group_device">Laite</string>
-    <string name="category_group_network">Verkko</string>
-    <string name="category_group_storage">Tiedostot ja tallennus</string>
-    <string name="category_group_misc">Sekalaiset</string>
     <string name="author_by">Tekijältä %1$s</string>
     <string name="last_updated">Viimeksi päivitetty: %1$s</string>
     <string name="last_updated_with_size">Viimeksi päivitetty: %1$s (%2$s)</string>
@@ -643,8 +636,6 @@
     <string name="my_apps_header_apps_with_issue">Sovellukset, joissa on ongelmia</string>
     <string name="my_apps_ignore_dialog_title">Piilota tapaus</string>
     <string name="my_apps_ignore_dialog_text">Ongelma sovelluksen \"%1$s\" versiossa ohitetaan</string>
-    <string name="category_group_productivity">Tuottavuus</string>
-    <string name="category_group_tools">Työkalut</string>
     <string name="app_name_full_nightly">F-Öinen</string>
     <string name="app_name_basic_nightly">F-Öinen Perus</string>
     <string name="menu_discover">Löydä</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c935b9966..ecb8649a2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -655,16 +655,6 @@
     <string name="app_list_author">Applications de %s</string>
     <string name="search_placeholder">Rechercher…</string>
     <string name="search_no_results">Aucune application trouvée\n\nEssayez d\'utiliser moins de termes de recherche ou d\'ajouter d\'autres dépôts</string>
-    <string name="category_group_productivity">Productivité</string>
-    <string name="category_group_tools">Outils</string>
-    <string name="category_group_wallets">Finances &amp; Portefeuilles</string>
-    <string name="category_group_media">Divertissement &amp; Médias</string>
-    <string name="category_group_communication">Communication</string>
-    <string name="category_group_device">Appareil</string>
-    <string name="category_group_network">Réseau</string>
-    <string name="category_group_storage">Fichiers &amp; Stockage</string>
-    <string name="category_group_interests">Intérêts</string>
-    <string name="category_group_misc">Divers</string>
     <string name="author_by">De %1$s</string>
     <string name="last_updated">Dernière mise à jour : %1$s</string>
     <string name="last_updated_with_size">Dernière mise à jour : %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index 2922ad326..a2c8671e1 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -685,16 +685,6 @@
     <string name="app_list_author">Aipeanna ó %s</string>
     <string name="search_placeholder">Cuardaigh…</string>
     <string name="search_no_results">Níor aimsíodh aon aipeanna\n\nBain triail as níos lú téarmaí cuardaigh nó cuir níos mó stórtha leis</string>
-    <string name="category_group_productivity">Táirgiúlacht</string>
-    <string name="category_group_tools">Uirlisí</string>
-    <string name="category_group_wallets">Airgeadas &amp; Sparán</string>
-    <string name="category_group_media">Siamsaíocht &amp; Meáin</string>
-    <string name="category_group_communication">Cumarsáid</string>
-    <string name="category_group_device">Gléas</string>
-    <string name="category_group_network">Líonra</string>
-    <string name="category_group_storage">Comhaid &amp; Stóráil</string>
-    <string name="category_group_interests">Leasanna</string>
-    <string name="category_group_misc">Ilghnéitheach</string>
     <string name="author_by">Faoi %1$s</string>
     <string name="last_updated">Nuashonraithe go deireanach: %1$s</string>
     <string name="last_updated_with_size">Nuashonraithe go deireanach: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 07f7f59ff..8db61c66c 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -591,7 +591,4 @@
     <string name="app_list_author">Aplicacións por %s</string>
     <string name="search_placeholder">Buscar…</string>
     <string name="search_no_results">Non se atoparon aplicacións\n\nIntente usar menos termos de busca ou engadir máis repositorios</string>
-    <string name="category_group_productivity">Produtividade</string>
-    <string name="category_group_tools">Ferramentas</string>
-    <string name="category_group_wallets">Finanzas e carteiras</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 35816a64c..f002672e0 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -673,16 +673,6 @@
     <string name="app_list_author">יישמונים על ידי %s</string>
     <string name="search_placeholder">חפש…</string>
     <string name="search_no_results">לא נמצאו יישומונים\n\nנסו להשתמש בפחות מילות חיפוש או להוסיף עוד מאגרים</string>
-    <string name="category_group_productivity">הפקה</string>
-    <string name="category_group_tools">כלים</string>
-    <string name="category_group_wallets">כלכלה וארנקים</string>
-    <string name="category_group_media">בידור ומדיה</string>
-    <string name="category_group_communication">תקשורת</string>
-    <string name="category_group_device">מכשיר</string>
-    <string name="category_group_network">רשת</string>
-    <string name="category_group_storage">קבצים ואחסון</string>
-    <string name="category_group_interests">תחומי עניין</string>
-    <string name="category_group_misc">שונות</string>
     <string name="author_by">על ידי %1$s</string>
     <string name="last_updated">עדכון אחרון: %1$s</string>
     <string name="last_updated_with_size">עדכון אחרון: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 907c8d2d5..2b9e7e0c6 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -647,16 +647,6 @@
     <string name="app_list_author">Aplikacije od %s</string>
     <string name="search_placeholder">Pretraga …</string>
     <string name="search_no_results">Nije pronađena nijedna aplikacija\n\nPokušaj koristiti manje pojmova za pretraživanje ili dodaj više repozitorija</string>
-    <string name="category_group_productivity">Produktivnost</string>
-    <string name="category_group_tools">Alati</string>
-    <string name="category_group_wallets">Financije i novčanici</string>
-    <string name="category_group_media">Zabava i mediji</string>
-    <string name="category_group_communication">Komunikacija</string>
-    <string name="category_group_device">Uređaj</string>
-    <string name="category_group_network">Mreža</string>
-    <string name="category_group_storage">Datoteke i spremišta</string>
-    <string name="category_group_interests">Interesi</string>
-    <string name="category_group_misc">Razno</string>
     <string name="author_by">Autor: %1$s</string>
     <string name="last_updated">Zadnje aktualiziranje: %1$s</string>
     <string name="last_updated_with_size">Zadnje aktualiziranje: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 7ab8d8498..8e7fd42e7 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -630,16 +630,6 @@
     <string name="app_list_author">Alkalmazások %s szerint</string>
     <string name="search_placeholder">Keres…</string>
     <string name="search_no_results">Nincs találat\n\nPróbálj meg kevesebb keresési kifejezést használni, vagy adjon hozzá több alkalmazás-tárolót</string>
-    <string name="category_group_productivity">Termelékenység</string>
-    <string name="category_group_tools">Eszközök</string>
-    <string name="category_group_wallets">Pénzügyek és pénztárcák</string>
-    <string name="category_group_media">Szórakozás és média</string>
-    <string name="category_group_communication">Kommunikáció</string>
-    <string name="category_group_device">Eszköz</string>
-    <string name="category_group_network">Hálózat</string>
-    <string name="category_group_storage">Fájlok és tárolók</string>
-    <string name="category_group_interests">Érdeklődési kör</string>
-    <string name="category_group_misc">Egyéb</string>
     <string name="author_by">%1$s -től</string>
     <string name="last_updated">Utolsó frissítés: %1$s</string>
     <string name="last_updated_with_size">Utolsó frissítés: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 45b35d7ee..017a25d79 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -633,16 +633,6 @@
     <string name="app_list_author">Aplikasi oleh %s</string>
     <string name="search_placeholder">Cari…</string>
     <string name="search_no_results">Tidak ada aplikasi ditemukan\n\nCoba gunakan lebih sedikit kata kunci atau tambahkan lebih banyak repositori</string>
-    <string name="category_group_productivity">Produktifitas</string>
-    <string name="category_group_tools">Alat</string>
-    <string name="category_group_wallets">Keuangan &amp; Dompet</string>
-    <string name="category_group_media">Hiburan &amp; Media</string>
-    <string name="category_group_communication">Komunikasi</string>
-    <string name="category_group_device">Perangkat</string>
-    <string name="category_group_network">Jaringan</string>
-    <string name="category_group_storage">Fail &amp; Penyimpanan</string>
-    <string name="category_group_interests">Minat</string>
-    <string name="category_group_misc">Lain-Lain</string>
     <string name="author_by">Oleh %1$s</string>
     <string name="last_updated">Terakhir diperbarui: %1$s</string>
     <string name="last_updated_with_size">Terakhir diperbarui: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 37eaab009..3561af7a5 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -629,16 +629,6 @@
     <string name="app_list_author">Forrit frá %s</string>
     <string name="search_placeholder">Leita…</string>
     <string name="search_no_results">Engin forrit fundust\n\nPrófaðu með færri leitarorð eða bættu við gagnasöfnum</string>
-    <string name="category_group_productivity">Framleiðni</string>
-    <string name="category_group_tools">Verkfæri</string>
-    <string name="category_group_wallets">Fjármál og veski</string>
-    <string name="category_group_media">Afþreying og miðlun</string>
-    <string name="category_group_communication">Samskipti</string>
-    <string name="category_group_device">Tæki</string>
-    <string name="category_group_network">Netkerfi</string>
-    <string name="category_group_storage">Skrár og geymslurými</string>
-    <string name="category_group_interests">Áhugamál</string>
-    <string name="category_group_misc">Ýmislegt</string>
     <string name="author_by">Frá %1$s</string>
     <string name="last_updated">Síðast uppfært: %1$s</string>
     <string name="last_updated_with_size">Síðast uppfært: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 97c1f51ec..66f915dff 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -663,16 +663,6 @@
     <string name="app_list_author">App per %s</string>
     <string name="search_placeholder">Cerca…</string>
     <string name="search_no_results">Nessuna app trovata\n\nProva a usare meno termini di ricerca o aggiungere più repository</string>
-    <string name="category_group_productivity">Produttività</string>
-    <string name="category_group_tools">Strumenti</string>
-    <string name="category_group_wallets">Finanze e Portafogli</string>
-    <string name="category_group_media">Intrattenimento &amp; Media</string>
-    <string name="category_group_communication">Comunicazione</string>
-    <string name="category_group_device">Dispositivo</string>
-    <string name="category_group_network">Rete</string>
-    <string name="category_group_storage">Archiviazione</string>
-    <string name="category_group_interests">Interessi</string>
-    <string name="category_group_misc">Miscellanea</string>
     <string name="author_by">Da %1$s</string>
     <string name="last_updated">Ultimo aggiornamento: %1$s</string>
     <string name="last_updated_with_size">Ultimo aggiornamento: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3966fd893..00b767bdf 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -634,16 +634,6 @@
     <string name="app_list_author">%s によるアプリ</string>
     <string name="search_placeholder">検索…</string>
     <string name="search_no_results">アプリが見つかりませんでした\n\nリポジトリを追加するか検索語を減らしてみて下さい</string>
-    <string name="category_group_productivity">生産性</string>
-    <string name="category_group_tools">ツール</string>
-    <string name="category_group_wallets">財布＆財務</string>
-    <string name="category_group_media">エンタメ＆メディア</string>
-    <string name="category_group_communication">交流</string>
-    <string name="category_group_device">デバイス</string>
-    <string name="category_group_network">通信</string>
-    <string name="category_group_storage">ファイル＆ストレージ</string>
-    <string name="category_group_interests">趣味</string>
-    <string name="category_group_misc">その他</string>
     <string name="author_by">%1$s による</string>
     <string name="last_updated">最終更新: %1$s</string>
     <string name="last_updated_with_size">最終更新: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 2123d1285..d04c43872 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -395,13 +395,10 @@
     <string name="my_apps_ignore_dialog_button">Seggelmes</string>
     <string name="search_placeholder">Nadi…</string>
     <string name="call_to_action_keepandroidopen_url">https://keepandroidopen.org</string>
-    <string name="category_group_network">Aẓeṭṭa</string>
     <plurals name="repo_num_apps_text">
         <item quantity="one">%d n wesnas</item>
         <item quantity="other">%d n yesnasen</item>
     </plurals>
-    <string name="category_group_tools">Ifecka</string>
-    <string name="category_group_device">Ibenk</string>
     <string name="donate_title">Mudd tawsa</string>
     <string name="category">Taggayt</string>
     <string name="pref_category_network">Aẓeṭṭa</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ad887e082..8550dbd92 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -625,16 +625,6 @@
     <string name="app_list_author">%s의 앱</string>
     <string name="search_placeholder">검색…</string>
     <string name="search_no_results">앱을 찾을 수 없음\n\n검색어를 줄이거나 다른 저장소를 추가하세요</string>
-    <string name="category_group_productivity">생산성</string>
-    <string name="category_group_tools">도구</string>
-    <string name="category_group_wallets">금융 &amp; 지갑</string>
-    <string name="category_group_media">엔터테인먼트 &amp; 미디어</string>
-    <string name="category_group_communication">통신</string>
-    <string name="category_group_device">기기</string>
-    <string name="category_group_network">네트워크</string>
-    <string name="category_group_storage">파일 &amp; 저장소</string>
-    <string name="category_group_interests">관심분야</string>
-    <string name="category_group_misc">기타</string>
     <string name="author_by">개발자: %1$s</string>
     <string name="last_updated">마지막 업데이트: %1$s</string>
     <string name="last_updated_with_size">마지막 업데이트: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index cae87bfcb..588978db1 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -601,16 +601,6 @@
     <string name="app_list_author">%s sukurtos programėlės</string>
     <string name="search_placeholder">Ieškoti…</string>
     <string name="search_no_results">Nerastos programėlės\n\nPamėginkite naudoti mažiau paieškos žodžių arba įtraukite daugiau saugyklų</string>
-    <string name="category_group_productivity">Produktyvumas</string>
-    <string name="category_group_tools">Įrankiai</string>
-    <string name="category_group_wallets">Finansai ir piniginės</string>
-    <string name="category_group_media">Pramogos ir multimedija</string>
-    <string name="category_group_communication">Komunikacija</string>
-    <string name="category_group_device">Įrenginys</string>
-    <string name="category_group_network">Tinklas</string>
-    <string name="category_group_storage">Failai ir saugykla</string>
-    <string name="category_group_interests">Pomėgiai</string>
-    <string name="category_group_misc">Kiti</string>
     <string name="author_by">Sukurta %1$s</string>
     <string name="last_updated">Paskutinį kartą atnaujinta: %1$s</string>
     <string name="last_updated_with_size">Paskutinį kartą atnaujinta: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 48f96dbf6..9eabffbeb 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -639,15 +639,6 @@
     <string name="app_list_author">Lietotnes no %s</string>
     <string name="search_placeholder">Meklēt…</string>
     <string name="search_no_results">Neviena lietotne netika atrasta\n\nJāmēģina izmantot vienkāršāks meklēšanas vaicājums vai jāpievieno vairāk glabātavu</string>
-    <string name="category_group_productivity">Ražīgums</string>
-    <string name="category_group_tools">Rīki</string>
-    <string name="category_group_wallets">Nauda un maki</string>
-    <string name="category_group_media">Izklaide un mediji</string>
-    <string name="category_group_communication">Saziņa</string>
-    <string name="category_group_device">Ierīce</string>
-    <string name="category_group_network">Tīkls</string>
-    <string name="category_group_storage">Datnes un krātuve</string>
-    <string name="category_group_misc">Dažādi</string>
     <string name="author_by">No %1$s</string>
     <string name="last_updated">Pēdējoreiz atjaunināta: %1$s</string>
     <string name="last_updated_with_size">Pēdējoreiz atjaunināta: %1$s (%2$s)</string>
@@ -662,7 +653,6 @@
     <string name="my_apps_header_apps_with_issue">Lietotnes ar nepilnībām</string>
     <string name="my_apps_ignore_dialog_title">Paslēpt nepilnību</string>
     <string name="my_apps_ignore_dialog_text">Nepilnība šajā “%1$s” versijā netiks ņemta vērā</string>
-    <string name="category_group_interests">Intereses</string>
     <string name="ipfsgw_summary_new">Lejupielādēt lietotnes no IPFS tīmekļa galamērķiem</string>
     <string name="first_start_intro">Lai uzsāktu, jāvienādo lietotņu glabātavas</string>
 </resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index e03e44546..8963f18f8 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -296,16 +296,6 @@
     <string name="app_list_author">Апликации од%s</string>
     <string name="search_placeholder">Пребарувај…</string>
     <string name="search_no_results">Не се пронајдени апликации\n\nПробај да употребиш помали термини или додај нови репо</string>
-    <string name="category_group_productivity">Продуктивност</string>
-    <string name="category_group_tools">Алатки</string>
-    <string name="category_group_wallets">Финансии и новчаник</string>
-    <string name="category_group_media">Забава и медија</string>
-    <string name="category_group_communication">Комуникација</string>
-    <string name="category_group_device">Уред</string>
-    <string name="category_group_network">Мрежа</string>
-    <string name="category_group_storage">Датотеки и меморија</string>
-    <string name="category_group_interests">Интереси</string>
-    <string name="category_group_misc">Останато</string>
     <string name="author_by">Направено од %1$s</string>
     <string name="last_updated">Последно надоградено: %1$s</string>
     <string name="last_updated_with_size">Последно надоградено: %1$s­%2$s</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 5b46c02da..0f9e78794 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -644,16 +644,6 @@
     <string name="app_list_author">Apper fra %s</string>
     <string name="search_placeholder">Søk…</string>
     <string name="search_no_results">Ingen apper funnet\n\nPrøv å bruke færre søkeord eller legg til flere pakkebrønner</string>
-    <string name="category_group_productivity">Produktivitet</string>
-    <string name="category_group_tools">Verktøy</string>
-    <string name="category_group_wallets">Finans &amp; Lommebøker</string>
-    <string name="category_group_media">Underholdning &amp; Medier</string>
-    <string name="category_group_communication">Kommunikasjon</string>
-    <string name="category_group_device">Enhet</string>
-    <string name="category_group_network">Nettverk</string>
-    <string name="category_group_storage">Filer &amp; Lagring</string>
-    <string name="category_group_interests">Interesser</string>
-    <string name="category_group_misc">Diverse</string>
     <string name="author_by">Fra %1$s</string>
     <string name="last_updated">Sist oppdatert: %1$s</string>
     <string name="last_updated_with_size">Sist oppdatert: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c5d22d18d..0992923ec 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -636,16 +636,6 @@
     <string name="search_placeholder">Zoeken…</string>
     <string name="first_start_loading">App gegevensbanken binnenhalen…</string>
     <string name="search_no_results">Geen apps gevonden\n\nProbeer minder zoektermen of voeg meer gegevensbanken toe</string>
-    <string name="category_group_productivity">Productiviteit</string>
-    <string name="category_group_tools">Hulpmiddelen</string>
-    <string name="category_group_wallets">Financiën &amp; Wallets</string>
-    <string name="category_group_media">Entertainment &amp; Media</string>
-    <string name="category_group_communication">Communicatie</string>
-    <string name="category_group_device">Apparaat</string>
-    <string name="category_group_network">Netwerk</string>
-    <string name="category_group_storage">Bestanden &amp; Opslag</string>
-    <string name="category_group_interests">Interesses</string>
-    <string name="category_group_misc">Diversen</string>
     <string name="author_by">Door %1$s</string>
     <string name="last_updated">Laatst geüpdatet: %1$s</string>
     <string name="last_updated_with_size">Laatst geüpdatet: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 22d5134d1..96a0156c4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -673,16 +673,6 @@
     <string name="app_list_author">Aplikacje od %s</string>
     <string name="search_placeholder">Szukaj…</string>
     <string name="search_no_results">Nie znaleziono aplikacji\n\nSpróbuj użyć mniejszej liczby terminów wyszukiwania lub dodaj więcej repozytoriów</string>
-    <string name="category_group_productivity">Produktywność</string>
-    <string name="category_group_tools">Narzędzia</string>
-    <string name="category_group_wallets">Finanse i portfele</string>
-    <string name="category_group_media">Rozrywka i multimedia</string>
-    <string name="category_group_communication">Komunikacja</string>
-    <string name="category_group_device">Urządzenie</string>
-    <string name="category_group_network">Sieć</string>
-    <string name="category_group_storage">Pliki i pamięć</string>
-    <string name="category_group_interests">Zainteresowania</string>
-    <string name="category_group_misc">Różne</string>
     <string name="author_by">Przez %1$s</string>
     <string name="last_updated">Ostatnia aktualizacja: %1$s</string>
     <string name="last_updated_with_size">Ostatnia aktualizacja: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e5211b485..120edb959 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -645,14 +645,6 @@
     <string name="app_list_author">Apps por %s</string>
     <string name="search_placeholder">Buscar…</string>
     <string name="search_no_results">Nenhum app encontrado\n\nTente usar menos termos na busca ou adicione mais repositórios</string>
-    <string name="category_group_productivity">Produtividade</string>
-    <string name="category_group_tools">Ferramentas</string>
-    <string name="category_group_wallets">Finanças &amp; Carteiras</string>
-    <string name="category_group_media">Entretenimento &amp; Mídia</string>
-    <string name="category_group_communication">Comunicações</string>
-    <string name="category_group_device">Dispositivo</string>
-    <string name="category_group_storage">Arquivos &amp; Armazenamento</string>
-    <string name="category_group_interests">Interesses</string>
     <string name="author_by">Por %1$s</string>
     <string name="last_updated_with_size">Última atualização: %1$s (%2$s)</string>
     <string name="status_install_preparing">Preparando instalação…</string>
@@ -663,8 +655,6 @@
     <string name="technical_info">Informações técnicas</string>
     <string name="package_name">Nome do pacote:</string>
     <string name="installed_version">Versão instalada:</string>
-    <string name="category_group_network">Rede</string>
-    <string name="category_group_misc">Diversos</string>
     <string name="last_updated">Última atualização: %1$s</string>
     <string name="ipfsgw_summary_new">Baixe aplicativos usando endpoints web do IPFS</string>
     <string name="first_start_intro">Para começar, sincronize os repositórios de apps</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ccf14c408..44147e720 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -640,16 +640,6 @@
     <string name="app_list_author">Apps por %s</string>
     <string name="search_placeholder">Procurar…</string>
     <string name="search_no_results">Nenhuma aplicação encontrada\n\nTente utilizar menos termos de pesquisa ou adicione mais repositórios</string>
-    <string name="category_group_productivity">Produtividade</string>
-    <string name="category_group_tools">Ferramentas</string>
-    <string name="category_group_wallets">Finanças &amp; carteiras</string>
-    <string name="category_group_media">Entretenimento &amp; média</string>
-    <string name="category_group_communication">Comunicação</string>
-    <string name="category_group_device">Dispositivo</string>
-    <string name="category_group_network">Rede</string>
-    <string name="category_group_storage">Ficheiros &amp; armazenamento</string>
-    <string name="category_group_interests">Interesses</string>
-    <string name="category_group_misc">Diversos</string>
     <string name="author_by">Por %1$s</string>
     <string name="last_updated">Última atualização: %1$s</string>
     <string name="last_updated_with_size">Última atualização: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 32ba51497..c1929c710 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -654,16 +654,6 @@
     <string name="filter_selected">escolhido</string>
     <string name="category">Categoria</string>
     <string name="clear">Limpar</string>
-    <string name="category_group_productivity">Produtividade</string>
-    <string name="category_group_tools">Ferramentas</string>
-    <string name="category_group_wallets">Finanças &amp; carteiras</string>
-    <string name="category_group_media">Entretenimento &amp; média</string>
-    <string name="category_group_communication">Comunicação</string>
-    <string name="category_group_device">Dispositivo</string>
-    <string name="category_group_network">Rede</string>
-    <string name="category_group_storage">Ficheiros &amp; armazenamento</string>
-    <string name="category_group_interests">Interesses</string>
-    <string name="category_group_misc">Diversos</string>
     <string name="author_by">Por %1$s</string>
     <string name="last_updated">Última atualização: %1$s</string>
     <string name="last_updated_with_size">Última atualização: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 91a759cfc..34c8ee6d6 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -650,16 +650,6 @@
     <string name="app_list_author">Aplicații de la %s</string>
     <string name="search_placeholder">Căutare…</string>
     <string name="search_no_results">Nu s-au găsit aplicații\n\nÎncercați să utilizați mai puțini termeni de căutare sau adăugați mai multe depozite</string>
-    <string name="category_group_productivity">Productivitate</string>
-    <string name="category_group_tools">Unelte</string>
-    <string name="category_group_wallets">Finanțe și Portofele</string>
-    <string name="category_group_media">Divertisment și media</string>
-    <string name="category_group_communication">Comunicare</string>
-    <string name="category_group_device">Dispozitiv</string>
-    <string name="category_group_network">Rețea</string>
-    <string name="category_group_storage">Fișiere și stocare</string>
-    <string name="category_group_interests">Pasiuni</string>
-    <string name="category_group_misc">Diverse</string>
     <string name="author_by">De către %1$s</string>
     <string name="last_updated">Ultima actualizare: %1$s</string>
     <string name="last_updated_with_size">Ultima actualizare: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 42a2b193d..69e7cecb3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -654,16 +654,6 @@
     <string name="app_list_author">Приложения от %s</string>
     <string name="search_placeholder">Поиск…</string>
     <string name="search_no_results">Приложений не найдено\n\nПопробуйте использовать меньше поисковых запросов или добавить больше репозиториев</string>
-    <string name="category_group_productivity">Производительность</string>
-    <string name="category_group_tools">Инструменты</string>
-    <string name="category_group_wallets">Финансы и кошельки</string>
-    <string name="category_group_media">Развлечения и СМИ</string>
-    <string name="category_group_communication">Коммуникация</string>
-    <string name="category_group_device">Устройство</string>
-    <string name="category_group_network">Сеть</string>
-    <string name="category_group_storage">Файлы и хранилище</string>
-    <string name="category_group_interests">Интересы</string>
-    <string name="category_group_misc">Разное</string>
     <string name="author_by">От %1$s</string>
     <string name="last_updated">Последнее обновление: %1$s</string>
     <string name="last_updated_with_size">Последнее обновление: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index f63ae2b2d..ddd9f22e8 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -578,16 +578,6 @@
     <string name="app_list_author">Aplikácie od vyvojára %s</string>
     <string name="search_placeholder">Vyhľadať…</string>
     <string name="search_no_results">Nenašli sa žiadne aplikácie\n\nSkúste použiť menej slov alebo pridať ďalšie repozitáre</string>
-    <string name="category_group_productivity">Produktivita</string>
-    <string name="category_group_tools">Nástroje</string>
-    <string name="category_group_wallets">Financie a peňaženky</string>
-    <string name="category_group_media">Zábava a média</string>
-    <string name="category_group_communication">Komunikácia</string>
-    <string name="category_group_device">Zariadenie</string>
-    <string name="category_group_network">Sieť</string>
-    <string name="category_group_storage">Súbory a uložisko</string>
-    <string name="category_group_interests">Záujmy</string>
-    <string name="category_group_misc">Rôzne</string>
     <string name="author_by">Od %1$s</string>
     <string name="last_updated">Naposledy aktualizované: %1$s</string>
     <string name="last_updated_with_size">Naposledy aktualizované: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 160e6c1eb..2e10477cd 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -552,16 +552,6 @@
     <string name="app_list_author">Aplikacije avtorja %s</string>
     <string name="search_placeholder">Iskanje …</string>
     <string name="search_no_results">Ni najdenih aplikacij\n\nPoskusite uporabiti manj iskalnih izrazov ali dodajte več repozitorijev</string>
-    <string name="category_group_productivity">Produktivnost</string>
-    <string name="category_group_tools">Orodja</string>
-    <string name="category_group_wallets">Finance in denarnice</string>
-    <string name="category_group_media">Zabava in mediji</string>
-    <string name="category_group_communication">Komunikacija</string>
-    <string name="category_group_device">Naprava</string>
-    <string name="category_group_network">Omrežje</string>
-    <string name="category_group_storage">Datoteke in shranjevanje</string>
-    <string name="category_group_interests">Interesi</string>
-    <string name="category_group_misc">Razno</string>
     <string name="author_by">Od %1$s</string>
     <string name="last_updated">Zadnja posodobitev: %1$s</string>
     <string name="last_updated_with_size">Zadnja posodobitev: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index e5f40f5e3..294f41371 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -627,15 +627,6 @@
     <string name="app_list_author">Aplikacione nga %s</string>
     <string name="search_placeholder">Kërkoni…</string>
     <string name="search_no_results">S’u gjetën aplikacione\n\nProvoni të përdorni më pak terma kërkimi, ose të shtoni më tepër depo</string>
-    <string name="category_group_tools">Mjete</string>
-    <string name="category_group_wallets">Financa &amp; Kuleta</string>
-    <string name="category_group_media">Spektakël &amp; Media</string>
-    <string name="category_group_communication">Komunikim</string>
-    <string name="category_group_device">Pajisje</string>
-    <string name="category_group_network">Rrjet</string>
-    <string name="category_group_storage">Kartela &amp; Depozitim</string>
-    <string name="category_group_interests">Interesa</string>
-    <string name="category_group_misc">Të ndryshme</string>
     <string name="author_by">Nga %1$s</string>
     <string name="last_updated">Përditësuar së fundi më: %1$s</string>
     <string name="anti_features_title">Ky aplikacion përmban anti-veçori</string>
@@ -648,7 +639,6 @@
     <string name="my_apps_ignore_dialog_text">Problemi me këtë version të “%1$s” do të shpërfillet</string>
     <string name="my_apps_ignore_dialog_button">Fshihe</string>
     <string name="my_apps_export_installed_apps">Eksportoni listë aplikacionesh</string>
-    <string name="category_group_productivity">Prodhimtari</string>
     <string name="ipfsgw_summary_new">Shkarkoni aplikacione duke përdorur pikëmbarime web IPFS</string>
     <string name="first_start_intro">Që t’ia fillohet, njëkohësoni depot e aplikacioneve</string>
     <string name="first_start_offline">Jeni jashtë linje. Që t’ia fillohet, lidhuni në Internet.</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 1efb8dc81..9ec33c0be 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -626,16 +626,6 @@
     <string name="app_list_author">Апликације од %s</string>
     <string name="search_placeholder">Претражи…</string>
     <string name="search_no_results">Нема пронађених апликација.\n\nПокушајте да користите мање појмова за претрагу или додајте још складишта</string>
-    <string name="category_group_productivity">Продуктивност</string>
-    <string name="category_group_tools">Алати</string>
-    <string name="category_group_wallets">Финансије и новчаници</string>
-    <string name="category_group_media">Забава и садржај</string>
-    <string name="category_group_communication">Комуникација</string>
-    <string name="category_group_device">Уређај</string>
-    <string name="category_group_network">Мрежа</string>
-    <string name="category_group_storage">Датотеке и складиште</string>
-    <string name="category_group_interests">Интересовања</string>
-    <string name="category_group_misc">Разно</string>
     <string name="author_by">Од %1$s</string>
     <string name="last_updated">Последње ажурирање: %1$s</string>
     <string name="last_updated_with_size">Последње ажурирано: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f6aa08b7a..4527b52c4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -644,16 +644,6 @@
     <string name="app_list_author">Appar från %s</string>
     <string name="search_placeholder">Sök…</string>
     <string name="search_no_results">Inga appar hittades\n\nFörsök att använda färre söktermer eller lägga till fler förråd</string>
-    <string name="category_group_productivity">Produktivitet</string>
-    <string name="category_group_tools">Verktyg</string>
-    <string name="category_group_wallets">Ekonomi &amp; plånböcker</string>
-    <string name="category_group_media">Underhållning &amp; media</string>
-    <string name="category_group_communication">Kommunikation</string>
-    <string name="category_group_device">Enhet</string>
-    <string name="category_group_network">Nätverk</string>
-    <string name="category_group_storage">Filer &amp; lagring</string>
-    <string name="category_group_interests">Intressen</string>
-    <string name="category_group_misc">Diverse</string>
     <string name="author_by">Av %1$s</string>
     <string name="last_updated">Senast uppdaterad: %1$s</string>
     <string name="last_updated_with_size">Senast uppdaterad: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 4429586d2..1b97f2a92 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -600,16 +600,6 @@
     <string name="app_list_recently_updated">Zilizosasishwa hivi karibuni</string>
     <string name="app_list_all">Programu zote</string>
     <string name="search_placeholder">Tafuta</string>
-    <string name="category_group_productivity">Uzalishaji</string>
-    <string name="category_group_tools">Zana</string>
-    <string name="category_group_wallets">Fedha na Pochi</string>
-    <string name="category_group_media">Burudani na Vyombo vya Habari</string>
-    <string name="category_group_communication">Mawasiliano</string>
-    <string name="category_group_device">Kifaa</string>
-    <string name="category_group_network">Mtandao</string>
-    <string name="category_group_storage">Faili na Hifadhi</string>
-    <string name="category_group_interests">Maslahi</string>
-    <string name="category_group_misc">Mengineyo</string>
     <string name="last_updated">Ilisasishwa mwisho: %1$s</string>
     <string name="whats_new_title">Nini kipya</string>
     <string name="donate_title">Changia</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 159aca14e..3a3a56990 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -630,11 +630,6 @@
     <string name="menu_discover">Keşfet</string>
     <string name="menu_apps_my">Uygulamalarım</string>
     <string name="my_apps_ignore_dialog_button">Gizle</string>
-    <string name="category_group_productivity">Üretkenlik</string>
-    <string name="category_group_tools">Araçlar</string>
-    <string name="category_group_media">Eğlence &amp; Medya</string>
-    <string name="category_group_communication">İletişim</string>
-    <string name="category_group_interests">İlgi Alanları</string>
     <string name="author_by">%1$s tarafından</string>
     <string name="app_name_full_nightly">F-Nightly</string>
     <string name="app_name_basic_nightly">F-Nightly Temel</string>
@@ -651,11 +646,6 @@
     <string name="app_list_author">%s tarafından uygulamalar</string>
     <string name="search_placeholder">Ara…</string>
     <string name="search_no_results">Herhangi bir uygulama bulunamadı \n\nDaha az arama terimi kullanmayı ya da daha fazla depo eklemeyi deneyin</string>
-    <string name="category_group_wallets">Finans ve Cüzdanlar</string>
-    <string name="category_group_device">Cihaz</string>
-    <string name="category_group_network">Ağ</string>
-    <string name="category_group_storage">Dosyalar ve Depolama</string>
-    <string name="category_group_misc">Çeşitli</string>
     <string name="last_updated">En son güncelleme: %1$s</string>
     <string name="last_updated_with_size">En son güncelleme: %1$s (%2$s)</string>
     <string name="status_install_preparing">Yüklemeye hazırlanılıyor…</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0365920b9..2d33f886c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -655,16 +655,6 @@
     <string name="app_list_author">Додатки від %s</string>
     <string name="search_placeholder">Пошук…</string>
     <string name="search_no_results">Не знайдено жодних програм\n\nСпробуйте використовувати менше пошукових термінів або додати більше репозиторіїв</string>
-    <string name="category_group_productivity">Продуктивність</string>
-    <string name="category_group_tools">Інструменти</string>
-    <string name="category_group_wallets">Фінанси та гаманці</string>
-    <string name="category_group_media">Розваги та медіа</string>
-    <string name="category_group_communication">Комунікація</string>
-    <string name="category_group_device">Пристрій</string>
-    <string name="category_group_network">Мережа</string>
-    <string name="category_group_storage">Файли та зберігання</string>
-    <string name="category_group_interests">Інтереси</string>
-    <string name="category_group_misc">Різне</string>
     <string name="author_by">Від %1$s</string>
     <string name="last_updated">Останні оновлено: %1$s</string>
     <string name="last_updated_with_size">Останні оновлено: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index ffc3639ee..82ab286da 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -79,7 +79,6 @@
     <string name="send_version_and_uuid">Versiyasi va UUID\'larni serverlarga jo\'natish</string>
     <string name="send_install_history">O\'rnatish tarixini jo\'natish</string>
     <string name="installed_version">O\'rnatilgan versiya:</string>
-    <string name="category_group_device">Qurulma</string>
     <string name="my_apps_ignore_dialog_button">Yaxshirish</string>
     <string name="menu_about">Haqida</string>
     <string name="menu_apps_my">Mening ilovalarim</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index bda4dcd6c..fc70f2245 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -602,16 +602,6 @@
     <string name="collapse">Thu gọn</string>
     <string name="crash_dialog_title_old">F-Droid đã bị treo</string>
     <string name="technical_info">Thông tin kỹ thuật</string>
-    <string name="category_group_productivity">Năng suất</string>
-    <string name="category_group_tools">Công cụ</string>
-    <string name="category_group_wallets">Tài chính &amp; Ví</string>
-    <string name="category_group_media">Giải trí &amp; Media</string>
-    <string name="category_group_communication">Liên lạc</string>
-    <string name="category_group_device">Thiết bị</string>
-    <string name="category_group_network">Kết nối mạng</string>
-    <string name="category_group_storage">Tệp &amp; Lưu trữ</string>
-    <string name="category_group_interests">Sở thích</string>
-    <string name="category_group_misc">Linh tinh</string>
     <string name="author_by">Bởi %1$s</string>
     <string name="last_updated">Lần cuối cập nhật: %1$s</string>
     <string name="last_updated_with_size">Lần cuối cập nhật: %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 45cbf0726..0ddbfe6c6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -627,16 +627,6 @@
     <string name="app_list_author">%s 的应用</string>
     <string name="search_placeholder">搜索…</string>
     <string name="search_no_results">没找到应用\n\n试试减少搜索词或添加更多存储库</string>
-    <string name="category_group_productivity">生产力</string>
-    <string name="category_group_tools">工具</string>
-    <string name="category_group_wallets">财务和钱包</string>
-    <string name="category_group_media">娱乐和媒体</string>
-    <string name="category_group_communication">通信</string>
-    <string name="category_group_device">设备</string>
-    <string name="category_group_network">网络</string>
-    <string name="category_group_storage">文件和存储</string>
-    <string name="category_group_interests">兴趣</string>
-    <string name="category_group_misc">杂项</string>
     <string name="author_by">由 %1$s 开发</string>
     <string name="last_updated">上次更新：%1$s</string>
     <string name="last_updated_with_size">上次更新： %1$s (%2$s)</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 26b33b752..d505d18c2 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -621,16 +621,6 @@
     <string name="app_list_author">%s 的應用程式</string>
     <string name="search_placeholder">搜尋…</string>
     <string name="search_no_results">找不到應用程式\n\n請嘗試減少搜尋關鍵字或新增軟體庫或</string>
-    <string name="category_group_productivity">生產性</string>
-    <string name="category_group_tools">工具</string>
-    <string name="category_group_wallets">財經與錢包</string>
-    <string name="category_group_media">娛樂與媒體</string>
-    <string name="category_group_communication">通訊</string>
-    <string name="category_group_device">裝置</string>
-    <string name="category_group_network">網路</string>
-    <string name="category_group_storage">檔案與儲存</string>
-    <string name="category_group_interests">興趣</string>
-    <string name="category_group_misc">其他</string>
     <string name="last_updated">最後更新: %1$s</string>
     <string name="last_updated_with_size">最後更新: %1$s (%2$s)</string>
     <string name="status_install_preparing">正在準備安裝…</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 54c3a5624..4cf230cca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,7 +50,9 @@
     <string name="filter">Filter</string>
     <!-- Used for filter chips (e.g. categories) when they are currently selected -->
     <string name="filter_selected">selected</string>
+    <string name="categories_features">Featured Categories</string>
     <string name="category">Category</string>
+    <string name="see_all">See all</string>
     <string name="filter_antifeatures">Hide anti-features</string>
     <string name="onboarding_app_list_filter_title">Filter</string>
     <string name="onboarding_app_list_filter_message">Use filters to only show apps from specific categories or repositories. You can also change the sort order.</string>
@@ -58,17 +60,6 @@
     <string name="clear">Clear</string>
     <string name="hide">Hide</string>
 
-    <string name="category_group_productivity">Productivity</string>
-    <string name="category_group_tools">Tools</string>
-    <string name="category_group_wallets">Finances &amp; Wallets</string>
-    <string name="category_group_media">Entertainment &amp; Media</string>
-    <string name="category_group_communication">Communication</string>
-    <string name="category_group_device">Device</string>
-    <string name="category_group_network">Network</string>
-    <string name="category_group_storage">Files &amp; Storage</string>
-    <string name="category_group_interests">Interests</string>
-    <string name="category_group_misc">Miscellaneous</string>
-
     <!-- Used in app details page to show who is the author of the app -->
     <string name="author_by">By %1$s</string>
     <string name="last_updated">Last updated: %1$s</string>
diff --git a/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt b/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt
index b5926d394..a5b1b93ec 100644
--- a/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt
+++ b/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt
@@ -6,7 +6,6 @@ import com.android.tools.screenshot.PreviewTest
 import org.fdroid.download.NetworkState
 import org.fdroid.repo.RepoUpdateProgress
 import org.fdroid.ui.ScreenshotTest
-import org.fdroid.ui.categories.CategoryGroups
 import org.fdroid.ui.categories.CategoryItem
 
 @Composable
@@ -97,15 +96,12 @@ private fun getLoadedModel(): LoadedDiscoverModel {
       AppDiscoverItem(packageName = "at.bitfire.davdroid", name = "DAVx⁵", isInstalled = false),
     )
   val categories =
-    mapOf(
-      CategoryGroups.communication to
-        listOf(
-          CategoryItem(id = "Contact", name = "Contact"),
-          CategoryItem(id = "Email", name = "Email"),
-          CategoryItem(id = "Forum", name = "Forum"),
-          CategoryItem(id = "Messaging", name = "Messaging"),
-          CategoryItem(id = "Phone & SMS", name = "Phone & SMS"),
-        )
+    listOf(
+      CategoryItem(id = "Contact", name = "Contact"),
+      CategoryItem(id = "Email", name = "Email"),
+      CategoryItem(id = "Forum", name = "Forum"),
+      CategoryItem(id = "Messaging", name = "Messaging"),
+      CategoryItem(id = "Phone & SMS", name = "Phone & SMS"),
     )
   return LoadedDiscoverModel(
     newApps = newApps,
diff --git a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/discover/DiscoverTestKt/DiscoverTest_2ed8e27d_0.png b/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/discover/DiscoverTestKt/DiscoverTest_2ed8e27d_0.png
index 2a344adb7..b26af6832 100644
--- a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/discover/DiscoverTestKt/DiscoverTest_2ed8e27d_0.png
+++ b/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/discover/DiscoverTestKt/DiscoverTest_2ed8e27d_0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bffaab8294637b504398af638e91187ff23640466f9775668ec00490436effe
-size 151906
+oid sha256:ec431c87484108cf9f5680ba6fd5877dc7b8cf9d53aecd8016b89db2ca2582e3
+size 142401