diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index 7ada2a897d..0c8a26dff9 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -1384,9 +1384,11 @@
   <string name="tangempay_card_details_hide_text">Verstecken</string>
   <string name="tangempay_card_details_open_wallet_button">Google Wallet öffnen</string>
   <string name="tangempay_card_details_open_wallet_notification_subtitle">Richte Tangem Pay mit wenigen Klicks ein und bezahlen mit Google Pay.</string>
+  <string name="tangempay_card_details_open_wallet_notification_subtitle_apple">Richte Tangem Pay mit wenigen Klicks ein und bezahlen mit Apple Pay.</string>
   <string name="tangempay_card_details_open_wallet_notification_title">Karte zu Google Pay hinzufügen</string>
   <string name="tangempay_card_details_open_wallet_notification_title_apple">Karte zu Apple Pay hinzufügen</string>
   <string name="tangempay_card_details_open_wallet_step_1">Google Wallet öffnen</string>
+  <string name="tangempay_card_details_open_wallet_step_1_apple">Apple Wallet öffnen</string>
   <string name="tangempay_card_details_open_wallet_step_2">Tippe auf „Karte hinzufügen“.</string>
   <string name="tangempay_card_details_open_wallet_step_3">Gebe die Kartendaten manuell ein</string>
   <string name="tangempay_card_details_open_wallet_step_4">Verifiziere die Karte mit dem Einmalpasswort (OPT), das an Dein Gerät gesendet wird.</string>
diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml
index d036fbae09..7a35e701c3 100644
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@@ -204,6 +204,7 @@
   <string name="common_import">Importe</string>
   <string name="common_in_progress">En progreso</string>
   <string name="common_later">Más tarde</string>
+  <string name="common_learn_more">Más información</string>
   <string name="common_left">%1$s quedan</string>
   <string name="common_locked">Bloqueado</string>
   <string name="common_main_network">Red principal</string>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index bdf1ca0a6b..547fa6c870 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -182,6 +182,7 @@
   <string name="common_import">Importez</string>
   <string name="common_in_progress">En cours</string>
   <string name="common_later">Plus tard</string>
+  <string name="common_learn_more">En savoir plus</string>
   <string name="common_left">Il reste %1$s</string>
   <string name="common_locked">Verrouillé</string>
   <string name="common_main_network">Réseau principal</string>
@@ -1452,6 +1453,7 @@
   <string name="wc_transaction_request_title">Demande de transaction</string>
   <string name="wc_unlimited_amount">Montant illimité</string>
   <string name="wc_wallet_connect">WalletConnect</string>
+  <string name="welcome_create_wallet_use_hardware_title">En savoir plus</string>
   <string name="welcome_interrupted_backup_alert_discard">Ignorer</string>
   <string name="welcome_interrupted_backup_alert_message">Vous avez une sauvegarde interrompue. Voulez-vous la reprendre ?</string>
   <string name="welcome_interrupted_backup_alert_resume">Oui, reprendre</string>
diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml
index a437982f8e..35063b6e10 100644
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@@ -1356,6 +1356,7 @@
   <string name="tangem_pay_status_declined">拒否</string>
   <string name="tangem_pay_status_pending">保留中</string>
   <string name="tangem_pay_terms_fees_limits">利用規約・手数料・利用制限</string>
+  <string name="tangem_pay_terms_limits">利用規約と上限条件</string>
   <string name="tangem_pay_transaction_declined_notification_text">銀行がこの取引リクエストを拒否しました。</string>
   <string name="tangem_pay_transaction_fee_notification_text">この手数料は、送金処理にかかるコストをカバーするためのものです。</string>
   <string name="tangem_pay_unfreeze_card_alert_body">資金は引き続き使用できます。いつでも一時停止できます。</string>
@@ -1377,12 +1378,12 @@
   <string name="tangempay_card_details_hide_text">非表示</string>
   <string name="tangempay_card_details_open_wallet_button">Googleウォレットを開く</string>
   <string name="tangempay_card_details_open_wallet_notification_subtitle">数回タップするだけでTangem Payの設定完了。Google Payですぐに支払いを始めましょう。</string>
+  <string name="tangempay_card_details_open_wallet_notification_subtitle_apple">数回タップするだけでTangem Payの設定完了。Apple Payですぐに支払いを始めましょう。</string>
   <string name="tangempay_card_details_open_wallet_notification_title">Google Payにカードを追加する</string>
   <string name="tangempay_card_details_open_wallet_notification_title_apple">Apple Payにカードを追加する</string>
   <string name="tangempay_card_details_open_wallet_step_1">Googleウォレットを開く</string>
-  <string name="tangempay_card_details_open_wallet_step_1.5_apple">右上の「+」ボタンをタップ</string>
-  <string name="tangempay_card_details_open_wallet_step_1_apple_open">開く</string>
-  <string name="tangempay_card_details_open_wallet_step_1_apple_wallet">Apple Wallet</string>
+  <string name="tangempay_card_details_open_wallet_step_1_5_apple">右上の「+」ボタンをタップ</string>
+  <string name="tangempay_card_details_open_wallet_step_1_apple">Appleウォレットを開く</string>
   <string name="tangempay_card_details_open_wallet_step_2">「カードを追加」をタップします</string>
   <string name="tangempay_card_details_open_wallet_step_2_apple">「デビットカードまたはクレジットカード」をタップ</string>
   <string name="tangempay_card_details_open_wallet_step_3">カードの詳細を手動で入力してください</string>
@@ -1409,7 +1410,7 @@
   <string name="tangempay_onboarding_purchases_title">余計な費用なしで、表示金額のみを支払う</string>
   <string name="tangempay_onboarding_security_description">あなたの住所や資産を開示することなく、個別の支払い用アカウントが作成されます。</string>
   <string name="tangempay_onboarding_security_title">他に類を見ないプライバシー</string>
-  <string name="tangempay_onboarding_title">無料のCryptoカード\nを数分で入手しましょう</string>
+  <string name="tangempay_onboarding_title">無料のTangem Payカードを数分でゲットしましょう</string>
   <string name="tangempay_service_unavailable_description">技術的な問題を修正しています。後でもう一度お試しください。</string>
   <string name="tangempay_service_unavailable_title">サービスは一時的に利用できません</string>
   <string name="tangempay_title">Tangem Pay</string>
