diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
index 84d2795401..224f717a2a 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
@@ -128,7 +128,7 @@ class SingleWalletView : WalletView {
         val btnConfirm = if (state.tradeCryptoState.sellingAllowed ||
             state.tradeCryptoState.buyingAllowed
         ) {
-            lButtonsShort.btnConfirmShort
+            lButtonsShort.btnConfirm
         } else {
             lButtonsLong.btnConfirmLong
         }
@@ -136,7 +136,7 @@ class SingleWalletView : WalletView {
         val btnScan = if (state.tradeCryptoState.sellingAllowed ||
             state.tradeCryptoState.buyingAllowed
         ) {
-            lButtonsShort.btnScanShort
+            lButtonsShort.btnScan
         } else {
             lButtonsLong.btnScanLong
         }
@@ -175,14 +175,14 @@ class SingleWalletView : WalletView {
             else -> R.string.wallet_button_trade
         }
         val icon = when {
-            allowedToBuy && !allowedToSell -> R.drawable.ic_arrow_up_short_btn
-            !allowedToBuy && allowedToSell -> R.drawable.ic_arrow_down_short_button
-            allowedToBuy && allowedToSell -> R.drawable.ic_arrows_up_down_short_btn
+            allowedToBuy && !allowedToSell -> R.drawable.ic_arrow_up
+            !allowedToBuy && allowedToSell -> R.drawable.ic_arrow_down
+            allowedToBuy && allowedToSell -> R.drawable.ic_arrows_up_down
             else -> null
         }
         with(binding) {
             lButtonsShort.btnTrade.text = fragment?.getText(text)
-            lButtonsShort.btnTrade.setCompoundDrawablesWithIntrinsicBounds(0, icon ?: 0, 0, 0)
+            icon?.let { lButtonsShort.btnTrade.setIconResource(it) }
             lButtonsShort.btnTrade.setOnClickListener { if (action != null) store.dispatch(action) }
         }
     }
diff --git a/app/src/main/res/layout/layout_wallet_short_buttons.xml b/app/src/main/res/layout/layout_wallet_short_buttons.xml
index 09318739b7..08bdfeef5a 100644
--- a/app/src/main/res/layout/layout_wallet_short_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_short_buttons.xml
@@ -6,58 +6,57 @@
 
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_scan_short"
-        style="@style/TapBlackButton"
+        android:id="@+id/btn_trade"
+        style="@style/TapButtonWithIcon"
         android:layout_width="0dp"
-        android:layout_height="52dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="30dp"
-        android:layout_marginBottom="33dp"
-        android:drawableTop="@drawable/ic_group_1243"
-        android:gravity="bottom|center_horizontal"
-        android:paddingStart="0dp"
-        android:paddingTop="7dp"
-        android:paddingEnd="0dp"
-        android:text="@string/wallet_button_scan"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/btn_trade"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="1" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_trade"
-        style="@style/TapButton"
-        android:layout_width="0dp"
-        android:layout_height="52dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginBottom="33dp"
-        android:drawableTop="@drawable/ic_arrows_up_down_short_btn"
-        android:gravity="bottom|center_horizontal"
-        android:paddingTop="1dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/wallet_button_trade"
-        app:drawableTint="@android:color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btn_confirm_short"
-        app:layout_constraintStart_toEndOf="@+id/btn_scan_short"
+        app:icon="@drawable/ic_arrows_up_down"
+        app:layout_constraintBottom_toTopOf="@id/btn_scan"
+        app:layout_constraintEnd_toStartOf="@id/btn_confirm"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:iconGravity="textEnd"
+        android:textAlignment="center"
         app:layout_constraintVertical_bias="1" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_confirm_short"
-        style="@style/TapButton"
+        android:id="@+id/btn_confirm"
+        style="@style/TapButtonWithIcon"
         android:layout_width="0dp"
-        android:layout_height="52dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="30dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="33dp"
-        android:drawableTop="@drawable/ic_send_short_btn"
-        android:gravity="bottom|center_horizontal"
-        android:paddingTop="2dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/wallet_button_send"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:icon="@drawable/ic_send"
+        app:iconGravity="textEnd"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toTopOf="@id/btn_scan"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/btn_trade"
+        app:layout_constraintStart_toEndOf="@id/btn_trade"
         app:layout_constraintVertical_bias="1" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_scan"
+        style="@style/TapBlackButton"
+        android:layout_width="match_parent"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginBottom="33dp"
+        android:gravity="center"
+        android:paddingTop="7dp"
+        android:text="@string/wallet_button_scan"
+        app:icon="@drawable/ic_scan"
+        app:iconGravity="textEnd"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintVertical_bias="1" />
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file