diff --git a/apps/android/app/build.gradle b/apps/android/app/build.gradle
index f2d84c246c..0a256bbb99 100644
--- a/apps/android/app/build.gradle
+++ b/apps/android/app/build.gradle
@@ -119,7 +119,7 @@ dependencies {
     implementation 'androidx.fragment:fragment:1.4.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
-    implementation "androidx.compose.material:material-icons-extended:$compose_version"
+    //implementation "androidx.compose.material:material-icons-extended:$compose_version"
     implementation "androidx.compose.ui:ui-util:$compose_version"
     implementation "androidx.navigation:navigation-compose:2.4.1"
     implementation "com.google.accompanist:accompanist-insets:0.23.0"
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt
index 8a3458b89c..1ed7d3a954 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt
@@ -1,62 +1,11 @@
 package chat.simplex.app.views.helpers
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.materialIcon
 import androidx.compose.material.icons.materialPath
-import androidx.compose.material.icons.outlined.PersonAdd
-import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.vector.*
-import androidx.compose.ui.unit.dp
-
-private inline fun materialIcon(
-  name: String,
-  block: ImageVector.Builder.() -> ImageVector.Builder
-): ImageVector = ImageVector.Builder(
-  name = name,
-  defaultWidth = MaterialIconDimension.dp,
-  defaultHeight = MaterialIconDimension.dp,
-  viewportWidth = MaterialIconDimension,
-  viewportHeight = MaterialIconDimension
-).block().build()
-
-/**
- * Adds a vector path to this icon with Material defaults.
- *
- * @param fillAlpha fill alpha for this path
- * @param strokeAlpha stroke alpha for this path
- * @param pathFillType [PathFillType] for this path
- * @param pathBuilder builder lambda to add commands to this path
- */
-private inline fun ImageVector.Builder.materialPath(
-  fillAlpha: Float = 1f,
-  strokeAlpha: Float = 1f,
-  pathFillType: PathFillType = DefaultFillType,
-  pathBuilder: PathBuilder.() -> Unit
-) =
-// TODO: b/146213225
-// Some of these defaults are already set when parsing from XML, but do not currently exist
-  // when added programmatically. We should unify these and simplify them where possible.
-  path(
-    fill = SolidColor(Color.Black),
-    fillAlpha = fillAlpha,
-    stroke = null,
-    strokeAlpha = strokeAlpha,
-    strokeLineWidth = 1f,
-    strokeLineCap = StrokeCap.Butt,
-    strokeLineJoin = StrokeJoin.Bevel,
-    strokeLineMiter = 1f,
-    pathFillType = pathFillType,
-    pathBuilder = pathBuilder
-  )
-
-// All Material icons (currently) are 24dp by 24dp, with a viewport size of 24 by 24.
-@PublishedApi
-internal const val MaterialIconDimension = 24f
-
 
 val AccountCircleFilled: ImageVector
   get() {
-    Icons.Filled.Bolt
     if (_accountCircleFilled != null) {
       return _accountCircleFilled!!
     }
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt
index ccb00f4613..0a274d20b9 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt
@@ -557,7 +557,7 @@ fun getBitmapFromVideo(uri: Uri, timestamp: Long? = null, random: Boolean = true
   val image = when {
     timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST)
     random -> mmr.frameAtTime
-    else -> mmr.getFrameAtIndex(0)
+    else -> mmr.getFrameAtTime(0)
   }
   mmr.release()
   return VideoPlayer.PreviewAndDuration(image, durationMs, timestamp ?: 0)
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt
index db8f8ccc32..dc0744a752 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt
@@ -86,7 +86,7 @@ class VideoPlayer private constructor(
     .build()
     .apply {
     // Repeat the same track endlessly
-    repeatMode = 1
+    repeatMode = Player.REPEAT_MODE_ONE
     currentVolume = volume
     if (!soundEnabled) {
       volume = 0f
diff --git a/apps/android/app/src/main/res/values-cs/strings.xml b/apps/android/app/src/main/res/values-cs/strings.xml
index fc9a29c6fd..6a4f0eed48 100644
--- a/apps/android/app/src/main/res/values-cs/strings.xml
+++ b/apps/android/app/src/main/res/values-cs/strings.xml
@@ -1037,13 +1037,11 @@
     <string name="show_dev_options">Zobrazit:</string>
     <string name="developer_options">ID databáze a možnost Izolace přenosu.</string>
     <string name="file_will_be_received_when_contact_completes_uploading">Soubor bude přijat, jakmile váš kontakt dokončí nahrávání.</string>
-    <string name="file_transfer_will_be_cancelled_warning">Přenos souboru bude zrušen. Pokud probíhá, bude zastaven.</string>
     <string name="delete_chat_profile">Smazat chat profil</string>
     <string name="delete_profile">Smazat profil</string>
     <string name="profile_password">Heslo profilu</string>
     <string name="unhide_chat_profile">Odkrýt chat profil</string>
     <string name="unhide_profile">Odkrýt profil</string>
-    <string name="cancel_file__question">Zrušit přenos souboru\?</string>
     <string name="icon_descr_video_asked_to_receive">Žádost o přijetí videa</string>
     <string name="videos_limit_desc">Současně lze odeslat pouze 10 videí</string>
     <string name="videos_limit_title">Příliš mnoho videí!</string>
diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/android/app/src/main/res/values-de/strings.xml
index 355ffe3729..34db0193f0 100644
--- a/apps/android/app/src/main/res/values-de/strings.xml
+++ b/apps/android/app/src/main/res/values-de/strings.xml
@@ -1118,8 +1118,6 @@
     <string name="database_migrations">Migrationen: %s</string>
     <string name="image_will_be_received_when_contact_completes_uploading">Das Bild wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
     <string name="file_will_be_received_when_contact_completes_uploading">Die Datei wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist.</string>
-    <string name="cancel_file__question">Dateitransfer abbrechen\?</string>
-    <string name="file_transfer_will_be_cancelled_warning">Der Dateitransfer wird abgebrochen. Falls er gerade abläuft, wird er angehalten.</string>
     <string name="delete_chat_profile">Chat-Profil löschen</string>
     <string name="delete_profile">Profil löschen</string>
     <string name="unhide_profile">Verbergen des Profils aufheben</string>
@@ -1155,7 +1153,6 @@
     <string name="change_lock_mode">Sperr-Modus ändern</string>
     <string name="passcode_not_changed">Passwort wurde nicht geändert!</string>
     <string name="decryption_error">Entschlüsselungsfehler</string>
-    <string name="decryption_error_permanent">Dauerhafter Entschlüsselungsfehler</string>
     <string name="error_loading_xftp_servers">Fehler beim Laden der XFTP-Server</string>
     <string name="la_lock_mode_passcode">Passworteingabe</string>
     <string name="la_enter_app_passcode">Passwort eingeben</string>
diff --git a/apps/android/app/src/main/res/values-es/strings.xml b/apps/android/app/src/main/res/values-es/strings.xml
index 976b03d0eb..a2d32f0ff1 100644
--- a/apps/android/app/src/main/res/values-es/strings.xml
+++ b/apps/android/app/src/main/res/values-es/strings.xml
@@ -1038,8 +1038,6 @@
     <string name="show_developer_options">Mostrar opciones de desarrollador</string>
     <string name="hide_dev_options">Ocultar:</string>
     <string name="show_dev_options">Mostrar:</string>
-    <string name="cancel_file__question">¿Cancelar el envío de archivos\?</string>
-    <string name="file_transfer_will_be_cancelled_warning">El envío de archivos será cancelado. Si está en progreso se detendrá.</string>
     <string name="delete_chat_profile">Eliminar perfil de chat</string>
     <string name="profile_password">Contraseña del perfil</string>
     <string name="unhide_chat_profile">Mostrar perfil de chat</string>
diff --git a/apps/android/app/src/main/res/values-fr/strings.xml b/apps/android/app/src/main/res/values-fr/strings.xml
index c46858dff4..3ccb23d11d 100644
--- a/apps/android/app/src/main/res/values-fr/strings.xml
+++ b/apps/android/app/src/main/res/values-fr/strings.xml
@@ -1041,8 +1041,6 @@
     <string name="unhide_profile">Dévoiler le profil</string>
     <string name="delete_chat_profile">Supprimer le profil de chat</string>
     <string name="delete_profile">Supprimer le profil</string>
-    <string name="cancel_file__question">Annuler le transfert de fichiers \?</string>
-    <string name="file_transfer_will_be_cancelled_warning">Le transfert de fichiers sera annulé. S\'il est en cours, il sera interrompu.</string>
     <string name="profile_password">Mot de passe de profil</string>
     <string name="videos_limit_title">Trop de vidéos !</string>
     <string name="video_descr">Vidéo</string>
diff --git a/apps/android/app/src/main/res/values-hi/strings.xml b/apps/android/app/src/main/res/values-hi/strings.xml
index 862ab03496..f75ce402b7 100644
--- a/apps/android/app/src/main/res/values-hi/strings.xml
+++ b/apps/android/app/src/main/res/values-hi/strings.xml
@@ -278,7 +278,6 @@
     <string name="settings_section_title_develop">विकास करना</string>
     <string name="user_mute">आवाज़ बंद करना</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">अपने संपर्कों को गायब होने वाले संदेश भेजने की अनुमति दें।</string>
-    <string name="cancel_file__question">फ़ाइल स्थानांतरण रद्द करें\?</string>
     <string name="v4_6_audio_video_calls">ऑडियो और वीडियो कॉल</string>
     <string name="v4_6_reduced_battery_usage_descr">अधिक सुधार जल्द ही आ रहे हैं!</string>
     <string name="icon_descr_video_asked_to_receive">वीडियो प्राप्त करने के लिए कहा</string>
diff --git a/apps/android/app/src/main/res/values-it/strings.xml b/apps/android/app/src/main/res/values-it/strings.xml
index 0e0df206e8..3c1c8728c5 100644
--- a/apps/android/app/src/main/res/values-it/strings.xml
+++ b/apps/android/app/src/main/res/values-it/strings.xml
@@ -1037,8 +1037,6 @@
     <string name="image_will_be_received_when_contact_completes_uploading">L\'immagine verrà ricevuta quando il tuo contatto completerà l\'invio.</string>
     <string name="mtr_error_no_down_migration">la versione del database è più recente di quella dell\'app, ma nessuna migrazione downgrade per: %s</string>
     <string name="file_will_be_received_when_contact_completes_uploading">Il file verrà ricevuto quando il tuo contatto completerà l\'invio.</string>
-    <string name="cancel_file__question">Annullare il trasferimento di file\?</string>
-    <string name="file_transfer_will_be_cancelled_warning">Il trasferimento di file verrà annullato. Se è in corso, verrà interrotto.</string>
     <string name="unhide_chat_profile">Svela il profilo chat</string>
     <string name="unhide_profile">Svela profilo</string>
     <string name="delete_chat_profile">Elimina il profilo di chat</string>
diff --git a/apps/android/app/src/main/res/values-ko/strings.xml b/apps/android/app/src/main/res/values-ko/strings.xml
index 603bb40575..62e3ca0fe2 100644
--- a/apps/android/app/src/main/res/values-ko/strings.xml
+++ b/apps/android/app/src/main/res/values-ko/strings.xml
@@ -294,7 +294,7 @@
     <string name="integrity_msg_duplicate">중복된 메시지</string>
     <string name="accept_feature_set_1_day">1일로 설정</string>
     <string name="v4_4_disappearing_messages">자동 삭제되는 메시지</string>
-    <string name="total_files_count_and_size">전체 크기가 %s인 %d개의 파일</string>
+    <string name="total_files_count_and_size">%d 개의 파일 총 크기 %s</string>
     <string name="conn_level_desc_direct">다이렉트</string>
     <string name="disappearing_prohibited_in_this_chat">이 채팅에서는 자동 삭제되는 메시지를 사용할 수 없어요.</string>
     <string name="disappearing_messages_are_prohibited">이 그룹에서는 자동 삭제되는 메시지를 사용할 수 없어요.</string>
@@ -530,8 +530,6 @@
     <string name="full_name_optional__prompt">이름 (선택 사항)</string>
     <string name="how_it_works">작동 방식</string>
     <string name="hide_dev_options">숨기기 :</string>
-    <string name="cancel_file__question">파일 전송을 취소할까요\?</string>
-    <string name="file_transfer_will_be_cancelled_warning">파일 전송이 취소될 거예요. 이미 전송이 시작되었다면 중지될 거예요.</string>
     <string name="icon_descr_sent_msg_status_sent">보냄</string>
     <string name="group_preview_join_as">%s(으)로 참여</string>
     <string name="group_preview_you_are_invited">그룹에 초대되었어요.</string>
diff --git a/apps/android/app/src/main/res/values-nl/strings.xml b/apps/android/app/src/main/res/values-nl/strings.xml
index aba28a6fe8..1439d7ae68 100644
--- a/apps/android/app/src/main/res/values-nl/strings.xml
+++ b/apps/android/app/src/main/res/values-nl/strings.xml
@@ -1036,8 +1036,6 @@
     <string name="hide_dev_options">Verbergen:</string>
     <string name="show_developer_options">Ontwikkelaars opties tonen</string>
     <string name="settings_section_title_experimenta">EXPERIMENTEEL</string>
-    <string name="cancel_file__question">Bestand overdracht annuleren\?</string>
-    <string name="file_transfer_will_be_cancelled_warning">Bestand overdracht wordt geannuleerd. Als het bezig is, wordt het gestopt.</string>
     <string name="delete_profile">Verwijder profiel</string>
     <string name="profile_password">Profiel wachtwoord</string>
     <string name="unhide_chat_profile">Chat profiel zichtbaar maken</string>
diff --git a/apps/android/app/src/main/res/values-pl/strings.xml b/apps/android/app/src/main/res/values-pl/strings.xml
index 0af6bb4b43..6924ef1724 100644
--- a/apps/android/app/src/main/res/values-pl/strings.xml
+++ b/apps/android/app/src/main/res/values-pl/strings.xml
@@ -140,7 +140,6 @@
     <string name="for_me_only">Usuń dla mnie</string>
     <string name="delete_member_message__question">Usunąć wiadomość członka\?</string>
     <string name="icon_descr_edited">edytowana</string>
-    <string name="file_transfer_will_be_cancelled_warning">Transfer plików zostanie anulowany. Jeśli jest w toku, zostanie zatrzymany.</string>
     <string name="for_everybody">Dla wszystkich</string>
     <string name="group_preview_join_as">dołącz jako %s</string>
     <string name="icon_descr_sent_msg_status_send_failed">wysyłanie nie powiodło się</string>
@@ -937,7 +936,6 @@
     <string name="onboarding_notifications_mode_periodic_desc"><b>Dobre dla baterii</b>. Usługa w tle sprawdza nowe wiadomości co 10 minut. Możesz przegapić połączenia i pilne wiadomości.</string>
     <string name="both_you_and_your_contact_can_send_voice">Zarówno Ty, jak i Twój kontakt możecie wysyłać wiadomości głosowe.</string>
     <string name="v4_5_transport_isolation_descr">Według profilu czatu (domyślnie) lub połączenia (BETA).</string>
-    <string name="cancel_file__question">Anulować transfer plików\?</string>
     <string name="alert_title_cant_invite_contacts">Nie można zaprosić kontaktów!</string>
     <string name="clear_verification">Wyczyść weryfikację</string>
     <string name="auth_confirm_credential">Potwierdź swoje poświadczenia</string>
@@ -1102,14 +1100,12 @@
     <string name="la_immediately">Natychmiast</string>
     <string name="la_please_remember_to_store_password">Prosimy o jego zapamiętanie lub bezpieczne przechowywanie - nie ma możliwości odzyskania utraconego pinu!</string>
     <string name="decryption_error">Błąd odszyfrowania</string>
-    <string name="decryption_error_permanent">Trwały błąd odszyfrowywania</string>
     <string name="alert_title_msg_bad_hash">Zły hash wiadomości</string>
     <string name="alert_title_msg_bad_id">Zły identyfikator wiadomości</string>
     <string name="alert_text_msg_bad_hash">Hash poprzedniej wiadomości jest inny.</string>
     <string name="alert_text_msg_bad_id">Identyfikator następnej wiadomości jest nieprawidłowy (mniejszy lub równy poprzedniej).
 \nMoże się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skompromitowane.</string>
     <string name="alert_text_decryption_error_header">Nie udało się odszyfrować <xliff:g id="message count" example="1">%1$d</xliff:g> wiadomości.</string>
-    <string name="alert_text_decryption_error_earlier">Nie udało się odszyfrować <xliff:g id="message count" example="1">%1$d</xliff:g> wiadomości i nie będą one pokazane.</string>
     <string name="alert_text_fragment_permanent_error_reconnect">Ten błąd jest trwały dla tego połączenia, proszę o ponowne połączenie.</string>
     <string name="alert_text_decryption_error_too_many_skipped"><xliff:g id="message count" example="1">%1$d</xliff:g> pominiętych wiadomości.</string>
     <string name="alert_text_fragment_encryption_out_of_sync_old_database">Może się to zdarzyć, gdy Ty lub Twoje połączenie użyło starej kopii zapasowej bazy danych.</string>
diff --git a/apps/android/app/src/main/res/values-pt-rBR/strings.xml b/apps/android/app/src/main/res/values-pt-rBR/strings.xml
index ed4dde2302..4adb03c202 100644
--- a/apps/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/apps/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -779,8 +779,6 @@
     <string name="whats_new">Novidades</string>
     <string name="v4_6_audio_video_calls">Chamadas de áudio e vídeo</string>
     <string name="v4_6_hidden_chat_profiles_descr">Proteja seus perfis de chat com uma senha!</string>
-    <string name="cancel_file__question">Cancelar transferência de arquivo\?</string>
-    <string name="file_transfer_will_be_cancelled_warning">A transferência do arquivo será cancelada. Se estiver em andamento, será interrompida.</string>
     <string name="this_text_is_available_in_settings">Este texto está disponível nas configurações</string>
     <string name="scan_code">Escanear código</string>
     <string name="network_use_onion_hosts_no_desc_in_alert">Hosts Onion não serão usados.</string>
diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml
index f674b75e7c..a4df902c8a 100644
--- a/apps/android/app/src/main/res/values-ru/strings.xml
+++ b/apps/android/app/src/main/res/values-ru/strings.xml
@@ -1116,8 +1116,6 @@
     <string name="mtr_error_different">разная миграция в приложении/базе данных: %s / %s</string>
     <string name="downgrade_and_open_chat">Откатить версию и открыть чат</string>
     <string name="database_downgrade_warning">Предупреждение: Вы можете потерять какие то данные!</string>
-    <string name="cancel_file__question">Прекратить передачу файла\?</string>
-    <string name="file_transfer_will_be_cancelled_warning">Передача файла будет прекращена. Если она в процессе, она будет остановлена.</string>
     <string name="developer_options">ID базы данных и опция Отдельные транспортные сессии.</string>
     <string name="show_developer_options">Показать опции для девелоперов</string>
     <string name="delete_chat_profile">Удалить профиль чата</string>
diff --git a/apps/android/app/src/main/res/values-zh-rCN/strings.xml b/apps/android/app/src/main/res/values-zh-rCN/strings.xml
index 18bca161b8..2ebcaddde6 100644
--- a/apps/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/apps/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -1040,10 +1040,8 @@
     <string name="delete_profile">删除个人资料</string>
     <string name="profile_password">个人资料密码</string>
     <string name="unhide_chat_profile">取消隐藏聊天资料</string>
-    <string name="cancel_file__question">取消文件传输？</string>
     <string name="delete_chat_profile">删除聊天资料</string>
     <string name="unhide_profile">取消隐藏个人资料</string>
-    <string name="file_transfer_will_be_cancelled_warning">文件传输将被取消。文件传输将被终止如果它正在进行中。</string>
     <string name="videos_limit_desc">同一时间只能发送10个视频</string>
     <string name="videos_limit_title">过多视频！</string>
     <string name="video_descr">视频</string>
@@ -1108,12 +1106,10 @@
     <string name="alert_text_fragment_permanent_error_reconnect">此错误对于此连接是永久性的，请重新连接。</string>
     <string name="alert_text_fragment_encryption_out_of_sync_old_database">当您或您的连接使用旧数据库备份时，可能会发生这种情况。</string>
     <string name="decryption_error">解密错误</string>
-    <string name="decryption_error_permanent">永久解密错误</string>
     <string name="alert_text_fragment_please_report_to_developers">请向开发者报告。</string>
     <string name="alert_text_msg_bad_hash">上一条消息的散列不同。</string>
     <string name="alert_text_msg_bad_id">下一条消息的 ID 不正确（小于或等于上一条）。
 \n它可能是由于某些错误或连接被破坏才发生。</string>
-    <string name="alert_text_decryption_error_earlier"><xliff:g id="message count" example="1">%1$d</xliff:g> 消息解密失败并且不会显示。</string>
     <string name="no_spaces">没有空格！</string>
     <string name="stop_file__action">停止文件</string>
     <string name="stop_snd_file__title">停止发送文件？</string>
diff --git a/apps/android/app/src/main/res/values-zh-rTW/strings.xml b/apps/android/app/src/main/res/values-zh-rTW/strings.xml
index 86e43d4be9..c4e8727a53 100644
--- a/apps/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/apps/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -1037,8 +1037,6 @@
     <string name="file_will_be_received_when_contact_completes_uploading">檔案將會在你的聯絡人完成上傳後接收。</string>
     <string name="settings_section_title_experimenta">實驗性</string>
     <string name="upgrade_and_open_chat">升級和開始對話</string>
-    <string name="cancel_file__question">取消傳輸檔案？</string>
-    <string name="file_transfer_will_be_cancelled_warning">檔案傳遞將會取消。若是在傳遞檔案中，亦會暫停。</string>
     <string name="show_developer_options">顯示開發者選項</string>
     <string name="delete_profile">刪除資料</string>
     <string name="unhide_chat_profile">取消隱藏聊天資料</string>