@@ -1823,19 +1824,19 @@
   <string name="xtz_withdrawal_message_ignore">いいえ、すべて送信します</string>
   <string name="xtz_withdrawal_message_reduce">%s XTZを減らす</string>
   <string name="xtz_withdrawal_message_warning">次回ウォレットにチャージするときに手数料の増加を避けるには、金額を%s XTZ減らしてください。</string>
-  <string name="yield_module_alert_description">利息モードを有効にすると、このアドレスへの今後のすべての入金はAaveに送られます。ただし、資金の管理は引き続き自由に行えます。</string>
+  <string name="yield_module_alert_description">利息モードが有効な場合、このアドレスへの今後の入金はすべてAaveに提供されます。資金は引き続き自由に管理できます。</string>
   <string name="yield_module_alert_title">%sはAaveに供給されています</string>
   <string name="yield_module_amount_not_transfered_to_aave_title">Aaveへの%1$s %2$sの供給は保留中です</string>
   <string name="yield_module_approve_needed_notification_cta">承認</string>
-  <string name="yield_module_approve_needed_notification_description">トークンの承認は取り消されました。サービス機能を再開するには、再度承認を行ってください。</string>
+  <string name="yield_module_approve_needed_notification_description">トークンの承認が取り消されました。サービスの機能を再開するには、再度トークンの承認を行ってください。</string>
   <string name="yield_module_approve_needed_notification_title">承認が必要</string>
-  <string name="yield_module_approve_sheet_fee_note">手数料が差し引かれ、あなたの資産は再び貸し出されます。</string>
-  <string name="yield_module_approve_sheet_subtitle">引き続き収益を得るには承認が必要です。</string>
+  <string name="yield_module_approve_sheet_fee_note">手数料が差し引かれ、暗号資産が補充されます。</string>
+  <string name="yield_module_approve_sheet_subtitle">利息を継続的に生み出すには承認が必要です。</string>
   <string name="yield_module_approve_sheet_title">承認を確定する</string>
   <string name="yield_module_balance_info_sheet_subtitle">あなたの資金は現在Aaveプロトコルに預けられていますが、いつでも自由に管理できます。</string>
-  <string name="yield_module_balance_info_sheet_title">あなたの%sはAaveに預けられています</string>
+  <string name="yield_module_balance_info_sheet_title">%sはAaveに供給されています</string>
   <string name="yield_module_chart_loading_error">チャートを読み込めません・・</string>
-  <string name="yield_module_deposit_error_notification_title">Aaveへの%1$s %2$sの供給は保留中です。</string>
+  <string name="yield_module_deposit_error_notification_title">%1$s %2$sをAaveに供給しています。</string>
   <string name="yield_module_disable_button">利回りモードを無効にする</string>
   <string name="yield_module_earn_badge">年利%1$s%%</string>
   <string name="yield_module_earn_sheet_available_title">利用可能</string>
@@ -1843,47 +1844,47 @@
   <string name="yield_module_earn_sheet_fee_description">貸付のために入金する際は、残高から%1$s以下のネットワーク手数料が差し引かれます。</string>
   <string name="yield_module_earn_sheet_high_fee_description">現在、ネットワーク手数料が高すぎるため貸付を実行できません。手数料が%1$s以下に下がり次第、資金が供給されます。</string>
   <string name="yield_module_earn_sheet_my_funds_title">私の資金</string>
-  <string name="yield_module_earn_sheet_provider_description">あなたの%1$sは現在Aaveにデプロイされ、利回りを生んでいます。あなたは%2$sトークンを保有しており、これはあなたの残高を表し、自動的に利回りが発生します。追加入金すると、手数料を差し引いた上でAaveに資産が追加され、さらに利回りを得られるようになります。</string>
+  <string name="yield_module_earn_sheet_provider_description">%1$sはAaveにデプロイされ、利回りを生み出しています。保有している%2$sトークンは残高を表し、自動的に利回りを生み出します。チャージすると、手数料を差し引いた後の資金がAaveに供給され、さらに利回りを生み出します。</string>
   <string name="yield_module_earn_sheet_title">利息モード</string>
-  <string name="yield_module_earn_sheet_total_earnings_title">総収益</string>
+  <string name="yield_module_earn_sheet_total_earnings_title">トータルの利息</string>
   <string name="yield_module_earn_sheet_transfers_title">Aaveへの送金</string>
   <string name="yield_module_explore_sheet_explore_aave_button_title">Aaveの詳細を見る</string>
   <string name="yield_module_fee_policy_sheet_current_fee_note">これは%sの現在の供給手数料です。実際のコストはアクティベーションタブに表示されます。</string>
   <string name="yield_module_fee_policy_sheet_current_fee_title">現在の手数料</string>
-  <string name="yield_module_fee_policy_sheet_description">今後の%sの入金はすべて、取引手数料が差し引かれて自動的にAaveに供給されます。</string>
-  <string name="yield_module_fee_policy_sheet_fee_note">今後のチャージごとに、おおよそ%1$s（%2$s）のネットワーク手数料が差し引かれますが、上限の%3$s（%4$s）を超えることはありません。</string>
-  <string name="yield_module_fee_policy_sheet_max_fee_note">ネットワーク手数料が上限手数料を超えた場合、手数料が下がるまで取引は成立しません。この制限は後で変更できます。</string>
+  <string name="yield_module_fee_policy_sheet_description">今後の%sの追加入金はすべて、取引手数料が差し引かれた後、Aave に自動的に提供されます。</string>
+  <string name="yield_module_fee_policy_sheet_fee_note">今後の追加入金ごとにおおよそのネットワーク手数料%1$s ( %2$s ) が差し引かれ、 %3$s ( %4$s ) の制限を超えることはありません。</string>
+  <string name="yield_module_fee_policy_sheet_max_fee_note">ネットワーク手数料が上限を超えた場合、手数料が下がるまで取引は成立しません。この制限は後で変更できます。</string>
   <string name="yield_module_fee_policy_sheet_max_fee_title">最大手数料</string>
