diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt
index d3f78e344..ac7cfe9bd 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/favoriteRelays/FavoriteRelayListState.kt
@@ -97,18 +97,18 @@ class FavoriteRelayListState(
         return saveRelayList(current)
     }
 
-    suspend fun saveRelayList(FavoriteRelays: List<NormalizedRelayUrl>): FavoriteRelayListEvent {
+    suspend fun saveRelayList(favoriteRelays: List<NormalizedRelayUrl>): FavoriteRelayListEvent {
         val relayListForFavorite = getFavoriteRelayList()
 
         return if (relayListForFavorite != null && relayListForFavorite.tags.isNotEmpty()) {
             FavoriteRelayListEvent.updateRelayList(
                 earlierVersion = relayListForFavorite,
-                relays = FavoriteRelays,
+                relays = favoriteRelays,
                 signer = signer,
             )
         } else {
             FavoriteRelayListEvent.create(
-                relays = FavoriteRelays,
+                relays = favoriteRelays,
                 signer = signer,
             )
         }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt
index 0160cf2cc..ae4682787 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/controls/PlayPauseButton.kt
@@ -122,7 +122,7 @@ fun PlayPauseButton(
                 Icon(
                     imageVector = Icons.Default.Pause,
                     modifier = Size50Modifier,
-                    contentDescription = stringRes(R.string.play),
+                    contentDescription = stringRes(R.string.pause),
                 )
             }
         }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt
index 538735cda..f67671f58 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/polls/PollDeadlinePicker.kt
@@ -99,7 +99,7 @@ fun PollDeadlinePicker(model: ShortNotePostViewModel) {
             modifier = Modifier.padding(16.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            Icon(Icons.Default.DateRange, contentDescription = null)
+            Icon(Icons.Default.DateRange, contentDescription = stringResource(R.string.accessibility_select_date))
             Spacer(Modifier.width(12.dp))
 
             if (model.closedAt < TimeUtils.oneMinuteFromNow()) {
diff --git a/amethyst/src/main/res/values-cs-rCZ/strings.xml b/amethyst/src/main/res/values-cs-rCZ/strings.xml
index 036ffd445..74c160de1 100644
--- a/amethyst/src/main/res/values-cs-rCZ/strings.xml
+++ b/amethyst/src/main/res/values-cs-rCZ/strings.xml
@@ -686,6 +686,17 @@
     <string name="terms_and_conditions">Podmínky &amp; ujednání</string>
     <string name="not_available_acronym">N/A</string>
     <string name="relay_error_messages">Chyby a upozornění z tohoto relé</string>
+    <string name="relay_active_subscriptions">Aktivní odběry</string>
+    <string name="relay_active_outbox">Čekající události k odeslání</string>
+    <string name="relay_req_subscriptions">REQ odběry (%1$d)</string>
+    <string name="relay_count_subscriptions">COUNT odběry (%1$d)</string>
+    <string name="relay_outbox_events">Události k odeslání (%1$d)</string>
+    <string name="relay_no_active_subscriptions">Pro tento relay nejsou žádné aktivní odběry</string>
+    <string name="relay_filter_authors">%1$d autorů</string>
+    <string name="relay_filter_ids">%1$d ID</string>
+    <string name="relay_filter_since">od %1$s</string>
+    <string name="relay_filter_until">do %1$s</string>
+    <string name="relay_filter_limit">limit %1$d</string>
     <string name="message_length">Délka zprávy</string>
     <string name="subscriptions">Předplatné</string>
     <string name="filters">Filtry</string>
@@ -745,9 +756,14 @@
     <string name="community_no_descriptor">Tato komunita nemá popis. Promluvte si s majitelem, aby ho přidal/a.</string>
     <string name="add_sensitive_content_label">Citlivý obsah</string>
     <string name="add_sensitive_content_description">Před zobrazením tohoto obsahu přidá upozornění na citlivý obsah.</string>
+    <string name="ui_preferences">Nastavení rozhraní</string>
     <string name="preferences">Nastavení aplikace</string>
     <string name="user_preferences">Uživatelské nastavení</string>
+    <string name="translations">Překlady</string>
+    <string name="reactions">Reakce</string>
     <string name="settings">Nastavení</string>
+    <string name="account_settings">Nastavení účtu</string>
+    <string name="app_settings">Nastavení aplikace</string>
     <string name="connectivity_type_always">Vždy</string>
     <string name="connectivity_type_wifi_only">Pouze Wi-Fi</string>
     <string name="connectivity_type_unmetered_wifi_only">Neomezená WiFi</string>
@@ -1093,6 +1109,9 @@
     <string name="trusted_relays_title">Důvěryhodné Relé</string>
     <string name="trusted_section">Důvěryhodné přenašeče</string>
     <string name="trusted_section_explainer">Přenašeče, kterým důvěřujete a nepotřebujete Tor</string>
+    <string name="favorite_relays_title">Oblíbené feedy relayí</string>
+    <string name="favorite_section">Oblíbené feedy relayí</string>
+    <string name="favorite_section_explainer">Relaye, které často navštěvujete pro zobrazení jejich globálního feedu</string>
     <string name="proxy_relays_title">Proxy Relé</string>
     <string name="proxy_section">Proxy přenašeče</string>
     <string name="proxy_section_explainer">Agregační přenašeče, které aplikace používá ke stahování vašich zdrojů, jako např. filter.nostr.wine</string>
@@ -1274,15 +1293,6 @@
     <string name="confirm">Potvrdit</string>
     <string name="next">Další</string>
     <string name="add_poll_option_button">Přidat možnost ankety</string>
-
-    <string name="favorite_relays_title">Oblíbené feedy relayí</string>
-    <string name="favorite_section">Oblíbené feedy relayí</string>
-    <string name="favorite_section_explainer">Relaye, které často navštěvujete pro zobrazení jejich globálního feedu</string>
-    <string name="ui_preferences">Nastavení rozhraní</string>
-    <string name="translations">Překlady</string>
-    <string name="reactions">Reakce</string>
-    <string name="account_settings">Nastavení účtu</string>
-    <string name="app_settings">Nastavení aplikace</string>
     <string name="go_back">Jít zpět</string>
     <string name="approve">Schválit</string>
     <string name="connected">Připojeno</string>
@@ -1299,15 +1309,4 @@
     <string name="chess_game_id">ID hry: %1$s…</string>
     <string name="badge_and_n_others"> a %1$d dalších</string>
     <string name="remove_language">Odebrat %1$s</string>
-    <string name="relay_active_subscriptions">Aktivní odběry</string>
-    <string name="relay_active_outbox">Čekající události k odeslání</string>
-    <string name="relay_req_subscriptions">REQ odběry (%1$d)</string>
-    <string name="relay_count_subscriptions">COUNT odběry (%1$d)</string>
-    <string name="relay_outbox_events">Události k odeslání (%1$d)</string>
-    <string name="relay_no_active_subscriptions">Pro tento relay nejsou žádné aktivní odběry</string>
-    <string name="relay_filter_authors">%1$d autorů</string>
-    <string name="relay_filter_ids">%1$d ID</string>
-    <string name="relay_filter_since">od %1$s</string>
-    <string name="relay_filter_until">do %1$s</string>
-    <string name="relay_filter_limit">limit %1$d</string>
 </resources>
diff --git a/amethyst/src/main/res/values-de-rDE/strings.xml b/amethyst/src/main/res/values-de-rDE/strings.xml
index 3000b38ef..c9472da64 100644
--- a/amethyst/src/main/res/values-de-rDE/strings.xml
+++ b/amethyst/src/main/res/values-de-rDE/strings.xml
@@ -691,6 +691,17 @@ anz der Bedingungen ist erforderlich</string>
     <string name="terms_and_conditions">Allgemeine Geschäftsbedingungen</string>
     <string name="not_available_acronym">N/A</string>
     <string name="relay_error_messages">Fehler und Hinweise von diesem Relais</string>
+    <string name="relay_active_subscriptions">Aktive Abonnements</string>
+    <string name="relay_active_outbox">Ausstehende Outbox-Ereignisse</string>
+    <string name="relay_req_subscriptions">REQ-Abonnements (%1$d)</string>
+    <string name="relay_count_subscriptions">COUNT-Abonnements (%1$d)</string>
+    <string name="relay_outbox_events">Outbox-Ereignisse (%1$d)</string>
+    <string name="relay_no_active_subscriptions">Keine aktiven Abonnements für dieses Relay</string>
+    <string name="relay_filter_authors">%1$d Autoren</string>
+    <string name="relay_filter_ids">%1$d IDs</string>
+    <string name="relay_filter_since">seit %1$s</string>
+    <string name="relay_filter_until">bis %1$s</string>
+    <string name="relay_filter_limit">Limit %1$d</string>
     <string name="message_length">Nachrichtenlänge</string>
     <string name="subscriptions">Abonnements</string>
     <string name="filters">Filter</string>
@@ -750,9 +761,14 @@ anz der Bedingungen ist erforderlich</string>
     <string name="community_no_descriptor">Diese Community hat keine Beschreibung. Sprechen Sie mit dem Eigentümer, um eine hinzuzufügen.</string>
     <string name="add_sensitive_content_label">Sensibler Inhalt</string>
     <string name="add_sensitive_content_description">Fügt eine Warnung für sensiblen Inhalt hinzu, bevor dieser Inhalt angezeigt wird.</string>
+    <string name="ui_preferences">UI-Einstellungen</string>
     <string name="preferences">App Einstellungen</string>
     <string name="user_preferences">Benutzereinstellungen</string>
+    <string name="translations">Übersetzungen</string>
+    <string name="reactions">Reaktionen</string>
     <string name="settings">Einstellungen</string>
+    <string name="account_settings">Kontoeinstellungen</string>
+    <string name="app_settings">App-Einstellungen</string>
     <string name="connectivity_type_always">Immer</string>
     <string name="connectivity_type_wifi_only">Nur WLAN</string>
     <string name="connectivity_type_unmetered_wifi_only">Unbegrenztes WLAN</string>
@@ -1098,6 +1114,9 @@ anz der Bedingungen ist erforderlich</string>
     <string name="trusted_relays_title">Vertrauenswürdige Relays</string>
     <string name="trusted_section">Vertrauenswürdige Relays</string>
     <string name="trusted_section_explainer">Relays, denen du vertraust und für die keine Tor-Verbindung erforderlich ist</string>
+    <string name="favorite_relays_title">Favorisierte Relay-Feeds</string>
+    <string name="favorite_section">Favorisierte Relay-Feeds</string>
+    <string name="favorite_section_explainer">Relays, die du häufig besuchst, um ihren globalen Feed zu sehen</string>
     <string name="proxy_relays_title">Proxy-Relays</string>
     <string name="proxy_section">Proxy-Relays</string>
     <string name="proxy_section_explainer">Aggregator-Relays wie filter.nostr.wine, von denen die App deine Feeds herunterlädt</string>
@@ -1279,15 +1298,6 @@ anz der Bedingungen ist erforderlich</string>
     <string name="confirm">Bestätigen</string>
     <string name="next">Weiter</string>
     <string name="add_poll_option_button">Umfrageoption hinzufügen</string>
-
-    <string name="favorite_relays_title">Favorisierte Relay-Feeds</string>
-    <string name="favorite_section">Favorisierte Relay-Feeds</string>
-    <string name="favorite_section_explainer">Relays, die du häufig besuchst, um ihren globalen Feed zu sehen</string>
-    <string name="ui_preferences">UI-Einstellungen</string>
-    <string name="translations">Übersetzungen</string>
-    <string name="reactions">Reaktionen</string>
-    <string name="account_settings">Kontoeinstellungen</string>
-    <string name="app_settings">App-Einstellungen</string>
     <string name="go_back">Zurückgehen</string>
     <string name="approve">Genehmigen</string>
     <string name="connected">Verbunden</string>
@@ -1304,15 +1314,4 @@ anz der Bedingungen ist erforderlich</string>
     <string name="chess_game_id">Spiel-ID: %1$s…</string>
     <string name="badge_and_n_others"> und %1$d weitere</string>
     <string name="remove_language">%1$s entfernen</string>
-    <string name="relay_active_subscriptions">Aktive Abonnements</string>
-    <string name="relay_active_outbox">Ausstehende Outbox-Ereignisse</string>
-    <string name="relay_req_subscriptions">REQ-Abonnements (%1$d)</string>
-    <string name="relay_count_subscriptions">COUNT-Abonnements (%1$d)</string>
-    <string name="relay_outbox_events">Outbox-Ereignisse (%1$d)</string>
-    <string name="relay_no_active_subscriptions">Keine aktiven Abonnements für dieses Relay</string>
-    <string name="relay_filter_authors">%1$d Autoren</string>
-    <string name="relay_filter_ids">%1$d IDs</string>
-    <string name="relay_filter_since">seit %1$s</string>
-    <string name="relay_filter_until">bis %1$s</string>
-    <string name="relay_filter_limit">Limit %1$d</string>
 </resources>
diff --git a/amethyst/src/main/res/values-pt-rBR/strings.xml b/amethyst/src/main/res/values-pt-rBR/strings.xml
index aed84b79d..aa3b4e321 100644
--- a/amethyst/src/main/res/values-pt-rBR/strings.xml
+++ b/amethyst/src/main/res/values-pt-rBR/strings.xml
@@ -686,6 +686,17 @@
     <string name="terms_and_conditions">Termos &amp; condições</string>
     <string name="not_available_acronym">N/A</string>
     <string name="relay_error_messages">Erros e Avisos deste Relé</string>
+    <string name="relay_active_subscriptions">Assinaturas Ativas</string>
+    <string name="relay_active_outbox">Eventos Pendentes na Outbox</string>
+    <string name="relay_req_subscriptions">Assinaturas REQ (%1$d)</string>
+    <string name="relay_count_subscriptions">Assinaturas COUNT (%1$d)</string>
+    <string name="relay_outbox_events">Eventos da Outbox (%1$d)</string>
+    <string name="relay_no_active_subscriptions">Nenhuma assinatura ativa para este relay</string>
+    <string name="relay_filter_authors">%1$d autores</string>
+    <string name="relay_filter_ids">%1$d IDs</string>
+    <string name="relay_filter_since">desde %1$s</string>
+    <string name="relay_filter_until">até %1$s</string>
+    <string name="relay_filter_limit">limite %1$d</string>
     <string name="message_length">Tamanho da mensagem</string>
     <string name="subscriptions">Assinaturas</string>
     <string name="filters">Filtros</string>
@@ -745,9 +756,14 @@
     <string name="community_no_descriptor">Esta comunidade não tem uma descrição. Fale com o proprietário para adicionar</string>
     <string name="add_sensitive_content_label">Conteúdo sensível</string>
     <string name="add_sensitive_content_description">Adiciona aviso de conteúdo sensível antes de mostrar este conteúdo</string>
+    <string name="ui_preferences">Preferências da Interface</string>
     <string name="preferences">Preferências do aplicativo</string>
     <string name="user_preferences">Preferências do Usuário</string>
+    <string name="translations">Traduções</string>
+    <string name="reactions">Reações</string>
     <string name="settings">Configurações</string>
+    <string name="account_settings">Configurações da Conta</string>
+    <string name="app_settings">Configurações do App</string>
     <string name="connectivity_type_always">Sempre</string>
     <string name="connectivity_type_wifi_only">Somente wifi</string>
     <string name="connectivity_type_unmetered_wifi_only">WiFi não medida</string>
@@ -1093,6 +1109,9 @@
     <string name="trusted_relays_title">Relays confiáveis</string>
     <string name="trusted_section">Relays confiáveis</string>
     <string name="trusted_section_explainer">Relays em que você confia e que não precisam de conexão via Tor</string>
+    <string name="favorite_relays_title">Feeds de Relays Favoritos</string>
+    <string name="favorite_section">Feeds de Relays Favoritos</string>
+    <string name="favorite_section_explainer">Relays que você visita com frequência para ver o feed Global deles</string>
     <string name="proxy_relays_title">Relays proxy</string>
     <string name="proxy_section">Relays proxy</string>
     <string name="proxy_section_explainer">Relays agregadores que o app usa para baixar seus feeds, como filter.nostr.wine. Isso substitui o modelo outbox e faz o app se conectar apenas aos relays das suas listas.</string>
@@ -1274,15 +1293,6 @@
     <string name="confirm">Confirmar</string>
     <string name="next">Próximo</string>
     <string name="add_poll_option_button">Adicionar opção à enquete</string>
-
-    <string name="favorite_relays_title">Feeds de Relays Favoritos</string>
-    <string name="favorite_section">Feeds de Relays Favoritos</string>
-    <string name="favorite_section_explainer">Relays que você visita com frequência para ver o feed Global deles</string>
-    <string name="ui_preferences">Preferências da Interface</string>
-    <string name="translations">Traduções</string>
-    <string name="reactions">Reações</string>
-    <string name="account_settings">Configurações da Conta</string>
-    <string name="app_settings">Configurações do App</string>
     <string name="go_back">Voltar</string>
     <string name="approve">Aprovar</string>
     <string name="connected">Conectado</string>
@@ -1299,15 +1309,4 @@
     <string name="chess_game_id">ID do Jogo: %1$s…</string>
     <string name="badge_and_n_others"> e mais %1$d</string>
     <string name="remove_language">Remover %1$s</string>
-    <string name="relay_active_subscriptions">Assinaturas Ativas</string>
-    <string name="relay_active_outbox">Eventos Pendentes na Outbox</string>
-    <string name="relay_req_subscriptions">Assinaturas REQ (%1$d)</string>
-    <string name="relay_count_subscriptions">Assinaturas COUNT (%1$d)</string>
-    <string name="relay_outbox_events">Eventos da Outbox (%1$d)</string>
-    <string name="relay_no_active_subscriptions">Nenhuma assinatura ativa para este relay</string>
-    <string name="relay_filter_authors">%1$d autores</string>
-    <string name="relay_filter_ids">%1$d IDs</string>
-    <string name="relay_filter_since">desde %1$s</string>
-    <string name="relay_filter_until">até %1$s</string>
-    <string name="relay_filter_limit">limite %1$d</string>
 </resources>
diff --git a/amethyst/src/main/res/values-sv-rSE/strings.xml b/amethyst/src/main/res/values-sv-rSE/strings.xml
index 029229394..789efa01f 100644
--- a/amethyst/src/main/res/values-sv-rSE/strings.xml
+++ b/amethyst/src/main/res/values-sv-rSE/strings.xml
@@ -685,6 +685,17 @@
     <string name="terms_and_conditions">Villkor &amp; bestämmelser</string>
     <string name="not_available_acronym">N/A</string>
     <string name="relay_error_messages">Fel och meddelanden från detta relä</string>
+    <string name="relay_active_subscriptions">Aktiva prenumerationer</string>
+    <string name="relay_active_outbox">Väntande utgående händelser</string>
+    <string name="relay_req_subscriptions">REQ-prenumerationer (%1$d)</string>
+    <string name="relay_count_subscriptions">COUNT-prenumerationer (%1$d)</string>
+    <string name="relay_outbox_events">Utgående händelser (%1$d)</string>
+    <string name="relay_no_active_subscriptions">Inga aktiva prenumerationer för detta relä</string>
+    <string name="relay_filter_authors">%1$d författare</string>
+    <string name="relay_filter_ids">%1$d ID:n</string>
+    <string name="relay_filter_since">sedan %1$s</string>
+    <string name="relay_filter_until">till %1$s</string>
+    <string name="relay_filter_limit">gräns %1$d</string>
     <string name="message_length">Meddelandelängd</string>
     <string name="subscriptions">Prenumerationer</string>
     <string name="filters">Filter</string>
@@ -744,9 +755,14 @@
     <string name="community_no_descriptor">Denna gemenskap har ingen beskrivning. Prata med ägaren för att lägga till en.</string>
     <string name="add_sensitive_content_label">Känsligt innehåll</string>
     <string name="add_sensitive_content_description">Lägger till varning för känsligt innehåll innan detta innehåll visas.</string>
+    <string name="ui_preferences">Gränssnittsinställningar</string>
     <string name="preferences">Appinställningar</string>
     <string name="user_preferences">Användarinställningar</string>
+    <string name="translations">Översättningar</string>
+    <string name="reactions">Reaktioner</string>
     <string name="settings">Inställningar</string>
+    <string name="account_settings">Kontoinställningar</string>
+    <string name="app_settings">Appinställningar</string>
     <string name="connectivity_type_always">Alltid</string>
     <string name="connectivity_type_wifi_only">Endast Wi-Fi</string>
     <string name="connectivity_type_unmetered_wifi_only">Obegränsad WiFi</string>
@@ -1092,6 +1108,9 @@
     <string name="trusted_relays_title">Betrodda reläer</string>
     <string name="trusted_section">Betrodda reläer</string>
     <string name="trusted_section_explainer">Reläer du litar på och inte kräver Tor för</string>
+    <string name="favorite_relays_title">Favorit-reläflöden</string>
+    <string name="favorite_section">Favorit-reläflöden</string>
+    <string name="favorite_section_explainer">Reläer som du ofta besöker för att se deras globala flöde</string>
     <string name="proxy_relays_title">Proxyreläer</string>
     <string name="proxy_section">Proxyreläer</string>
     <string name="proxy_section_explainer">Aggregeringsreläer som används för att hämta flöden, t.ex. filter.nostr.wine</string>
@@ -1273,15 +1292,6 @@
     <string name="confirm">Bekräfta</string>
     <string name="next">Nästa</string>
     <string name="add_poll_option_button">Lägg till omröstningsalternativ</string>
-
-    <string name="favorite_relays_title">Favorit-reläflöden</string>
-    <string name="favorite_section">Favorit-reläflöden</string>
-    <string name="favorite_section_explainer">Reläer som du ofta besöker för att se deras globala flöde</string>
-    <string name="ui_preferences">Gränssnittsinställningar</string>
-    <string name="translations">Översättningar</string>
-    <string name="reactions">Reaktioner</string>
-    <string name="account_settings">Kontoinställningar</string>
-    <string name="app_settings">Appinställningar</string>
     <string name="go_back">Gå tillbaka</string>
     <string name="approve">Godkänn</string>
     <string name="connected">Ansluten</string>
@@ -1298,15 +1308,4 @@
     <string name="chess_game_id">Parti-ID: %1$s…</string>
     <string name="badge_and_n_others"> och %1$d andra</string>
     <string name="remove_language">Ta bort %1$s</string>
-    <string name="relay_active_subscriptions">Aktiva prenumerationer</string>
-    <string name="relay_active_outbox">Väntande utgående händelser</string>
-    <string name="relay_req_subscriptions">REQ-prenumerationer (%1$d)</string>
-    <string name="relay_count_subscriptions">COUNT-prenumerationer (%1$d)</string>
-    <string name="relay_outbox_events">Utgående händelser (%1$d)</string>
-    <string name="relay_no_active_subscriptions">Inga aktiva prenumerationer för detta relä</string>
-    <string name="relay_filter_authors">%1$d författare</string>
-    <string name="relay_filter_ids">%1$d ID:n</string>
-    <string name="relay_filter_since">sedan %1$s</string>
-    <string name="relay_filter_until">till %1$s</string>
-    <string name="relay_filter_limit">gräns %1$d</string>
 </resources>
diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml
index 7b0ec85e7..7a30c3b25 100644
--- a/amethyst/src/main/res/values/strings.xml
+++ b/amethyst/src/main/res/values/strings.xml
@@ -1375,6 +1375,7 @@
     <string name="accessibility_pushpin">Pushpin</string>
     <string name="accessibility_scan_qr_code">Scan QR code</string>
     <string name="accessibility_navigate_to_alby">Navigate to the third-party wallet provider Alby</string>
+    <string name="accessibility_select_date">Select date</string>
     <string name="it_s_not_possible_to_reply_to_a_draft_note">It\'s not possible to reply a draft note</string>
     <string name="it_s_not_possible_to_quote_to_a_draft_note">It\'s not possible to quote a draft note</string>
     <string name="it_s_not_possible_to_react_to_a_draft_note">It\'s not possible to react a draft note</string>
diff --git a/commons/src/commonMain/composeResources/values/strings.xml b/commons/src/commonMain/composeResources/values/strings.xml
index 7403080ba..ef99a2aa0 100644
--- a/commons/src/commonMain/composeResources/values/strings.xml
+++ b/commons/src/commonMain/composeResources/values/strings.xml
@@ -50,4 +50,8 @@
     <string name="screen_messages_description">Your encrypted direct messages will appear here.</string>
     <string name="screen_notifications_title">Notifications</string>
     <string name="screen_notifications_description">Mentions, replies, and reactions will appear here.</string>
+
+    <!-- Accessibility -->
+    <string name="accessibility_user_avatar">User avatar</string>
+    <string name="accessibility_navigate">Navigate</string>
 </resources>
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt
index df25cb8c7..021b7530f 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/chat/ChatroomHeader.kt
@@ -35,9 +35,12 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.commons.model.User
+import com.vitorpamplona.amethyst.commons.resources.Res
+import com.vitorpamplona.amethyst.commons.resources.accessibility_user_avatar
 import com.vitorpamplona.amethyst.commons.ui.components.UserAvatar
 import com.vitorpamplona.amethyst.commons.ui.theme.ChatSize34dp
 import com.vitorpamplona.amethyst.commons.ui.theme.ChatStdPadding
+import org.jetbrains.compose.resources.stringResource
 
 /**
  * Shared chatroom header for a single-user conversation.
@@ -67,6 +70,7 @@ fun ChatroomHeader(
                     userHex = user.pubkeyHex,
                     pictureUrl = user.profilePicture(),
                     size = ChatSize34dp,
+                    contentDescription = stringResource(Res.string.accessibility_user_avatar),
                 )
 
                 Column(modifier = Modifier.padding(start = 10.dp)) {
@@ -114,6 +118,7 @@ fun GroupChatroomHeader(
                         userHex = firstUser.pubkeyHex,
                         pictureUrl = firstUser.profilePicture(),
                         size = ChatSize34dp,
+                        contentDescription = stringResource(Res.string.accessibility_user_avatar),
                     )
                 }
 
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt
index eb2b0d51d..14e41bbce 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/ui/components/UserSearchCard.kt
@@ -39,6 +39,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.commons.model.User
+import com.vitorpamplona.amethyst.commons.resources.Res
+import com.vitorpamplona.amethyst.commons.resources.accessibility_navigate
+import com.vitorpamplona.amethyst.commons.resources.accessibility_user_avatar
+import org.jetbrains.compose.resources.stringResource
 
 /**
  * A card displaying user search result with avatar, name, and nip05/pubkey.
@@ -69,7 +73,7 @@ fun UserSearchCard(
                 userHex = user.pubkeyHex,
                 pictureUrl = user.profilePicture(),
                 size = 40.dp,
-                contentDescription = "Profile picture",
+                contentDescription = stringResource(Res.string.accessibility_user_avatar),
             )
 
             Column(modifier = Modifier.weight(1f)) {
@@ -97,7 +101,7 @@ fun UserSearchCard(
 
             Icon(
                 Icons.AutoMirrored.Filled.ArrowForward,
-                contentDescription = "Navigate",
+                contentDescription = stringResource(Res.string.accessibility_navigate),
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }