diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt
index af6ec9280b..582b5f178c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt
@@ -12,12 +12,10 @@ internal class WalletDetailsButtonsRow @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
 ) : LinearLayout(context, attrs, defStyleAttr) {
-
     private val binding = ViewWalletDetailsButtonsRowBinding.inflate(
         LayoutInflater.from(context),
         this,
     )
-
     var onBuyClick: (() -> Unit)? = null
     var onSellClick: (() -> Unit)? = null
     var onTradeClick: (() -> Unit)? = null
@@ -40,16 +38,12 @@ internal class WalletDetailsButtonsRow @JvmOverloads constructor(
         sellAllowed: Boolean,
         sendAllowed: Boolean,
     ) = with(binding) {
-        if (exchangeServiceFeatureOn) {
-            btnBuy.isVisible = (buyAllowed && !sellAllowed) || (!buyAllowed && !sellAllowed)
-            btnBuy.isEnabled = buyAllowed
-            btnSell.isVisible = !buyAllowed && sellAllowed
-            btnTrade.isVisible = buyAllowed && sellAllowed
-        } else {
-            btnBuy.isVisible = false
-            btnSell.isVisible = false
-            btnTrade.isVisible = false
-        }
+        containerExchangeButtons.isVisible = exchangeServiceFeatureOn
+
+        btnBuy.isVisible = (buyAllowed && !sellAllowed) || (!buyAllowed && !sellAllowed)
+        btnBuy.isEnabled = buyAllowed
+        btnSell.isVisible = !buyAllowed && sellAllowed
+        btnTrade.isVisible = buyAllowed && sellAllowed
         btnSend.isEnabled = sendAllowed
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_wallet_details_buttons_row.xml b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
index 39017f271f..3f62e6c9fb 100644
--- a/app/src/main/res/layout/view_wallet_details_buttons_row.xml
+++ b/app/src/main/res/layout/view_wallet_details_buttons_row.xml
@@ -8,6 +8,7 @@
     tools:parentTag="android.widget.LinearLayout">
 
     <FrameLayout
+        android:id="@+id/container_exchange_buttons"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
@@ -21,7 +22,7 @@
             android:text="@string/wallet_button_trade"
             android:visibility="gone"
             app:icon="@drawable/ic_arrows_up_down"
-            tools:visibility="visible" />
+            />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_buy"
@@ -38,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/wallet_button_sell"
-            android:visibility="gone"
+            android:visibility="visible"
             app:icon="@drawable/ic_arrow_down" />
 
     </FrameLayout>
@@ -48,7 +49,6 @@
         android:id="@+id/btn_send"
         style="@style/TapButtonWithIcon"
         android:layout_width="0dp"
-        android:layout_marginStart="6dp"
         android:layout_weight="1"
         android:text="@string/wallet_button_send"
         app:icon="@drawable/ic_send" />