-  <string name="yield_module_fee_policy_sheet_min_amount_note">最小金額は、ネットワーク手数料がチャージ額の4％を超えないように現在の手数料に基づいて計算されます。その結果、最小金額は%1$s（%2$s）となります。</string>
+  <string name="yield_module_fee_policy_sheet_min_amount_note">最小金額は現在のネットワーク手数料に基づいて計算され、入金額の4% 、つまり最小の%1$s ( %2$s ) を超えないようにします。</string>
   <string name="yield_module_fee_policy_sheet_min_amount_title">最低入金額</string>
   <string name="yield_module_fee_policy_sheet_title">入金手数料ポリシー</string>
-  <string name="yield_module_fee_policy_tangem_service_fee_title">Tangemはまた、得られた利回りに対して15%のサービス手数料を差し引きます。</string>
+  <string name="yield_module_fee_policy_tangem_service_fee_title">Tangemは、生成された利息に対して15%サービス手数料も徴収します。</string>
   <string name="yield_module_high_fee_error">ネットワーク手数料が下がるか、残高が最低必要額に達すると、資金は自動的にAaveに供給されます。</string>
   <string name="yield_module_historical_returns">過去のリターン</string>
   <string name="yield_module_main_view_approve_notification_description">利息モードでのトークンの承認が取り消されました。トークンを開いて再度許可してください。</string>
   <string name="yield_module_main_view_approve_notification_title">トークンの承認が必要です</string>
   <string name="yield_module_network_fee_unreachable_notification_description">ネットワーク接続を確認してください</string>
   <string name="yield_module_network_fee_unreachable_notification_title">ネットワーク手数料についての情報にアクセスできません</string>
-  <string name="yield_module_promo_screen_auto_balance_subtitle">あなたが行うすべての入金は、自動的にAaveへ供給されます。</string>
+  <string name="yield_module_promo_screen_auto_balance_subtitle">すべての追加入金は自動的にAaveに供給されます。</string>
   <string name="yield_module_promo_screen_auto_balance_subtitle_v2">アカウントのすべての %1$s は自動的に Aave に供給されます。</string>
-  <string name="yield_module_promo_screen_auto_balance_title">Aaveへの自動送金</string>
+  <string name="yield_module_promo_screen_auto_balance_title">Aaveへの自動供給</string>
   <string name="yield_module_promo_screen_cash_out_subtitle">いつでも、即座に資金を送信、交換、売却できます。</string>
   <string name="yield_module_promo_screen_cash_out_title">すぐに利用可能</string>
   <string name="yield_module_promo_screen_how_it_works_button_title">使い方</string>
-  <string name="yield_module_promo_screen_self_custodial_subtitle">Aaveは、総額610億ドル以上の資産を管理する分散型プロトコルです。</string>
+  <string name="yield_module_promo_screen_self_custodial_subtitle">Aave は、ノンカストディアルな流動性市場を提供し、ユーザーが変動レートで利回りを獲得できるようにするオンチェーンプロトコルです。</string>
   <string name="yield_module_promo_screen_self_custodial_title">分散型・自己管理型</string>
   <string name="yield_module_promo_screen_terms_disclaimer">このサービスを利用することにより、プロバイダー\n%1$sおよび%2$sに同意するものとします。</string>
-  <string name="yield_module_promo_screen_title">Aave を接続</string>
+  <string name="yield_module_promo_screen_title">Aaveに接続</string>
   <string name="yield_module_promo_screen_variable_rate_info">Aave %1$s%% • 変動金利</string>
   <string name="yield_module_provider">Aave</string>
   <string name="yield_module_rate_info_sheet_chart_average">平均%s</string>
   <string name="yield_module_rate_info_sheet_chart_title">昨年のリターン</string>
-  <string name="yield_module_rate_info_sheet_description">現在の金利は常に変動し、リアルタイムの需要と供給に基づいて、Aaveオンチェーンスマートコントラクトによって自動的に計算されます。</string>
+  <string name="yield_module_rate_info_sheet_description">現在の金利は常に変動しており、リアルタイムの需要と供給に基づいて、Aaveのオンチェーンスマートコントラクトによって自動的に計算されます。</string>
   <string name="yield_module_rate_info_sheet_powered_by">提供</string>
   <string name="yield_module_rate_info_sheet_title">金利は変動します</string>
-  <string name="yield_module_receive_sheet_description">入金すると、資金は自動的にAaveに送金され、利息が付き始めます。%sが取引手数料として差し引かれます。</string>
+  <string name="yield_module_receive_sheet_description">チャージすると、資金は自動的にAaveに供給され、利息が生成され始めます。取引手数料として%sが差し引かれます。</string>
   <string name="yield_module_start_earning">資産を供給する</string>
-  <string name="yield_module_start_earning_sheet_description">%sはAaveに供給されますが、管理可能な状態のままになります。</string>
+  <string name="yield_module_start_earning_sheet_description">%sはロックなしでAaveに提供され、いつでもアクセス可能な状態になります。</string>
   <string name="yield_module_start_earning_sheet_fee_policy">入金手数料ポリシーを見る</string>
   <string name="yield_module_start_earning_sheet_next_deposits">次回の入金は自動的にAaveに供給されます。</string>
   <string name="yield_module_start_earning_sheet_next_deposits_v2">今後のすべての %1$s 入金は自動的に Aave に供給されます。</string>
@@ -1891,20 +1892,20 @@
   <string name="yield_module_status_paused">停止中</string>
   <string name="yield_module_stop_earning">利回りモードを解除中</string>
   <string name="yield_module_stop_earning_sheet_description">これをオフにすると、Aaveから資産が引き出され、ウォレット内の%sに変換され、利回りの発生が停止します。</string>
