diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c376a4a..05c82de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,11 +30,6 @@ jobs:
             ${{ runner.os }}-gradle-
       - run: flutter pub get
       - run: flutter build apk --release --no-pub
-      - name: Upload Debug APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-debug
-          path: build/app/outputs/flutter-apk/app-release.apk
 
   ios:
     runs-on: macos-latest
diff --git a/lib/l10n/app_bg.arb b/lib/l10n/app_bg.arb
index b88e3ba..3613e85 100644
--- a/lib/l10n/app_bg.arb
+++ b/lib/l10n/app_bg.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Неуспешно изтриване на канала \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "bg",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Контакти",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_removeFromFavorites": "Премахване от списъка с любими",
+  "listFilter_addToFavorites": "Добави към любими",
+  "listFilter_favorites": "Любими"
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index f596ae4..64e8cd3 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -1344,6 +1344,8 @@
   "listFilter_filters": "Filtere",
   "listFilter_all": "Alle",
   "listFilter_favorites": "Favoriten",
+  "listFilter_addToFavorites": "Zu Favoriten hinzufügen",
+  "listFilter_removeFromFavorites": "Aus Favoriten entfernen",
   "listFilter_users": "Benutzer",
   "listFilter_repeaters": "Repeater",
   "listFilter_roomServers": "Raumserver",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 5b15b65..8d9f385 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -1556,6 +1556,8 @@
   "listFilter_filters": "Filters",
   "listFilter_all": "All",
   "listFilter_favorites": "Favorites",
