diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt
index b9fa864b84..ee080d579f 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
+import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.components.SpacerWMax
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
@@ -24,6 +25,7 @@ import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.uncapped
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 
@@ -43,7 +45,7 @@ fun AmountBlockV2(
         crypto(
             symbol = "",
             decimals = amount.cryptoAmount.decimals,
-        )
+        ).uncapped()
     }.orEmpty()
 
     val fiatAmount = amount.fiatAmount.value.format {
@@ -102,7 +104,7 @@ private fun AmountBlockV2(
         Row {
             Text(
                 text = title.resolveReference(),
-                style = TangemTheme.typography.body2,
+                style = TangemTheme.typography.subtitle2,
                 color = TangemTheme.colors.text.tertiary,
             )
             SpacerWMax()
@@ -121,18 +123,20 @@ private fun AmountBlockV2(
                 verticalArrangement = Arrangement.spacedBy(4.dp),
                 modifier = Modifier.padding(top = 8.dp),
             ) {
-                Text(
+                ResizableText(
                     text = firstAmount,
                     style = TangemTheme.typography.h2,
                     color = TangemTheme.colors.text.primary1,
+                    maxLines = 1,
                 )
                 Row(
                     horizontalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
-                    Text(
+                    ResizableText(
                         text = secondAmount,
                         style = TangemTheme.typography.body2,
                         color = TangemTheme.colors.text.tertiary,
+                        maxLines = 1,
                     )
                     extraContent()
                 }
diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index aa10a37bfa..673c284024 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -1434,7 +1434,7 @@
   <string name="wc_new_connection">Neue Verbindung</string>
   <string name="wc_no_sessions_desc">Verbinde Deine Wallet mit einer anderen dApp</string>
   <string name="wc_no_sessions_title">Keine Sitzungen</string>
-  <string name="wc_notification_security_risk_subtitle">Diese Domain wird von mehreren Sicherheitsanbietern als unsicher eingestuft. Verlasse diese umgehend, um Dein Vermögen zu schützen.</string>
+  <string name="wc_notification_security_risk_subtitle">Es wurden potenzielle Risiken oder bösartiges Verhalten erkannt. Das Verbinden oder Signieren von Transaktionen kann zum Verlust von Geldern führen.</string>
   <string name="wc_notification_security_risk_title">Bekanntes Sicherheitsrisiko</string>
   <string name="wc_request_from">Anfrage von</string>
   <string name="wc_signature_type">Art der Signatur</string>
diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml
index d075e7cd0c..40a09f5b5a 100644
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@@ -1308,16 +1308,27 @@
   <string name="warning_token_trustline_title">Se requiere línea de confianza</string>
   <string name="wc_alert_audit_malicious_domain">Dominio malicioso</string>
   <string name="wc_alert_audit_unknown_domain">Dominio desconocido</string>
+  <string name="wc_alert_connect_anyway">Conectarse de todas formas</string>
+  <string name="wc_alert_connection_timeout_description">Error de tiempo de espera. Por favor, inténtalo de nuevo más tarde.</string>
+  <string name="wc_alert_connection_timeout_title">Error al establecer WalletConnect</string>
   <string name="wc_alert_domain_issues_description">Este dominio no puede ser verificado. Compruebe cuidadosamente la solicitud de aprobación.</string>
   <string name="wc_alert_session_disconnected_description">Vuelva a su navegador y vuelva a conectarse a través de WalletConnect.</string>
+  <string name="wc_alert_session_disconnected_title">La sesión de Wallet Connect se desconectó</string>
   <string name="wc_alert_sign_anyway">Firmar de todos modos</string>
   <string name="wc_alert_unknown_error_description">Código de error: %s. Si el problema persiste - no dude en ponerse en contacto con nuestro soporte.</string>
   <string name="wc_alert_unknown_error_description_no_error_code">Si el problema persiste, no dudes en ponerte en contacto con nuestro soporte.</string>
+  <string name="wc_alert_unknown_error_title">Hemos encontrado un error desconocido</string>
+  <string name="wc_alert_unsupported_dapps_description">Tangem Wallet actualmente no es compatible con %s.</string>
+  <string name="wc_alert_unsupported_dapps_title">dApp no compatible</string>
   <string name="wc_alert_unsupported_method_description">Código de error: 8 005. Si el problema persiste, no dudes en contactar con nuestro soporte.</string>
   <string name="wc_alert_unsupported_method_title">Hemos encontrado un error desconocido</string>
   <string name="wc_alert_unsupported_networks_description">Actualmente, Tangem no es compatible con una red requerida por %s.</string>
+  <string name="wc_alert_unsupported_networks_title">Redes no compatibles</string>
   <string name="wc_alert_verified_domain_description">Tangem soporta una red requerida por %s</string>
+  <string name="wc_alert_verified_domain_title">Dominio verificado</string>
   <string name="wc_alert_wrong_card_description">Se seleccionó una tarjeta o un anillo incorrectos en la app</string>
+  <string name="wc_alert_wrong_card_title">Tenemos algún tipo de problema</string>
+  <string name="wc_all_dapps_disconnected">Todas las dApps desconectadas</string>
   <string name="wc_allow_to_spend">Permitir gastar</string>
   <string name="wc_common_address">Dirección</string>
   <string name="wc_common_connect">Conectar</string>
@@ -1326,30 +1337,52 @@
   <string name="wc_common_networks">Redes</string>
   <string name="wc_common_unlimited">Ilimitado</string>
   <string name="wc_common_wallet">Billetera</string>
+  <string name="wc_connected_app_title">Aplicación conectada</string>
   <string name="wc_connected_networks">Redes conectadas</string>
+  <string name="wc_connected_to">Conectado a %1$s</string>
   <string name="wc_connection_reqeust_can_view_balance">Ver el saldo y la actividad de su billetera</string>
   <string name="wc_connection_reqeust_cant_sign">Firmar transacciones sin previo aviso</string>
   <string name="wc_connection_reqeust_request_approval">Solicitar aprobación para transacciones</string>
   <string name="wc_connection_reqeust_will_not">No podrá</string>
   <string name="wc_connection_reqeust_would_like">Me gustaría</string>
   <string name="wc_connection_request">Solicitud de conexión</string>
+  <string name="wc_connections">Conexiones</string>
   <string name="wc_contents">Contenido</string>
   <string name="wc_copy_data_button_text">Copiar datos</string>
   <string name="wc_custom_allowance_title">Asignación personalizada</string>
+  <string name="wc_dapp_disconnected">dApp desconectada</string>
+  <string name="wc_disconnect_all">Desconectar todo</string>
+  <string name="wc_disconnect_all_alert_desc">Texto sobre desconexión de todas las dApps</string>
+  <string name="wc_disconnect_all_alert_title">Desconectar todas las dApps</string>
   <string name="wc_estimated_wallet_changes">Cambios estimados en la billetera</string>
   <string name="wc_estimated_wallet_changes_not_simulated">La transacción no ha podido ser simulada. Por favor, proceda con precaución.</string>
+  <string name="wc_estimation_is_not_supported">La estimación no es compatible con %s</string>
+  <string name="wc_fee_suggested">Sugerido por %s</string>
+  <string name="wc_insufficient_warning_subtitle">Recargue su saldo para cubrir la tarifa de red</string>
+  <string name="wc_insufficient_warning_title">Insuficiente %1$s</string>
   <string name="wc_malicious_transaction">Transacción maliciosa</string>
   <string name="wc_missing_required_network_description">Añada la red %s a su perfil para esta billetera</string>
   <string name="wc_missing_required_network_title">La billetera no tiene las redes requeridas</string>
-  <string name="wc_notification_security_risk_subtitle">Este dominio está marcado como no seguro por varios proveedores de seguridad. Salga de inmediato para proteger sus activos</string>
+  <string name="wc_new_connection">Nueva conexión</string>
+  <string name="wc_no_sessions_desc">Conecta tu billetera a diferentes dApps</string>
+  <string name="wc_no_sessions_title">Sin sesiones</string>
+  <string name="wc_no_wallet_changes_detected">No se han detectado cambios en la cartera</string>
+  <string name="wc_notification_security_risk_subtitle">Se han detectado riesgos potenciales o comportamiento malicioso. Conectarse o firmar transacciones puede resultar en la pérdida de fondos.</string>
   <string name="wc_notification_security_risk_title">Riesgo de seguridad conocido</string>
   <string name="wc_request_from">Solicitud de</string>
+  <string name="wc_send_anyway">Firmar de todos modos</string>
   <string name="wc_signature_type">Tipo de firma</string>
+  <string name="wc_specify_networks_subtitle">Se requiere al menos una red para la conexión dApp</string>
+  <string name="wc_specify_networks_title">Especificar las redes seleccionadas</string>
+  <string name="wc_successfully_signed">Firmado correctamente</string>
   <string name="wc_transaction_info_to_title">A</string>
   <string name="wc_transaction_request">Solicitud de transacción</string>
   <string name="wc_transaction_request_title">Solicitud de transacción</string>
   <string name="wc_unlimited_amount">Cantidad ilimitada</string>
+  <string name="wc_uri_already_used_description">Asegúrese de que cada intento de emparejamiento utiliza un URI nuevo y único</string>
+  <string name="wc_uri_already_used_title">URI ya utilizado</string>
   <string name="wc_wallet_connect">Wallet connect</string>
+  <string name="wc_warning_transaction">Transacción sospechosa</string>
   <string name="welcome_interrupted_backup_alert_discard">Ignorar</string>
   <string name="welcome_interrupted_backup_alert_message">Tiene un backup interrumpido. ¿Quiere reanudarlo?</string>
   <string name="welcome_interrupted_backup_alert_resume">Sí, reanudar</string>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index a4140af715..bbf154df4e 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -1320,6 +1320,7 @@
   <string name="wc_common_address">Adresse</string>
   <string name="wc_common_loading">Chargement</string>
   <string name="wc_common_unlimited">Illimité</string>
+  <string name="wc_connected_networks">Réseaux connectés</string>
   <string name="wc_connections">Connexions</string>
   <string name="wc_contents">Contenu</string>
   <string name="wc_copy_data_button_text">Copier les données</string>
@@ -1332,6 +1333,7 @@
   <string name="wc_new_connection">Nouvelle connexion</string>
   <string name="wc_no_sessions_desc">Connectez votre portefeuille à différentes dApps</string>
   <string name="wc_no_sessions_title">Aucune séance</string>
+  <string name="wc_notification_security_risk_subtitle">Des risques potentiels ou un comportement malveillant ont été détectés. Se connecter ou signer des transactions peut entraîner une perte de fonds.</string>
   <string name="wc_request_from">Demande de</string>
   <string name="wc_signature_type">Type de signature</string>
   <string name="wc_transaction_info_to_title">À</string>
diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml
index a785951f19..a598944ae0 100644
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@@ -58,12 +58,16 @@
   <string name="alert_manage_tokens_unsupported_message">%1$s ネットワークのトークンは、ファームウェアの制限により、このカードまたはリングではサポートされていません。</string>
   <string name="alert_troubleshooting_scan_card_title">カードまたはリングのスキャンに問題がありますか？</string>
   <string name="alert_unsupported_card">このカードはこのアプリでは使用できません。</string>
+  <string name="app_settings_biometrics_footer">%1$sを使用すると、ウォレットのロックを迅速かつ安全に解除できます。また、取引の署名など、機密性の高い操作も承認できます。ハードウェアウォレットの場合は、署名にカードが必要です。</string>
   <string name="app_settings_default_fee">デフォルト手数料</string>
   <string name="app_settings_default_fee_footer">デフォルト手数料を有効にすると、取引手数料が自動的に設定され、送金時に手数料ページを表示する必要がなくなります。必要に応じて、いつでもこのページに戻ることができます。</string>
   <string name="app_settings_enable_biometrics_description">設定に移動して、Tangemアプリで生体認証を有効にします。</string>
   <string name="app_settings_enable_biometrics_title">生体認証を有効にする</string>
+  <string name="app_settings_off_biometrics_alert_message">%1$sが無効になると、アプリのロックを解除してウォレットを操作するために、パスコードを入力する必要があります。</string>
   <string name="app_settings_off_saved_access_code_alert_message">これにより、保存されているウォレットアクセスコードがすべて削除されます。ウォレットでの今後の操作には、アクセスコードの送信が必要になります。</string>
   <string name="app_settings_off_saved_wallet_alert_message">保存したデバイスを削除すると、保存されているすべてのウォレットとそのアクセスコードがアプリから削除されます。</string>
+  <string name="app_settings_require_access_code">アクセスコードを要求する</string>
+  <string name="app_settings_require_access_code_footer">このオプションを選択すると、機密性の高い操作における生体認証が無効になります。取引の署名時などには、毎回アクセスコードの入力が必要になります。</string>
   <string name="app_settings_saved_access_codes">アクセスコードを保存</string>
   <string name="app_settings_saved_access_codes_footer">カードまたはリングとのやり取りには、アクセスコードの代わりに生体認証が要求されます。</string>
   <string name="app_settings_saved_wallet">ウォレットをアプリに保存する</string>
@@ -89,6 +93,7 @@
   <string name="backup_info_save_description">これらの%s個の単語をパスワードマネージャーなどの安全な場所に保存し、決して他の人と共有しないでください。</string>
   <string name="backup_info_save_title">復元は不可能です</string>
   <string name="backup_info_title">リカバリーフレーズ</string>
+  <string name="backup_seed_caution">これらの単語は、絶対に誰にも共有しないでください。もし他人がこの単語を知れば、あなたの暗号資産をすべて盗むことができます。Tangemがこれらの単語を尋ねることはありません。以下の%s単語はウォレットの復元フレーズです。これらのフレーズを使用すると、デバイスを紛失した場合でもウォレットを復元できます。</string>
   <string name="backup_seed_description">これらの%s語を順番に書き留めて、安全かつプライベートに保管してください。</string>
   <string name="backup_seed_responsibility">ウォレットと、リカバリーフレーズのセキュリティとバックアップの全責任は、Tangemではなくユーザーにあります。</string>
   <string name="backup_seed_title">リカバリーフレーズ</string>
@@ -182,6 +187,7 @@
     <item quantity="other">日</item>
   </plurals>
   <string name="common_delete">削除</string>
+  <string name="common_disable">無効にする</string>
   <string name="common_disabled">無効</string>
   <string name="common_disconnect">切断</string>
   <string name="common_done">完了</string>
@@ -236,6 +242,7 @@
   <string name="common_reject">拒否</string>
   <string name="common_reload">リロード</string>
   <string name="common_rename">名前を変更</string>
+  <string name="common_required">必須</string>
   <string name="common_save">保存</string>
   <string name="common_save_changes">変更内容を保存</string>
   <string name="common_search">検索</string>
@@ -332,6 +339,7 @@
   <string name="details_title">詳細</string>
   <string name="disclaimer_error_loading">インターネット接続を確認するか、別のネットワークに切り替えてください。</string>
   <string name="disclaimer_title">利用規約</string>
+  <string name="domain_receive_assets_navigation_title">資金を受け取る</string>
   <string name="domain_receive_assets_onboarding_description">他のネットワークで資産を送金すると、永久に失われます。</string>
   <string name="domain_receive_assets_onboarding_network_name">%sネットワーク</string>
   <string name="domain_receive_assets_onboarding_title">下記のみを使用して資金を送金する</string>
@@ -392,6 +400,7 @@
   <string name="express_provider">プロバイダー</string>
   <string name="express_provider_best_rate">ベストレート</string>
   <string name="express_provider_fca_warning_list">FCA警告リスト</string>
+  <string name="express_provider_in_fca_warning_list">FCA警告リストに掲載されたプロバイダー</string>
   <string name="express_provider_max_amount">最大 %s まで使用可能</string>
   <string name="express_provider_min_amount">%s 以上で利用可能</string>
   <string name="express_provider_not_available">このペアは利用できません</string>
@@ -443,6 +452,9 @@
   <string name="hw_activation_need_description">セットアップを完了するには、ウォレットをバックアップし、アクセスコードを使用してアプリへのアクセスを保護します。</string>
   <string name="hw_activation_need_finish">今すぐ実施</string>
   <string name="hw_activation_need_title">ウォレットのアクティベーションを完了する</string>
+  <string name="hw_activation_need_warning_description">セットアップを完了するには、アクセスコードを使用してアプリへのアクセスを保護します。</string>
+  <string name="hw_backup_alert_description">そうした場合は、最初からやり直す必要があります。</string>
+  <string name="hw_backup_alert_title">アクティベーションプロセスを終了してもよろしいですか？</string>
   <string name="hw_backup_google_drive_description">Googleドライブのバックアップに保存されている既存のウォレットを復元する</string>
   <string name="hw_backup_google_drive_title">Googleドライブのバックアップ</string>
   <string name="hw_backup_need_action">バックアップへ移動</string>
@@ -456,6 +468,7 @@
   <string name="hw_create_seed_description">最新の機能とニュースをお届けします</string>
   <string name="hw_create_seed_title">シードフレーズのバックアップ</string>
   <string name="hw_create_title">モバイルウォレットを作成する</string>
+  <string name="hw_mobile_wallet">モバイルウォレット</string>
   <string name="information_generated_with_ai">この情報はAIで生成されました。 \nエラーが見つかった場合は、ここをタップしてください。</string>
   <string name="initial_message_change_access_code_body">アクセスコードを変更するには、上図のようにカードまたはリングをタップし、操作が終了するまで取り外さないでください。</string>
   <string name="initial_message_change_passcode_body">パスコードを変更するには、上記のようにカードをタップし、操作が終了するまで取り外さないでください。</string>
@@ -1302,9 +1315,11 @@
   <string name="wallet_promo_banner_title">Tangemウォレットを見る</string>
   <string name="wallet_settings_access_code_description">このウォレットを保護するためのシークレットコードです。ログインと署名に使用されます。</string>
   <string name="wallet_settings_access_code_title">アクセスコードの設定 / 変更</string>
+  <string name="wallet_settings_change_access_code_title">アクセスコードの変更</string>
   <string name="wallet_settings_push_notifications_description">ウォレットの受信取引とTangemの更新について通知を受け取る。</string>
   <string name="wallet_settings_push_notifications_huawei_warning">現在、Huaweiデバイスではプッシュ通知が機能しない可能性があります。現在、解決策の検討に取り組んでおり、今後のアップデートで修正をリリースする予定です。ご理解のほどよろしくお願いいたします。</string>
   <string name="wallet_settings_push_notifications_title">取引通知</string>
+  <string name="wallet_settings_set_access_code_title">アクセスコードを設定する</string>
   <string name="wallet_settings_title">ウォレット設定</string>
   <string name="wallet_title">Tangem</string>
   <string name="warning_access_denied_message">%sを使用するか、カード / リングをスキャンしてウォレットにアクセスしてください</string>
@@ -1406,7 +1421,7 @@
   <string name="wc_alert_connection_timeout_title">WalletConnectを確立できませんでした</string>
   <string name="wc_alert_domain_issues_description">このドメインは検証できません。承認前にリクエスト内容をよく確認してください。</string>
   <string name="wc_alert_session_disconnected_description">ブラウザに戻り、WalletConnect経由で再接続してください。</string>
-  <string name="wc_alert_session_disconnected_title">WalletConnectセッションが接続解除されました</string>
+  <string name="wc_alert_session_disconnected_title">Wallet Connectセッションが接続解除されました</string>
   <string name="wc_alert_sign_anyway">とにかくサインする</string>
   <string name="wc_alert_unknown_error_description">エラーコード: %s 。問題が解決しない場合は、お気軽にサポートまでお問い合わせください。</string>
   <string name="wc_alert_unknown_error_description_no_error_code">問題が解決しない場合は、お気軽にサポートまでお問い合わせください。</string>
@@ -1416,11 +1431,12 @@
   <string name="wc_alert_unsupported_method_description">エラーコード: 8 005。問題が解決しない場合は、お気軽にサポートまでお問い合わせください。</string>
   <string name="wc_alert_unsupported_method_title">不明なエラーが発生しました</string>
   <string name="wc_alert_unsupported_networks_description">Tangemは現在%sで必要なネットワークをサポートしていません。</string>
-  <string name="wc_alert_unsupported_networks_title">サポートされていないネットワーク</string>
+  <string name="wc_alert_unsupported_networks_title">未対応のネットワーク</string>
   <string name="wc_alert_verified_domain_description">Tangemは%sで必要なネットワークをサポートします</string>
   <string name="wc_alert_verified_domain_title">検証済みドメイン</string>
   <string name="wc_alert_wrong_card_description">アプリで間違ったカードまたはリングが選択されました</string>
   <string name="wc_alert_wrong_card_title">問題が起きています</string>
+  <string name="wc_all_dapps_disconnected">すべてのdAppが接続解除されました</string>
   <string name="wc_allow_to_spend">使用を許可する</string>
   <string name="wc_common_address">アドレス</string>
   <string name="wc_common_connect">接続する</string>
@@ -1431,6 +1447,7 @@
   <string name="wc_common_wallet">ウォレット</string>
   <string name="wc_connected_app_title">接続されたアプリ</string>
   <string name="wc_connected_networks">接続されたネットワーク</string>
+  <string name="wc_connected_to">%1$sへ接続済み</string>
   <string name="wc_connection_reqeust_can_view_balance">ウォレットの残高とアクティビティを表示する</string>
   <string name="wc_connection_reqeust_cant_sign">通知なしに取引に署名する</string>
   <string name="wc_connection_reqeust_request_approval">取引の承認をリクエストする</string>
@@ -1441,6 +1458,7 @@
   <string name="wc_contents">内容</string>
   <string name="wc_copy_data_button_text">データをコピー</string>
   <string name="wc_custom_allowance_title">使用可能量の設定</string>
+  <string name="wc_dapp_disconnected">dAppが接続解除されました</string>
   <string name="wc_disconnect_all">すべての接続を解除する</string>
   <string name="wc_disconnect_all_alert_desc">すべてのdAppsの接続解除に関するテキスト</string>
   <string name="wc_disconnect_all_alert_title">すべてのdAppを接続解除する</string>
@@ -1448,20 +1466,23 @@
   <string name="wc_estimated_wallet_changes_not_simulated">取引をシミュレーションできませんでした。注意して続行してください。</string>
   <string name="wc_estimation_is_not_supported">%sでは見積もりはサポートされていません</string>
   <string name="wc_fee_suggested">%sによる提案</string>
+  <string name="wc_insufficient_warning_subtitle">ネットワーク手数料をカバーするために残高を補充してください</string>
+  <string name="wc_insufficient_warning_title">%1$sが不足しています</string>
   <string name="wc_malicious_transaction">悪意のある取引</string>
   <string name="wc_missing_required_network_description">このウォレットのポートフォリオに%sネットワークを追加します</string>
   <string name="wc_missing_required_network_title">ウォレットに必要なネットワークはありません</string>
   <string name="wc_new_connection">新しい接続</string>
-  <string name="wc_no_sessions_desc">ウォレットを別のdAppに接続する</string>
+  <string name="wc_no_sessions_desc">ウォレットをさまざまなdAppに接続する</string>
   <string name="wc_no_sessions_title">セッションなし</string>
   <string name="wc_no_wallet_changes_detected">ウォレットの変更は検出されませんでした</string>
-  <string name="wc_notification_security_risk_subtitle">このドメインは複数のセキュリティプロバイダーから安全でないとの警告を受けています。あなたの資産を守るため、直ちにアクセスを中止してください。</string>
+  <string name="wc_notification_security_risk_subtitle">潜在的なリスクまたは悪意のある行為が検出されました。接続または取引への署名は資金の損失につながる可能性があります。</string>
   <string name="wc_notification_security_risk_title">既知のセキュリティリスク</string>
   <string name="wc_request_from">リクエスト元</string>
-  <string name="wc_send_anyway">とにかく送金</string>
+  <string name="wc_send_anyway">とにかく署名する</string>
   <string name="wc_signature_type">署名タイプ</string>
   <string name="wc_specify_networks_subtitle">dApp接続には、少なくとも1つのネットワークが必要です</string>
   <string name="wc_specify_networks_title">選択したネットワークを指定する</string>
+  <string name="wc_successfully_signed">署名に成功しました</string>
   <string name="wc_transaction_info_to_title">宛先</string>
   <string name="wc_transaction_request">取引リクエスト</string>
   <string name="wc_transaction_request_title">取引リクエスト</string>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 68950a67cc..10a53f974e 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -1304,15 +1304,18 @@
   <string name="wc_alert_verified_domain_title">Верифицированный домен</string>
   <string name="wc_alert_wrong_card_description">Выбрана не верная карта или кольцо</string>
   <string name="wc_alert_wrong_card_title">Похоже, возникла проблема</string>
+  <string name="wc_all_dapps_disconnected">Все dapps отключены</string>
   <string name="wc_allow_to_spend">Разрешение на использование</string>
   <string name="wc_common_address">Адрес</string>
   <string name="wc_common_connect">Подключение</string>
   <string name="wc_common_loading">Загрузка</string>
   <string name="wc_common_network">Сеть</string>
   <string name="wc_common_networks">Сети</string>
-  <string name="wc_common_unlimited">Безлимитно</string>
+  <string name="wc_common_unlimited">Без лимитно</string>
   <string name="wc_common_wallet">Кошелек</string>
+  <string name="wc_connected_app_title">Подключенное приложение</string>
   <string name="wc_connected_networks">Подключенные сети</string>
+  <string name="wc_connected_to">Подключено к %1$s</string>
   <string name="wc_connection_reqeust_can_view_balance">Посмотреть баланс кошелька и его активность</string>
   <string name="wc_connection_reqeust_cant_sign">Подписать транзакцию без вашего участия</string>
   <string name="wc_connection_reqeust_request_approval">Запрос разрешения на транзакцию</string>
@@ -1323,25 +1326,38 @@
   <string name="wc_contents">Вложение</string>
   <string name="wc_copy_data_button_text">Копировать данные</string>
   <string name="wc_custom_allowance_title">Настраиваемый лимит</string>
+  <string name="wc_dapp_disconnected">dApp отключен</string>
   <string name="wc_disconnect_all">Отключить все</string>
   <string name="wc_disconnect_all_alert_title">Отключить все dApp</string>
   <string name="wc_estimated_wallet_changes">Предварительные изменения</string>
   <string name="wc_estimated_wallet_changes_not_simulated">Не удалось выполнить симуляцию транзакции. Пожалуйста, действуйте с осторожностью.</string>
+  <string name="wc_estimation_is_not_supported">Оценка не поддерживается для %s</string>
+  <string name="wc_fee_suggested">Предложено %s</string>
+  <string name="wc_insufficient_warning_subtitle">Пополните ваш баланс, чтобы покрыть комиссию сети</string>
+  <string name="wc_insufficient_warning_title">Недостаточно %1$s</string>
   <string name="wc_malicious_transaction">Вредоносная транзакция</string>
   <string name="wc_missing_required_network_description">Добавьте сеть %s в ваш портфель для выбранного кошелька</string>
   <string name="wc_missing_required_network_title">В кошельке не добавлены необходимые сети</string>
   <string name="wc_new_connection">Новое подключение</string>
   <string name="wc_no_sessions_desc">Подключите свой кошелек к различным dApp</string>
   <string name="wc_no_sessions_title">Нет подключений</string>
-  <string name="wc_notification_security_risk_subtitle">Этот домен помечен как небезопасный несколькими поставщиками систем безопасности. Немедленно покиньте его, чтобы защитить свои активы.</string>
+  <string name="wc_no_wallet_changes_detected">Изменения в кошельке не обнаружены.</string>
+  <string name="wc_notification_security_risk_subtitle">Обнаружены потенциальные риски или вредоносное поведение. Подключение или подписание транзакций может привести к потере средств.</string>
   <string name="wc_notification_security_risk_title">Известный риск безопасности</string>
   <string name="wc_request_from">Запрос от</string>
+  <string name="wc_send_anyway">Подписать всё равно</string>
   <string name="wc_signature_type">Тип подписи</string>
+  <string name="wc_specify_networks_subtitle">Для подключения к dApp требуется как минимум одна выбранная сеть.</string>
+  <string name="wc_specify_networks_title">Укажите выбранные сети</string>
+  <string name="wc_successfully_signed">Успешно подписано</string>
   <string name="wc_transaction_info_to_title">На</string>
   <string name="wc_transaction_request">Запрос транзакции</string>
   <string name="wc_transaction_request_title">Запрос транзакции</string>
   <string name="wc_unlimited_amount">Безлимитное количество</string>
+  <string name="wc_uri_already_used_description">Убедитесь, что каждая попытка сопряжения использует новый и уникальный URI.</string>
+  <string name="wc_uri_already_used_title">URI уже используется</string>
   <string name="wc_wallet_connect">Подключение кошелька</string>
+  <string name="wc_warning_transaction">Подозрительная транзакция</string>
   <string name="welcome_interrupted_backup_alert_discard">Отказаться</string>
   <string name="welcome_interrupted_backup_alert_message">Вы не закончили резервное копирование. Хотите продолжить?</string>
   <string name="welcome_interrupted_backup_alert_resume">Да, возобновить</string>
diff --git a/core/res/src/main/res/values-uk-rUA/strings.xml b/core/res/src/main/res/values-uk-rUA/strings.xml
index bc736e28ba..9c820fac97 100644
--- a/core/res/src/main/res/values-uk-rUA/strings.xml
+++ b/core/res/src/main/res/values-uk-rUA/strings.xml
@@ -1286,10 +1286,12 @@
   <string name="wc_alert_wrong_card_description">Обрана не вірна картка або кільце</string>
   <string name="wc_common_address">Адреса</string>
   <string name="wc_common_connect">Підключення</string>
+  <string name="wc_connected_networks">Підключені мережі</string>
   <string name="wc_connection_reqeust_can_view_balance">Переглянути баланс гаманця та активність</string>
   <string name="wc_connection_request">Запит на підключення</string>
   <string name="wc_contents">Вміст</string>
   <string name="wc_copy_data_button_text">Копіювати дані</string>
+  <string name="wc_notification_security_risk_subtitle">Виявлено потенційні ризики або шкідливу активність. Підключення чи підпис транзакцій можуть призвести до втрати коштів.</string>
   <string name="wc_request_from">Запит від</string>
   <string name="wc_signature_type">Тип підпису</string>
   <string name="wc_transaction_info_to_title">До</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index 37c1670198..62f1640aa6 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -12,6 +12,10 @@
   <string name="access_code_create_description">Set a %s-digit Access Code to unlock your wallet.</string>
   <string name="access_code_create_title">Create Access Code</string>
   <string name="access_code_navtitle">Access code</string>
+  <string name="account_details_archive">Archive account</string>
+  <string name="account_details_archive_action">Archive</string>
+  <string name="account_details_archive_description">You are archiving this account, but you can always get it back.</string>
+  <string name="account_details_title">Account</string>
   <string name="account_form_create_button">Add account</string>
   <string name="account_form_edit_button">Save</string>
   <string name="account_form_name">Account name</string>
@@ -58,12 +62,16 @@
   <string name="alert_manage_tokens_unsupported_message">Tokens in %1$s network are not supported by this card or ring due to firmware limitation.</string>
   <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card or ring?</string>
   <string name="alert_unsupported_card">This card is not designed to work with this app</string>
+  <string name="app_settings_biometrics_footer">Use %1$s to quickly and securely unlock your wallet and authorize all sensitive actions, such as signing transactions. For hardware wallets, you will still need a card to sign.</string>
   <string name="app_settings_default_fee">Default Fee</string>
   <string name="app_settings_default_fee_footer">Enable Default Fee to set transaction fees automatically and skip the Fee page when sending funds. You can always go back to this page if necessary.</string>
   <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
   <string name="app_settings_enable_biometrics_title">Enable biometric authentication</string>
+  <string name="app_settings_off_biometrics_alert_message">Disabling %1$s will require you to enter your passcode to unlock the app and to interact with your wallet.</string>
   <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
   <string name="app_settings_off_saved_wallet_alert_message">Removing the saved devices deletes all the saved wallets and their access codes from the app.</string>
+  <string name="app_settings_require_access_code">Require Access Code</string>
+  <string name="app_settings_require_access_code_footer">This option disables biometric authentication for sensitive actions. You will be required to enter your access code every time, such as when signing a transaction.</string>
   <string name="app_settings_saved_access_codes">Save Access Code</string>
   <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card or ring.</string>
   <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
@@ -188,6 +196,7 @@
     <item quantity="other">days</item>
   </plurals>
   <string name="common_delete">Delete</string>
+  <string name="common_disable">Disable</string>
   <string name="common_disabled">Disabled</string>
   <string name="common_disconnect">Disconnect</string>
   <string name="common_done">Done</string>
@@ -227,6 +236,7 @@
   <string name="common_no">No</string>
   <string name="common_no_address">No address</string>
   <string name="common_not_added">Not Added</string>
+  <string name="common_not_now">Not Now</string>
   <string name="common_now">Now</string>
   <string name="common_ok">OK</string>
   <string name="common_open_in_browser">Open in Browser</string>
@@ -340,6 +350,7 @@
   <string name="details_title">Details</string>
   <string name="disclaimer_error_loading">Check your internet connection or switch to a different network</string>
   <string name="disclaimer_title">Terms of service</string>
+  <string name="domain_receive_assets_navigation_title">Receive assets</string>
   <string name="domain_receive_assets_onboarding_description">Sending assets in other networks will result in permanent loss.</string>
   <string name="domain_receive_assets_onboarding_network_name">%s network</string>
   <string name="domain_receive_assets_onboarding_title">Send funds using only</string>
@@ -455,6 +466,7 @@
   <string name="hw_activation_need_warning_description">To complete setup, secure app access with Access Code.</string>
   <string name="hw_backup_alert_description">If you do, you\'ll need to start over.</string>
   <string name="hw_backup_alert_title">Are you sure you want to exit the activation process?</string>
+  <string name="hw_backup_close_description">If you do, you\'ll need to start over.</string>
   <string name="hw_backup_google_drive_description">Recover an existing wallet stored in your Google Drive backup</string>
   <string name="hw_backup_google_drive_title">Google Drive Backup</string>
   <string name="hw_backup_need_action">Go to backup</string>
@@ -977,12 +989,14 @@
   <string name="send_with_swap_change_token_alert_message">Are you sure you want to change the token? After changing, previous data will be reset.</string>
   <string name="send_with_swap_change_token_alert_title">Changing token</string>
   <string name="send_with_swap_confirm_title">Swap and send</string>
+  <string name="send_with_swap_convert_token_alert_message">Proceed with conversion? Previous data will be reset.</string>
+  <string name="send_with_swap_convert_token_alert_title">Confirm Convert</string>
   <string name="send_with_swap_notification_text">Send any token, and we’ll convert it on the way. Your recipient gets exactly what they need—seamlessly.</string>
   <string name="send_with_swap_recipient_amount_success_title">Recipient will receive</string>
   <string name="send_with_swap_recipient_amount_text">Will be sent a recipient</string>
   <string name="send_with_swap_recipient_amount_title">Amount to receive</string>
   <string name="send_with_swap_remove_convert_alert_message">Are you sure you want to cancel the conversion? After changing, previous data will be reset.</string>
-  <string name="send_with_swap_remove_convert_alert_title">Confirm cancelation</string>
+  <string name="send_with_swap_remove_convert_alert_title">Confirm cancellation</string>
   <string name="send_with_swap_title">Send with swap</string>
   <string name="sent_transaction_sent_title">Transaction sent</string>
   <string name="settings_card_settings_footer">Prepare to scan card or ring you want to set up.</string>
@@ -1479,7 +1493,7 @@
   <string name="wc_alert_connection_timeout_title">Failed to establish WalletConnect</string>
   <string name="wc_alert_domain_issues_description">This domain cannot be verified. Check the request carefully approving.</string>
   <string name="wc_alert_session_disconnected_description">Please return to your browser and reconnect via WalletConnect.</string>
-  <string name="wc_alert_session_disconnected_title">WalletConnect session was disconnected</string>
+  <string name="wc_alert_session_disconnected_title">Wallet Connect session was disconnected</string>
   <string name="wc_alert_sign_anyway">Sign anyway</string>
   <string name="wc_alert_unknown_error_description">Error code: %s. If the problem persists — feel free to contact our support.</string>
   <string name="wc_alert_unknown_error_description_no_error_code">If the problem persists — feel free to contact our support.</string>
@@ -1489,7 +1503,7 @@
   <string name="wc_alert_unsupported_method_description">Error code: 8 005. If the problem persists — feel free to contact our support.</string>
   <string name="wc_alert_unsupported_method_title">We\'ve encountered unknown error</string>
   <string name="wc_alert_unsupported_networks_description">Tangem does not currently support a required network by %s.</string>
-  <string name="wc_alert_unsupported_networks_title">Unsuported networks</string>
+  <string name="wc_alert_unsupported_networks_title">Unsupported networks</string>
   <string name="wc_alert_verified_domain_description">Tangem support a required network by %s</string>
   <string name="wc_alert_verified_domain_title">Verified domain</string>
   <string name="wc_alert_wrong_card_description">Wrong card or ring selected in the App</string>
@@ -1530,17 +1544,18 @@
   <string name="wc_missing_required_network_description">Add the %s network to your portfolio for this wallet</string>
   <string name="wc_missing_required_network_title">The wallet has no required networks</string>
   <string name="wc_new_connection">New connection</string>
-  <string name="wc_no_sessions_desc">Connect your wallet to a different dApps</string>
+  <string name="wc_no_sessions_desc">Connect your wallet to different dApps</string>
   <string name="wc_no_sessions_title">No sessions</string>
   <string name="wc_no_wallet_changes_detected">No wallet changes detected</string>
-  <string name="wc_notification_security_risk_subtitle">This domain is flagged as unsafe by multiple security providers. Leave immediately to protect your assets</string>
+  <string name="wc_notification_security_risk_subtitle">Potential risks or malicious behavior have been detected. Connecting or signing transactions may lead to loss of funds.</string>
   <string name="wc_notification_security_risk_title">Known security risk</string>
   <string name="wc_request_from">Request from</string>
-  <string name="wc_send_anyway">Send anyway</string>
+  <string name="wc_send_anyway">Sign anyway</string>
   <string name="wc_signature_type">Signature Type</string>
   <string name="wc_specify_networks_subtitle">At least one network is required for dApp connection</string>
   <string name="wc_specify_networks_title">Specify selected networks</string>
   <string name="wc_successfully_signed">Successfully signed</string>
+  <string name="wc_transaction_flow_title" translatable="false">Wallet connect</string>
   <string name="wc_transaction_info_to_title">To</string>
   <string name="wc_transaction_request">Transaction request</string>
   <string name="wc_transaction_request_title">Transaction request</string>
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/DefaultChooseManagedTokensComponent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/DefaultChooseManagedTokensComponent.kt
index 1ff16dac71..7b18b4dc84 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/DefaultChooseManagedTokensComponent.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/DefaultChooseManagedTokensComponent.kt
@@ -72,6 +72,7 @@ internal class DefaultChooseManagedTokensComponent @AssistedInject constructor(
                             cryptoCurrency = cryptoCurrency,
                             shouldResetNavigation = params.selectedCurrency != null,
                         )
+                        model.bottomSheetNavigation.dismiss()
                         params.callback?.onResult() ?: router.pop()
                     }
                 },
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountAlertFactory.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountAlertFactory.kt
index dadd0ea67c..f4373fe4b9 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountAlertFactory.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountAlertFactory.kt
@@ -2,9 +2,10 @@ package com.tangem.features.send.v2.subcomponents.amount.model
 
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.ui.UiMessageSender
-import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
+import com.tangem.features.send.v2.impl.R
 import javax.inject.Inject
 
 @ModelScoped
@@ -13,20 +14,19 @@ internal class SendAmountAlertFactory @Inject constructor(
 ) {
 
     fun showResetSendingAlert(onConfirm: () -> Unit) {
-        // todo fix localization [REDACTED_TASK_KEY]
         uiMessageSender.send(
             DialogMessage(
-                title = stringReference("Confirm Convert"),
-                message = stringReference("Proceed with conversion? Previous data will be reset."),
+                title = resourceReference(R.string.send_with_swap_convert_token_alert_title),
+                message = resourceReference(R.string.send_with_swap_convert_token_alert_message),
                 firstActionBuilder = {
                     EventMessageAction(
-                        title = stringReference("Confirm"),
+                        title = resourceReference(R.string.common_confirm),
                         onClick = onConfirm,
                     )
                 },
                 secondActionBuilder = {
                     EventMessageAction(
-                        title = stringReference("Not Now"),
+                        title = resourceReference(R.string.common_not_now),
                         onClick = onDismissRequest,
                     )
                 },
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
index 5cdfd469ac..cea354ba6e 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import com.tangem.core.ui.components.icons.identicon.IdentIcon
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
@@ -62,7 +63,7 @@ private fun AddressBlock(address: DestinationTextFieldUM.RecipientAddress) {
     Text(
         text = address.label.resolveReference(),
         style = TangemTheme.typography.subtitle2,
-        color = TangemTheme.colors.text.secondary,
+        color = TangemTheme.colors.text.tertiary,
     )
     Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -104,7 +105,7 @@ private fun MemoBlock(memo: DestinationTextFieldUM.RecipientMemo?) {
         Text(
             text = memo.label.resolveReference(),
             style = TangemTheme.typography.subtitle2,
-            color = TangemTheme.colors.text.secondary,
+            color = TangemTheme.colors.text.tertiary,
         )
         Text(
             text = memo.value,
@@ -121,7 +122,7 @@ private fun AddressWithMemoBlock(
     memo: DestinationTextFieldUM.RecipientMemo?,
 ) {
     Text(
-        text = stringResourceSafe(R.string.send_to_address),
+        text = stringResourceSafe(R.string.send_recipient),
         style = TangemTheme.typography.subtitle2,
         color = TangemTheme.colors.text.tertiary,
     )
@@ -188,7 +189,7 @@ private class DestinationBlockPreviewProvider : PreviewParameterProvider<Destina
             value = "0x34B4492A412D84A6E606288f3Bd714b89135D4dE",
             keyboardOptions = KeyboardOptions.Default,
             placeholder = TextReference.Str("Enter address"),
-            label = TextReference.Str("Recipient Address"),
+            label = resourceReference(R.string.send_recipient),
             isError = false,
             error = null,
             isValuePasted = false,
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountAlertFactory.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountAlertFactory.kt
index 8b467ba82b..258f59acc7 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountAlertFactory.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountAlertFactory.kt
@@ -64,22 +64,19 @@ internal class SwapAmountAlertFactory @Inject constructor(
     }
 
     fun showCloseSendWithSwapAlert(onConfirm: () -> Unit) {
-        // todo fix localization [REDACTED_TASK_KEY]
         uiMessageSender.send(
             DialogMessage(
-                title = stringReference("Confirm cancellation"),
-                message = stringReference(
-                    "Are you sure you want to cancel the conversion? After changing, previous data will be reset.",
-                ),
+                title = resourceReference(R.string.send_with_swap_remove_convert_alert_title),
+                message = resourceReference(R.string.send_with_swap_remove_convert_alert_message),
                 firstActionBuilder = {
                     EventMessageAction(
-                        title = stringReference("Confirm"),
+                        title = resourceReference(R.string.common_confirm),
                         onClick = onConfirm,
                     )
                 },
                 secondActionBuilder = {
                     EventMessageAction(
-                        title = stringReference("Not Now"),
+                        title = resourceReference(R.string.common_not_now),
                         onClick = onDismissRequest,
                     )
                 },
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt
index 5973ba9c7d..fb4748b307 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt
@@ -661,7 +661,7 @@ internal class SwapAmountModel @Inject constructor(
         ).onEach { (state, route) ->
             params.callback.onNavigationResult(
                 NavigationUM.Content(
-                    title = resourceReference(R.string.common_swap),
+                    title = resourceReference(R.string.common_amount),
                     subtitle = null,
                     backIconRes = if (route.isEditMode) {
                         R.drawable.ic_back_24
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenAlertFactory.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenAlertFactory.kt
index 70433b8957..c7605a26cc 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenAlertFactory.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenAlertFactory.kt
@@ -3,7 +3,6 @@ package com.tangem.features.swap.v2.impl.choosetoken.fromSupported.model
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
 import com.tangem.features.swap.v2.impl.R
@@ -26,22 +25,19 @@ internal class SwapChooseTokenAlertFactory @Inject constructor(
     }
 
     fun showChangeTokenAlert(onConfirm: () -> Unit, onDismiss: () -> Unit) {
-        // todo fix localization [REDACTED_TASK_KEY]
         uiMessageSender.send(
             DialogMessage(
-                title = stringReference("Changing token"),
-                message = stringReference(
-                    "Are you sure you want to change the token? After changing, previous data will be reset.",
-                ),
+                title = resourceReference(R.string.send_with_swap_change_token_alert_title),
+                message = resourceReference(R.string.send_with_swap_change_token_alert_message),
                 firstActionBuilder = {
                     EventMessageAction(
-                        title = stringReference("Change"),
+                        title = resourceReference(R.string.common_change),
                         onClick = onConfirm,
                     )
                 },
                 secondActionBuilder = {
                     EventMessageAction(
-                        title = stringReference("Cancel"),
+                        title = resourceReference(R.string.common_cancel),
                         onClick = onDismiss,
                     )
                 },
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt
index e730666446..2ad404315d 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt
@@ -125,9 +125,12 @@ internal fun SendWithSwapSuccessContent(sendWithSwapUM: SendWithSwapUM) {
                         ),
                     ),
                 )
-                .padding(top = 24.dp)
-                .padding(horizontal = 16.dp),
-
+                .padding(
+                    top = 24.dp,
+                    bottom = 12.dp,
+                    start = 16.dp,
+                    end = 16.dp,
+                ),
         )
     }
 }