-  <string name="yield_module_stop_earning_sheet_fee_note">ネットワーク手数料とは、ブロックチェーン上で取引を処理して承認するためにユーザーが支払う料金のことです。</string>
-  <string name="yield_module_stop_earning_sheet_title">利回りモードを無効にする</string>
+  <string name="yield_module_stop_earning_sheet_fee_note">利息モードを終了すると、ブロックチェーンによってネットワーク料金が請求されます。</string>
+  <string name="yield_module_stop_earning_sheet_title">利息モードを無効にする</string>
   <string name="yield_module_supply">供給</string>
   <string name="yield_module_supply_apr">供給APY</string>
   <string name="yield_module_token_details_earn_notification_apy">APY</string>
-  <string name="yield_module_token_details_earn_notification_description">利息は自動的に発生します。</string>
+  <string name="yield_module_token_details_earn_notification_description">利息は自動的に発生します</string>
   <string name="yield_module_token_details_earn_notification_earning_on_your_balance_subtitle">利息は自動的に発生します</string>
-  <string name="yield_module_token_details_earn_notification_earning_on_your_balance_title">利回りモード</string>
-  <string name="yield_module_token_details_earn_notification_processing">入金の処理中</string>
+  <string name="yield_module_token_details_earn_notification_earning_on_your_balance_title">利息モード</string>
+  <string name="yield_module_token_details_earn_notification_processing">利息モードの有効化</string>
   <string name="yield_module_token_details_earn_notification_title">利息モード</string>
   <string name="yield_module_transfer_mode_automatic">自動</string>
-  <string name="yield_module_unable_to_cover_fee_description">取引のネットワーク手数料をカバーするために、 %1$s %2$sを入金してください</string>
+  <string name="yield_module_unable_to_cover_fee_description">取引のネットワーク手数料をカバーするために、 %1$s %2$sを追加してください。</string>
   <string name="yield_module_unable_to_cover_fee_title">%s手数料を支払えません</string>
-  <string name="yield_module_unavailable_subtitle">現在、利息モードのサービスは利用できません。しばらくしてから再度お試しください。</string>
+  <string name="yield_module_unavailable_subtitle">現在、利息モードはご利用いただけません。しばらくしてからもう一度お試しください。</string>
   <string name="yield_module_unavailable_title">利息モードは利用できません</string>
   <string name="yield_supply_chart_loading_error">チャートを読み込めません・・</string>
 </resources>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index eb34b26afd..b77cf5fb56 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -446,6 +446,7 @@
   <string name="home_button_create_new_wallet">Создать новый кошелек</string>
   <string name="home_button_order">Купить</string>
   <string name="home_button_scan">Сканировать</string>
+  <string name="hot_access_code_set_biometric_ask">Разрешить приложению Tangem использовать биометрическую аутентификацию для подтверждения вашей личности и открытия приложения?</string>
   <string name="hot_crypto_add_token_subtitle">в %s</string>
   <string name="hot_crypto_token_network">В сети %s</string>
   <string name="hw_access_code_create_alert_title">Вы уверены, что хотите прервать процесс создания кода доступа?</string>
@@ -456,24 +457,48 @@
   <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_banner_description">Хранит вашу криптовалюту в безопасности и офлайн. Тонкая, как банковская карта — надёжнее банковского хранилища.</string>
   <string name="hw_backup_close_description">Если вы это сделаете, придётся начать заново.</string>
   <string name="hw_backup_google_drive_description">Восстановить существующий кошелёк через резервную копию Google Drive</string>
   <string name="hw_backup_google_drive_title">Google Drive бэкап</string>
+  <string name="hw_backup_hardware_create_description">Создайте новый защищённый кошелёк и переведите свои средства для максимальной защиты.</string>
+  <string name="hw_backup_hardware_create_title">Создать новый кошелек</string>
   <string name="hw_backup_hardware_description">Повысьте уровень безопасности с помощью продвинутого аппаратного кошелька Tangem.</string>
   <string name="hw_backup_hardware_title">Аппаратный кошелёк</string>
+  <string name="hw_backup_hardware_upgrade_description">Перенести текущий кошелёк в Tangem Wallet.</string>
+  <string name="hw_backup_hardware_upgrade_title">Улучшить текущий кошелёк</string>
   <string name="hw_backup_need_action">Перейти к бэкапу</string>
   <string name="hw_backup_need_description">Пожалуйста, создайте резервную копию вашего кошелька перед установкой кода доступа.</string>
+  <string name="hw_backup_need_finish_first">Сначала завершите резервное копирование</string>
   <string name="hw_backup_need_title">Сначала завершите создание резервной копии</string>
   <string name="hw_backup_no_backup">Не завершено</string>
+  <string name="hw_backup_section_other_title">Другие способы</string>
   <string name="hw_backup_seed_description">Физические устройства, которые надёжно хранят ваш приватный ключ офлайн.</string>
   <string name="hw_backup_seed_title">Фраза восстановления</string>
+  <string name="hw_backup_to_secure_description">Чтобы защитить ваш кошелёк с помощью кода доступа, сначала завершите резервное копирование.</string>
+  <string name="hw_backup_to_upgrade_description">Чтобы улучшить кошелёк до аппаратного, сначала создайте резервную копию.</string>
   <string name="hw_create_keys_description">Ваши приватные ключи надёжно зашифрованы и хранятся на вашем телефоне</string>
   <string name="hw_create_keys_title">Ключи хранятся в приложении</string>
   <string name="hw_create_seed_description">Создайте или восстановите свой кошелёк с помощью фразы восстановления — вашей встроенной резервной копии</string>
   <string name="hw_create_seed_title">Резервная копия сид-фразы</string>
   <string name="hw_create_title">Создать мобильный кошелек</string>
+  <string name="hw_import_existing_wallet">Импортировать существующий кошелек</string>
   <string name="hw_import_seed_phrase_already_imported">Эта фраза восстановления уже была импортирована</string>
   <string name="hw_mobile_wallet">Мобильный кошелек</string>