+  "listFilter_addToFavorites": "Add to favorites",
+  "listFilter_removeFromFavorites": "Remove from favorites",
   "listFilter_users": "Users",
   "listFilter_repeaters": "Repeaters",
   "listFilter_roomServers": "Room servers",
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 2f62b54..dd8ce6c 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "No se pudo eliminar el canal \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "es",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contactos",
@@ -1772,5 +1778,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_favorites": "Favoritos",
+  "listFilter_removeFromFavorites": "Eliminar de las favoritas",
+  "listFilter_addToFavorites": "Añadir a favoritos"
 }
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 9eb66e7..fe738f7 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Échec de la suppression de la chaîne \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "fr",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contacts",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_addToFavorites": "Ajouter à mes favoris",
+  "listFilter_removeFromFavorites": "Supprimer des favoris",
+  "listFilter_favorites": "Préférences"
 }
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index e08dd67..d6c02f0 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Impossibile eliminare il canale \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "it",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contatti",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_addToFavorites": "Aggiungi ai preferiti",
+  "listFilter_removeFromFavorites": "Rimuovi dai preferiti",
+  "listFilter_favorites": "Preferiti"
 }
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 5d6a6a2..d64cdb0 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -4778,6 +4778,18 @@ abstract class AppLocalizations {
   /// **'Favorites'**
   String get listFilter_favorites;
 
+  /// No description provided for @listFilter_addToFavorites.
+  ///
+  /// In en, this message translates to:
+  /// **'Add to favorites'**
+  String get listFilter_addToFavorites;
+
+  /// No description provided for @listFilter_removeFromFavorites.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove from favorites'**
+  String get listFilter_removeFromFavorites;
+
   /// No description provided for @listFilter_users.
   ///
   /// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart
index 513cdc3..f9637aa 100644
--- a/lib/l10n/app_localizations_bg.dart
+++ b/lib/l10n/app_localizations_bg.dart
@@ -2729,7 +2729,13 @@ class AppLocalizationsBg extends AppLocalizations {
   String get listFilter_all => 'Всички';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Любими';
+
+  @override
+  String get listFilter_addToFavorites => 'Добави към любими';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Премахване от списъка с любими';
 
   @override
   String get listFilter_users => 'Потребители';
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index bada9f6..1574281 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -2736,6 +2736,12 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get listFilter_favorites => 'Favoriten';
 
+  @override
+  String get listFilter_addToFavorites => 'Zu Favoriten hinzufügen';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Aus Favoriten entfernen';
+
   @override
   String get listFilter_users => 'Benutzer';
 
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index b090c45..039ad22 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -2689,6 +2689,12 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get listFilter_favorites => 'Favorites';
 
+  @override
+  String get listFilter_addToFavorites => 'Add to favorites';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Remove from favorites';
+
   @override
   String get listFilter_users => 'Users';
 
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index ac51330..8961b18 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -2727,7 +2727,13 @@ class AppLocalizationsEs extends AppLocalizations {
   String get listFilter_all => 'Todas';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Favoritos';
+
+  @override
+  String get listFilter_addToFavorites => 'Añadir a favoritos';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Eliminar de las favoritas';
 
   @override
   String get listFilter_users => 'Usuarios';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index 3ca86e6..3737f46 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -2743,7 +2743,13 @@ class AppLocalizationsFr extends AppLocalizations {
   String get listFilter_all => 'Tout';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Préférences';
+
+  @override
+  String get listFilter_addToFavorites => 'Ajouter à mes favoris';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Supprimer des favoris';
 
   @override
   String get listFilter_users => 'Utilisateurs';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index c9900c7..b64ec6d 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -2727,7 +2727,13 @@ class AppLocalizationsIt extends AppLocalizations {
   String get listFilter_all => 'Tutti';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Preferiti';
+
+  @override
+  String get listFilter_addToFavorites => 'Aggiungi ai preferiti';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Rimuovi dai preferiti';
 
   @override
   String get listFilter_users => 'Utenti';
diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart
index 8c537f2..523cd6e 100644
--- a/lib/l10n/app_localizations_nl.dart
+++ b/lib/l10n/app_localizations_nl.dart
@@ -2718,7 +2718,13 @@ class AppLocalizationsNl extends AppLocalizations {
   String get listFilter_all => 'Alles';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Favorieten';
+
+  @override
+  String get listFilter_addToFavorites => 'Toevoegen aan favorieten';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Verwijderen uit favorieten';
 
   @override
   String get listFilter_users => 'Gebruikers';
diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart
index 2c11c82..1639600 100644
--- a/lib/l10n/app_localizations_pl.dart
+++ b/lib/l10n/app_localizations_pl.dart
@@ -2725,7 +2725,13 @@ class AppLocalizationsPl extends AppLocalizations {
   String get listFilter_all => 'Wszystko';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Ulubione';
+
+  @override
+  String get listFilter_addToFavorites => 'Dodaj do ulubionych';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Usuń z ulubionych';
 
   @override
   String get listFilter_users => 'Użytkownicy';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index c2fac6c..c59a4f5 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -2728,7 +2728,13 @@ class AppLocalizationsPt extends AppLocalizations {
   String get listFilter_all => 'Tudo';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Favoritos';
+
+  @override
+  String get listFilter_addToFavorites => 'Adicionar aos favoritos';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Remover da lista de favoritos';
 
   @override
   String get listFilter_users => 'Usuários';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index 9fde3b8..69d6044 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -2731,7 +2731,13 @@ class AppLocalizationsRu extends AppLocalizations {
   String get listFilter_all => 'Все';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Избранное';
+
+  @override
+  String get listFilter_addToFavorites => 'Добавить в избранное';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Удалить из избранного';
 
   @override
   String get listFilter_users => 'Пользователи';
diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart
index 5d31462..17cbd7b 100644
--- a/lib/l10n/app_localizations_sk.dart
+++ b/lib/l10n/app_localizations_sk.dart
@@ -2713,7 +2713,13 @@ class AppLocalizationsSk extends AppLocalizations {
   String get listFilter_all => 'Všetko';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Obľúbené';
+
+  @override
+  String get listFilter_addToFavorites => 'Pridaj do obľúbených';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Odstrániť z označení';
 
   @override
   String get listFilter_users => 'Používatelia';
diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart
index 19934e8..6478b2b 100644
--- a/lib/l10n/app_localizations_sl.dart
+++ b/lib/l10n/app_localizations_sl.dart
@@ -2716,7 +2716,13 @@ class AppLocalizationsSl extends AppLocalizations {
   String get listFilter_all => 'Vse';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Priljubljene';
+
+  @override
+  String get listFilter_addToFavorites => 'Dodaj v priljubljene';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Odstrani iz priljubljenih';
 
   @override
   String get listFilter_users => 'Uporabniki';
diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart
index 04ae835..54b998d 100644
--- a/lib/l10n/app_localizations_sv.dart
+++ b/lib/l10n/app_localizations_sv.dart
@@ -2701,7 +2701,13 @@ class AppLocalizationsSv extends AppLocalizations {
   String get listFilter_all => 'Alla';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Favoriter';
+
+  @override
+  String get listFilter_addToFavorites => 'Lägg till i favoriter';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Ta bort från favoriter';
 
   @override
   String get listFilter_users => 'Användare';
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
index 1c3442d..e3564f1 100644
--- a/lib/l10n/app_localizations_uk.dart
+++ b/lib/l10n/app_localizations_uk.dart
@@ -2738,7 +2738,13 @@ class AppLocalizationsUk extends AppLocalizations {
   String get listFilter_all => 'Все';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => 'Улюблені';
+
+  @override
+  String get listFilter_addToFavorites => 'Додати до улюблених';
+
+  @override
+  String get listFilter_removeFromFavorites => 'Видалити зі списку улюблених';
 
   @override
   String get listFilter_users => 'Користувачі';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 6a9881e..42f9130 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -2583,7 +2583,13 @@ class AppLocalizationsZh extends AppLocalizations {
   String get listFilter_all => '全部';
 
   @override
-  String get listFilter_favorites => 'Favorites';
+  String get listFilter_favorites => '收藏';
+
+  @override
+  String get listFilter_addToFavorites => '添加到收藏';
+
+  @override
+  String get listFilter_removeFromFavorites => '从收藏中移除';
 
   @override
   String get listFilter_users => '用户';
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index cb690fb..fee1f22 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Kan kanaal {name} niet verwijderen",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "nl",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contacten",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_removeFromFavorites": "Verwijderen uit favorieten",
+  "listFilter_favorites": "Favorieten",
+  "listFilter_addToFavorites": "Toevoegen aan favorieten"
 }
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index 2161983..8096bb4 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Nie udało się usunąć kanału \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "pl",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Kontakty",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_removeFromFavorites": "Usuń z ulubionych",
+  "listFilter_addToFavorites": "Dodaj do ulubionych",
+  "listFilter_favorites": "Ulubione"
 }
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 8a02a4d..53f8f93 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Falha ao excluir o canal \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "pt",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contactos",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_addToFavorites": "Adicionar aos favoritos",
+  "listFilter_removeFromFavorites": "Remover da lista de favoritos",
+  "listFilter_favorites": "Favoritos"
 }
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index ab2ed36..b4d7b59 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Не удалось удалить канал {name}.",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "ru",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Контакты",
@@ -984,5 +990,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_addToFavorites": "Добавить в избранное",
+  "listFilter_favorites": "Избранное",
+  "listFilter_removeFromFavorites": "Удалить из избранного"
 }
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
index ff95897..23a0aea 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Kanál \"{name}\" sa nepodarilo odstrániť",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "sk",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Kontakty",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_removeFromFavorites": "Odstrániť z označení",
+  "listFilter_addToFavorites": "Pridaj do obľúbených",
+  "listFilter_favorites": "Obľúbené"
 }
diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb
index bd431d4..6b64f68 100644
--- a/lib/l10n/app_sl.arb
+++ b/lib/l10n/app_sl.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Kanala {name} ni bilo mogoče izbrisati",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "sl",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Stiki",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_favorites": "Priljubljene",
+  "listFilter_removeFromFavorites": "Odstrani iz priljubljenih",
+  "listFilter_addToFavorites": "Dodaj v priljubljene"
 }
diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb
index 86da858..3b96df7 100644
--- a/lib/l10n/app_sv.arb
+++ b/lib/l10n/app_sv.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Det gick inte att ta bort kanalen \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "sv",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Kontakter",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_removeFromFavorites": "Ta bort från favoriter",
+  "listFilter_addToFavorites": "Lägg till i favoriter",
+  "listFilter_favorites": "Favoriter"
 }
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index 691aa8d..78b4a90 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "Не вдалося видалити канал \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "uk",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Контакти",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_removeFromFavorites": "Видалити зі списку улюблених",
+  "listFilter_addToFavorites": "Додати до улюблених",
+  "listFilter_favorites": "Улюблені"
 }
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index f6bb526..259e29b 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -1,6 +1,12 @@
 {
   "channels_channelDeleteFailed": "无法删除频道 \"{name}\"",
-  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "@@locale": "zh",
   "appTitle": "MeshCore Open",
   "nav_contacts": "联系方式",
@@ -1744,5 +1750,8 @@
         "type": "double"
       }
     }
-  }
+  },
+  "listFilter_favorites": "收藏",
+  "listFilter_addToFavorites": "添加到收藏",
+  "listFilter_removeFromFavorites": "从收藏中移除"
 }
diff --git a/lib/screens/contacts_screen.dart b/lib/screens/contacts_screen.dart
index 28e7aa5..e9018a7 100644
--- a/lib/screens/contacts_screen.dart
+++ b/lib/screens/contacts_screen.dart
@@ -518,6 +518,7 @@ class _ContactsScreenState extends State<ContactsScreen>
         })
         .where((group) {
           if (_typeFilter == ContactTypeFilter.all) return true;
+          // Groups don't have a favorite flag, so hide them under favorites filter
           if (_typeFilter == ContactTypeFilter.favorites) return false;
           for (final key in group.memberKeys) {
             final contact = contactsByKey[key];
@@ -1099,8 +1100,8 @@ class _ContactsScreenState extends State<ContactsScreen>
               ),
               title: Text(
                 isFavorite
-                    ? '${context.l10n.common_remove} ${context.l10n.listFilter_favorites}'
-                    : '${context.l10n.common_add} ${context.l10n.listFilter_favorites}',
+                    ? context.l10n.listFilter_removeFromFavorites
+                    : context.l10n.listFilter_addToFavorites,
               ),
               onTap: () async {
                 Navigator.pop(sheetContext);
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 4084d9b..d2ea57e 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -9,7 +9,6 @@ import flutter_blue_plus_darwin
 import flutter_local_notifications
 import mobile_scanner
 import package_info_plus
-import path_provider_foundation
 import share_plus
 import shared_preferences_foundation
 import sqflite_darwin
@@ -21,7 +20,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
-  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
diff --git a/untranslated.json b/untranslated.json
index a6d2937..9e26dfe 100644
--- a/untranslated.json
+++ b/untranslated.json
@@ -1,53 +1 @@
-{
-  "bg": [
-    "listFilter_favorites"
-  ],
-
-  "es": [
-    "listFilter_favorites"
-  ],
-
-  "fr": [
-    "listFilter_favorites"
-  ],
-
-  "it": [
-    "listFilter_favorites"
-  ],
-
-  "nl": [
-    "listFilter_favorites"
-  ],
-
-  "pl": [
-    "listFilter_favorites"
-  ],
-
-  "pt": [
-    "listFilter_favorites"
-  ],
-
-  "ru": [
-    "listFilter_favorites"
-  ],
-
-  "sk": [
-    "listFilter_favorites"
-  ],
-
-  "sl": [
-    "listFilter_favorites"
-  ],
-
-  "sv": [
-    "listFilter_favorites"
-  ],
-
-  "uk": [
-    "listFilter_favorites"
-  ],
-
-  "zh": [
-    "listFilter_favorites"
-  ]
-}
+{}
\ No newline at end of file