+  <string name="hw_remove_wallet_action_forget_title">Забыть кошелек</string>
+  <string name="hw_remove_wallet_attention_description">Этот кошелёк будет окончательно удалён с вашего устройства.</string>
+  <string name="hw_remove_wallet_confirmation_title">Вы уверены, что хотите выполнить эту операцию?</string>
+  <string name="hw_remove_wallet_nav_title">Забыть кошелек</string>
+  <string name="hw_remove_wallet_notification_action_backup_go">Перейти к резервному копированию</string>
+  <string name="hw_remove_wallet_notification_action_backup_view">Посмотреть резервное копирование</string>
+  <string name="hw_remove_wallet_notification_action_forget">Забыть кошелек</string>
+  <string name="hw_remove_wallet_notification_action_forget_anyway">Забыть всё равно</string>
+  <string name="hw_remove_wallet_notification_description_has_backup">Резервная копия этого кошелька существует. Проверьте её перед удалением, чтобы убедиться, что сможете восстановить кошелёк позже.</string>
+  <string name="hw_remove_wallet_notification_description_without_backup">Если вы удалите этот кошелёк без резервной копии, вы навсегда потеряете доступ к своим средствам.</string>
+  <string name="hw_remove_wallet_notification_title">Забыть этот кошелек?</string>
+  <string name="hw_remove_wallet_warning_access">Я понимаю, что если я не создал резервную копию кошелька перед его удалением, я могу потерять к нему доступ.</string>
+  <string name="hw_remove_wallet_warning_device">Я понимаю, что удаление моего кошелька не стирает его — оно просто удаляет его с моего устройства.</string>
+  <string name="hw_upgrade_backup_description">Фраза восстановления больше не нужна — ваша карта или кольцо Tangem становятся вашей надёжной резервной копией.</string>
   <string name="hw_upgrade_error_card_already_has_wallet">Это устройство не может быть использовано для апгрейда, оно уже содержит другой кошелек.</string>
   <string name="hw_upgrade_error_card_key_import">Выберите другое устройство. Это нельзя использовать для обновления.</string>
   <string name="hw_upgrade_error_wallet2_card_required">Во время операции произошла ошибка.</string>
@@ -1312,6 +1337,7 @@
   <string name="user_push_notification_banner_subtitle">Включите push-уведомления, и мы мгновенно сообщим вам, когда поступят средства.</string>
   <string name="user_push_notification_banner_title">Не пропустите транзакцию</string>
   <string name="user_wallet_list_add_button">Добавить новый кошелек</string>
+  <string name="user_wallet_list_delete_hw_prompt">Если вы удалите этот кошелёк без резервной копии, вы навсегда потеряете доступ к своим средствам.</string>
   <string name="user_wallet_list_delete_prompt">Вы уверены, что хотите забыть этот кошелек?</string>
   <string name="user_wallet_list_error_unable_to_unlock">Произошла ошибка, пожалуйста, отсканируйте свою карту или кольцо для входа</string>
   <string name="user_wallet_list_error_wallet_already_saved">Этот кошелек уже был сохранен, вы можете добавить другой</string>
@@ -1633,8 +1659,8 @@
   <string name="yield_module_promo_screen_cash_out_subtitle">Отправляйте, обменивайте или продавайте свои средства мгновенно, когда захотите.</string>
   <string name="yield_module_promo_screen_cash_out_title">Свободный доступ</string>
   <string name="yield_module_promo_screen_how_it_works_button_title">Как это работает?</string>
-  <string name="yield_module_promo_screen_self_custodial_subtitle">Aave — ончейн-протокол для некостодиальных рынков ликвидности, позволяющий получать доход с переменной ставкой.</string>
-  <string name="yield_module_promo_screen_self_custodial_title">Децентрализованный и некостодиальный</string>
+  <string name="yield_module_promo_screen_self_custodial_subtitle">Aave — ончейн-протокол для некастодиальных рынков ликвидности, позволяющий получать доход с переменной ставкой.</string>
+  <string name="yield_module_promo_screen_self_custodial_title">Децентрализованный и некастодиальный</string>
   <string name="yield_module_promo_screen_terms_disclaimer">Используя сервис, вы соглашаетесь с %1$s и %2$s</string>
   <string name="yield_module_promo_screen_title">Подключить Aave</string>
   <string name="yield_module_promo_screen_variable_rate_info">Aave %1$s%% • Плавающая ставка</string>
@@ -1664,6 +1690,9 @@
   <string name="yield_module_token_details_earn_notification_earning_on_your_balance_title">Режим доходности</string>
   <string name="yield_module_token_details_earn_notification_processing">Включение режима доходности</string>
   <string name="yield_module_token_details_earn_notification_title">Режим доходности</string>
+  <string name="yield_module_transaction_enter">Доход включен</string>
+  <string name="yield_module_transaction_exit">Доход выключен</string>
+  <string name="yield_module_transaction_topup">Доход - пополнение</string>
   <string name="yield_module_transfer_mode_automatic">Автоматически</string>
   <string name="yield_module_unable_to_cover_fee_description">Внесите немного %1$s %2$s, чтобы покрыть комиссию сети за транзакции.</string>
   <string name="yield_module_unable_to_cover_fee_title">Невозможно покрыть комиссию в %s</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 e86e8f9877..8fc009f93b 100644
--- a/core/res/src/main/res/values-uk-rUA/strings.xml
+++ b/core/res/src/main/res/values-uk-rUA/strings.xml
@@ -182,6 +182,7 @@
   <string name="common_import">Імпортувати</string>
   <string name="common_in_progress">В процесі</string>
   <string name="common_later">Пізніше</string>
+  <string name="common_learn_more">Дізнатися більше</string>
   <string name="common_left">Залишилося %1$s</string>
   <string name="common_locked">Заблокований</string>
   <string name="common_main_network">Основна мережа</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index 21f5246f51..6c0c43f6d2 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -286,7 +286,7 @@
   <string name="common_import">Import</string>
   <string name="common_in_progress">In progress</string>
   <string name="common_later">Later</string>
-  <string name="common_learn_more">Learn more</string>
+  <string name="common_learn_more">Learn more</string>
   <string name="common_left">%1$s left</string>
   <string name="common_legacy_bitcoin_address">Legacy Bitcoin</string>
   <string name="common_locked">Locked</string>
@@ -1402,12 +1402,12 @@
   <string name="tangempay_card_details_hide_text">Hide</string>
   <string name="tangempay_card_details_open_wallet_button">Open Google Wallet</string>
   <string name="tangempay_card_details_open_wallet_notification_subtitle">Set up Tangem Pay in a few taps and start paying with Google Pay.</string>
+  <string name="tangempay_card_details_open_wallet_notification_subtitle_apple">Set up Tangem Pay in a few taps and start paying with Apple Pay.</string>
   <string name="tangempay_card_details_open_wallet_notification_title">Add your card to Google Pay</string>
   <string name="tangempay_card_details_open_wallet_notification_title_apple">Add your card to Apple Pay</string>
   <string name="tangempay_card_details_open_wallet_step_1">Open Google Wallet</string>
-  <string name="tangempay_card_details_open_wallet_step_1.5_apple">Tap “+” button on the top right</string>
-  <string name="tangempay_card_details_open_wallet_step_1_apple_open">Open</string>
-  <string name="tangempay_card_details_open_wallet_step_1_apple_wallet">Apple Wallet</string>
+  <string name="tangempay_card_details_open_wallet_step_1_5_apple">Tap “+” button on the top right</string>
+  <string name="tangempay_card_details_open_wallet_step_1_apple">Open Apple Wallet</string>
   <string name="tangempay_card_details_open_wallet_step_2">Tap “Add a card”</string>
   <string name="tangempay_card_details_open_wallet_step_2_apple">Tap “Debit or Credit Card”</string>
   <string name="tangempay_card_details_open_wallet_step_3">Enter the card details manually</string>
@@ -1518,7 +1518,7 @@
   <string name="user_push_notification_banner_subtitle">Enable push notifications to receive alerts when funds arrive in your wallet.</string>
   <string name="user_push_notification_banner_title">Don\'t Miss a Transaction</string>
   <string name="user_wallet_list_add_button">Add new wallet</string>
-  <string name="user_wallet_list_delete_hw_prompt">If you delete this wallet without a backup, you will permanently lose access to your funds</string>
+  <string name="user_wallet_list_delete_hw_prompt">If you delete this wallet without a backup, you will permanently lose access to your funds.</string>
   <string name="user_wallet_list_delete_prompt">Are you sure you want to forget this wallet?</string>
   <string name="user_wallet_list_error_unable_to_unlock">An error has occurred, please scan your card or ring to log in</string>
   <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
@@ -1975,6 +1975,9 @@
   <string name="yield_module_token_details_earn_notification_earning_on_your_balance_title">Yield Mode</string>
   <string name="yield_module_token_details_earn_notification_processing">Enabling Yield Mode</string>
   <string name="yield_module_token_details_earn_notification_title">Yield Mode</string>
+  <string name="yield_module_transaction_enter">Yield mode on</string>
+  <string name="yield_module_transaction_exit">Yield mode off</string>
+  <string name="yield_module_transaction_topup">Yield mode top-up</string>
   <string name="yield_module_transfer_mode_automatic">Automatic</string>
   <string name="yield_module_unable_to_cover_fee_description">Add some %1$s %2$s to cover the network fee for transactions.</string>
   <string name="yield_module_unable_to_cover_fee_title">Unable to cover %s fee</string>
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt
index f5f82ef61d..7e674c1f59 100644
--- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt
@@ -59,6 +59,9 @@ internal class SdkTransactionTypeConverter(
             "withdrawRewardsPOL",
             -> TxInfo.TransactionType.Staking.ClaimRewards
             "redelegate" -> TxInfo.TransactionType.Staking.Restake
+            "supplyEnter" -> TxInfo.TransactionType.YieldSupply.Enter
+            "supplyExit" -> TxInfo.TransactionType.YieldSupply.Exit
+            "supplyTopUp" -> TxInfo.TransactionType.YieldSupply.Topup
             null -> TxInfo.TransactionType.UnknownOperation
             else -> TxInfo.TransactionType.Operation(name = methodName.replaceFirstChar { it.titlecase() })
         }
diff --git a/domain/legacy/src/main/assets/contract_methods.json b/domain/legacy/src/main/assets/contract_methods.json
index 944b8a716b..5ca94cd491 100644
--- a/domain/legacy/src/main/assets/contract_methods.json
+++ b/domain/legacy/src/main/assets/contract_methods.json
@@ -210,12 +210,12 @@
     "0x79be55f7": {
         "info": "yieldModule",
         "source": "https://github.com/tangem/tangem-yield-module-contracts/",
-        "name": "supply"
+        "name": "supplyEnter"
     },
     "0xc65e6dcf": {
         "info": "yieldModule",
         "source": "https://github.com/tangem/tangem-yield-module-contracts/",
-        "name": "supply"
+        "name": "supplyExit"
     },
     "0xebd4b81c": {
         "info": "yieldModule",
@@ -231,5 +231,10 @@
         "info": "yieldModule",
         "source": "https://github.com/tangem/tangem-yield-module-contracts/",
         "name": "transfer"
+    },
+    "0xb9de6a93": {
+        "info": "yieldModule",
+        "source": "https://github.com/tangem/tangem-yield-module-contracts/",
+        "name": "supplyTopUp"
     }
 }
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
index ed13b42827..65467f7460 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
@@ -115,6 +115,9 @@ data class TxInfo(
 
             @Serializable
             data object Exit : YieldSupply
+
+            @Serializable
+            data object Topup : YieldSupply
         }
 
         @Serializable
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt
index b7f7417185..ed746b30a4 100644
--- a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt
@@ -61,20 +61,18 @@ class YieldSupplyGetMaxFeeUseCase(
             .firstOrNull { it.yieldSupplyKey == token.yieldSupplyKey() }
         val marketToken = cachedMarketToken ?: yieldSupplyRepository.getTokenStatus(token)
         val maxFeeNative = marketToken.maxFeeNative
-        val maxFeeToken = maxFeeNative.multiply(nativeFiatRate)
+        val fiatMaxFee = maxFeeNative.multiply(nativeFiatRate)
 
-        val rateRatio = nativeFiatRate.divide(
+        val maxFeeToken = fiatMaxFee.divide(
             fiatRate,
             cryptoCurrencyStatus.currency.decimals,
             RoundingMode.HALF_UP,
         )
 
-        val tokenValue = rateRatio.multiply(maxFeeNative)
-
         YieldSupplyMaxFee(
             nativeMaxFee = maxFeeNative,
             tokenMaxFee = maxFeeToken,
-            fiatMaxFee = tokenValue.stripTrailingZeros(),
+            fiatMaxFee = fiatMaxFee.stripTrailingZeros(),
         )
     }
 }
\ No newline at end of file
diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
index 33ef338944..c575a8070d 100644
--- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
+++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
@@ -10,6 +10,7 @@ import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.utils.toTimeFormat
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.network.TxInfo
+import com.tangem.domain.models.network.TxInfo.TransactionType
 import com.tangem.features.txhistory.impl.R
 import com.tangem.features.txhistory.utils.TxHistoryUiActions
 import com.tangem.utils.StringsSigns
@@ -59,19 +60,22 @@ internal class TxHistoryItemToTransactionStateConverter(
         }
     }
 
+    @Suppress("CyclomaticComplexMethod")
     private fun TxInfo.extractTitle(): TextReference = when (val type = type) {
-        is TxInfo.TransactionType.Approve -> resourceReference(R.string.common_approval)
-        is TxInfo.TransactionType.Operation -> stringReference(type.name)
-        is TxInfo.TransactionType.Swap -> resourceReference(R.string.common_swap)
-        is TxInfo.TransactionType.Transfer -> resourceReference(R.string.common_transfer)
-        is TxInfo.TransactionType.YieldSupply -> resourceReference(R.string.yield_module_supply)
-        is TxInfo.TransactionType.Staking.Stake -> resourceReference(R.string.common_stake)
-        is TxInfo.TransactionType.Staking.Unstake -> resourceReference(R.string.common_unstake)
-        is TxInfo.TransactionType.Staking.Vote -> resourceReference(R.string.staking_vote)
-        is TxInfo.TransactionType.Staking.ClaimRewards -> resourceReference(R.string.common_claim_rewards)
-        is TxInfo.TransactionType.Staking.Withdraw -> resourceReference(R.string.staking_withdraw)
-        is TxInfo.TransactionType.Staking.Restake -> resourceReference(R.string.staking_restake)
-        is TxInfo.TransactionType.UnknownOperation -> resourceReference(R.string.transaction_history_operation)
+        is TransactionType.Approve -> resourceReference(R.string.common_approval)
+        is TransactionType.Operation -> stringReference(type.name)
+        is TransactionType.Swap -> resourceReference(R.string.common_swap)
+        is TransactionType.Transfer -> resourceReference(R.string.common_transfer)
+        is TransactionType.YieldSupply.Enter -> resourceReference(R.string.yield_module_transaction_enter)
+        is TransactionType.YieldSupply.Exit -> resourceReference(R.string.yield_module_transaction_exit)
+        is TransactionType.YieldSupply.Topup -> resourceReference(R.string.yield_module_transaction_topup)
+        is TransactionType.Staking.Stake -> resourceReference(R.string.common_stake)
+        is TransactionType.Staking.Unstake -> resourceReference(R.string.common_unstake)
+        is TransactionType.Staking.Vote -> resourceReference(R.string.staking_vote)
+        is TransactionType.Staking.ClaimRewards -> resourceReference(R.string.common_claim_rewards)
+        is TransactionType.Staking.Withdraw -> resourceReference(R.string.staking_withdraw)
+        is TransactionType.Staking.Restake -> resourceReference(R.string.staking_restake)
+        is TransactionType.UnknownOperation -> resourceReference(R.string.transaction_history_operation)
     }
 
     private fun TxInfo.extractSubtitle(): TextReference = when (val interactionAddress = interactionAddressType) {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
index d926942932..be2bd415fe 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
@@ -67,12 +67,15 @@ internal class TxHistoryItemStateConverter(
         }
     }
 
+    @Suppress("CyclomaticComplexMethod")
     private fun TxInfo.extractTitle(): TextReference = when (val type = type) {
         is TransactionType.Approve -> resourceReference(R.string.common_approval)
         is TransactionType.Operation -> stringReference(type.name)
         is TransactionType.Swap -> resourceReference(R.string.common_swap)
         is TransactionType.Transfer -> resourceReference(R.string.common_transfer)
-        is TransactionType.YieldSupply -> resourceReference(R.string.yield_module_supply)
+        is TransactionType.YieldSupply.Enter -> resourceReference(R.string.yield_module_transaction_enter)
+        is TransactionType.YieldSupply.Exit -> resourceReference(R.string.yield_module_transaction_exit)
+        is TransactionType.YieldSupply.Topup -> resourceReference(R.string.yield_module_transaction_topup)
         is TransactionType.Staking.Stake -> resourceReference(R.string.common_stake)
         is TransactionType.Staking.Unstake -> resourceReference(R.string.common_unstake)
         is TransactionType.Staking.Vote -> resourceReference(R.string.staking_vote)
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt
index ee74e2b820..20e09cc6cb 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt
@@ -15,7 +15,6 @@ internal sealed class YieldSupplyFeeUM {
         val feeFiatValue: TextReference,
         // TODO move to FeePolicyUM
         val estimatedFiatValue: TextReference,
-        val tokenFeeFiatValue: TextReference,
         val maxNetworkFeeFiatValue: TextReference,
         val minTopUpFiatValue: TextReference,
         val feeNoteValue: TextReference = TextReference.EMPTY,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt
index d2b8c520de..71645d1247 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt
@@ -149,7 +149,6 @@ private class YieldSupplyActionContentPreviewProvider : PreviewParameterProvider
                 yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
                     transactionDataList = persistentListOf(),
                     feeFiatValue = stringReference("$0.99"),
-                    tokenFeeFiatValue = stringReference("$1.45"),
                     maxNetworkFeeFiatValue = stringReference("$8.50"),
                     minTopUpFiatValue = stringReference("$50"),
                     feeNoteValue = TextReference.EMPTY,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/transformers/YieldSupplyActiveFeeContentTransformer.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/transformers/YieldSupplyActiveFeeContentTransformer.kt
index dbabb4a9f5..44e98e521f 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/transformers/YieldSupplyActiveFeeContentTransformer.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/transformers/YieldSupplyActiveFeeContentTransformer.kt
@@ -37,11 +37,12 @@ internal class YieldSupplyActiveFeeContentTransformer(
         val tokenFiatFeeValueText = tokenFiatFee.format { fiat(appCurrency.code, appCurrency.symbol) }
 
         val maxFeeCryptoValueText = maxNetworkFee.tokenMaxFee.format { crypto(cryptoCurrency) }
-        val maxFiatFeeValueText = maxNetworkFee.fiatMaxFee.format { fiat(
-            appCurrency.code,
-            appCurrency
-                .symbol,
-        ) }
+        val maxFiatFeeValueText = maxNetworkFee.fiatMaxFee.format {
+            fiat(
+                appCurrency.code,
+                appCurrency.symbol,
+            )
+        }
 
         val feeNoteValue: TextReference = resourceReference(
             id = R.string.yield_module_fee_policy_sheet_fee_note,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt
index e2c89da4c0..baa31bd4fd 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt
@@ -254,7 +254,6 @@ internal class YieldSupplyApproveModel @Inject constructor(
                             approvalTransitionData.copy(fee = transactionFee.normal),
                         ),
                         feeFiatValue = stringReference(fiatFee),
-                        tokenFeeFiatValue = TextReference.EMPTY,
                         maxNetworkFeeFiatValue = TextReference.EMPTY,
                         minTopUpFiatValue = TextReference.EMPTY,
                         feeNoteValue = TextReference.EMPTY,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt
index f00297a2f9..d4593e4ca6 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt
@@ -171,7 +171,6 @@ private fun YieldSupplyFeePolicyContent_Preview() {
                 transactionDataList = persistentListOf(),
                 feeFiatValue = stringReference("$1.45"),
                 maxNetworkFeeFiatValue = stringReference("$8.50"),
-                tokenFeeFiatValue = stringReference("$1.45"),
                 minTopUpFiatValue = stringReference("$50"),
                 feeNoteValue = resourceReference(
                     id = R.string.yield_module_fee_policy_sheet_fee_note,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
index 3446144179..bc56f86994 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
@@ -192,7 +192,7 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
                         updatedTransactionList = updatedTransactionList,
                         feeValue = feeSum,
                         maxNetworkFee = maxFee,
-                        estimatedFeeValue = estimatedFee,
+                        estimatedFeeValueInTokenCurrency = estimatedFee,
                         minAmount = minAmount,
                     ),
                 )
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt
index 782c6b2d3e..58aba7dc22 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt
@@ -16,7 +16,6 @@ import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
 import com.tangem.utils.transformer.Transformer
 import kotlinx.collections.immutable.toPersistentList
 import java.math.BigDecimal
-import java.math.RoundingMode
 
 @Suppress("LongParameterList")
 internal class YieldSupplyStartEarningFeeContentTransformer(
@@ -25,7 +24,7 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
     private val appCurrency: AppCurrency,
     private val updatedTransactionList: List<TransactionData.Uncompiled>,
     private val feeValue: BigDecimal,
-    private val estimatedFeeValue: BigDecimal,
+    private val estimatedFeeValueInTokenCurrency: BigDecimal,
     private val maxNetworkFee: YieldSupplyMaxFee,
     private val minAmount: BigDecimal,
 ) : Transformer<YieldSupplyActionUM> {
@@ -37,14 +36,10 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
         val feeFiat = feeFiatRate?.let(feeValue::multiply)
         val feeFiatValueText = feeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
 
-        val estimatedFeeFiat = estimatedFeeValue
-        val estimatedFeeFiatValueText = estimatedFeeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
-
-        val tokenCryptoFee = tokenFiatRate?.let { rate ->
-            estimatedFeeFiat.divide(rate, cryptoCurrency.decimals, RoundingMode.HALF_UP)
-        }
-        val tokenCryptoFeeValueText = tokenCryptoFee.format { crypto(cryptoCurrency) }
-        val tokenFiatFeeValueText = estimatedFeeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
+        val estimatedFeeToken = estimatedFeeValueInTokenCurrency
+        val estimatedFeeTokenValueText = estimatedFeeToken.format { crypto(cryptoCurrency) }
+        val estimatedFiatFee = tokenFiatRate?.let(estimatedFeeToken::multiply)
+        val estimatedFeeFiatValueText = estimatedFiatFee.format { fiat(appCurrency.code, appCurrency.symbol) }
 
         val maxFeeCryptoValueText = maxNetworkFee.tokenMaxFee.format { crypto(cryptoCurrency) }
         val maxFiatFeeValueText = maxNetworkFee.fiatMaxFee.format { fiat(appCurrency.code, appCurrency.symbol) }
@@ -56,8 +51,8 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
         val feeNoteValue = resourceReference(
             id = R.string.yield_module_fee_policy_sheet_fee_note,
             formatArgs = wrappedList(
-                tokenFiatFeeValueText,
-                tokenCryptoFeeValueText,
+                estimatedFeeFiatValueText,
+                estimatedFeeTokenValueText,
                 maxFiatFeeValueText,
                 maxFeeCryptoValueText,
             ),
@@ -78,7 +73,6 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
                 yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
                     transactionDataList = updatedTransactionList.toPersistentList(),
                     feeFiatValue = stringReference(feeFiatValueText),
-                    tokenFeeFiatValue = stringReference(tokenFiatFeeValueText),
                     maxNetworkFeeFiatValue = stringReference(maxFiatFeeValueText),
                     minTopUpFiatValue = stringReference(minAmountFiatText),
                     feeNoteValue = feeNoteValue,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt
index 6c1881f305..51d0fc112d 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt
@@ -34,7 +34,6 @@ internal class YieldSupplyStopEarningFeeContentTransformer(
                 yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
                     transactionDataList = transactions.toPersistentList(),
                     feeFiatValue = stringReference(fiatFeeText),
-                    tokenFeeFiatValue = TextReference.EMPTY,
                     maxNetworkFeeFiatValue = TextReference.EMPTY,
                     minTopUpFiatValue = TextReference.EMPTY,
                     feeNoteValue = TextReference.EMPTY,