diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index 3b962facaf..ba4f34f1c1 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -151,28 +151,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/rv_pending_transaction" />
 
-                <include
-                    android:id="@+id/l_buttons_long"
-                    layout="@layout/layout_wallet_long_buttons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    android:layout_marginTop="30dp"
-                    app:layout_constraintTop_toBottomOf="@id/l_address"
-                    app:layout_constraintVertical_bias="1"
-                    app:layout_constraintBottom_toBottomOf="parent" />
-
-                <include
-                    android:id="@+id/l_buttons_short"
-                    layout="@layout/layout_wallet_short_buttons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                        android:layout_marginTop="30dp"
-                        app:layout_constraintTop_toBottomOf="@id/l_address"
-                        app:layout_constraintVertical_bias="1"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.core.widget.NestedScrollView>
@@ -192,6 +170,28 @@
             android:text="@string/main_manage_tokens"
             android:elevation="4dp"
             app:cornerRadius="8dp"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            tools:visibility="gone" />
+
+    <include
+            android:id="@+id/l_buttons_long"
+            layout="@layout/layout_wallet_long_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:visibility="gone" />
+
+    <include
+            android:id="@+id/l_buttons_short"
+            layout="@layout/layout_wallet_short_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:visibility="gone" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/layout_wallet_long_buttons.xml b/app/src/main/res/layout/layout_wallet_long_buttons.xml
index f670b7fd5d..5fc11bef41 100644
--- a/app/src/main/res/layout/layout_wallet_long_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_long_buttons.xml
@@ -17,11 +17,8 @@
         android:id="@+id/btn_confirm_long"
         style="@style/TapButtonWithIcon"
         android:layout_width="0dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginEnd="16dp"
-            android:layout_marginBottom="8dp"
             android:text="@string/wallet_button_send"
-        app:icon="@drawable/ic_send"
+            app:icon="@drawable/ic_send"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/guideline"
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 ed60601395..e235511583 100644
--- a/app/src/main/res/layout/layout_wallet_short_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_short_buttons.xml
@@ -6,38 +6,32 @@
 
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_trade"
-        style="@style/TapButtonWithIcon"
-        android:layout_width="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginBottom="8dp"
-        android:text="@string/wallet_button_trade"
-        app:icon="@drawable/ic_arrows_up_down"
+            android:id="@+id/btn_trade"
+            style="@style/TapButtonWithIcon"
+            android:layout_width="0dp"
+            android:text="@string/wallet_button_trade"
+            app:icon="@drawable/ic_arrows_up_down"
             app:layout_constraintBottom_toBottomOf="parent"
             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" />
+            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"
-        style="@style/TapButtonWithIcon"
-        android:layout_width="0dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:text="@string/wallet_button_send"
-        app:icon="@drawable/ic_send"
-        app:iconGravity="textEnd"
+            android:id="@+id/btn_confirm"
+            style="@style/TapButtonWithIcon"
+            android:layout_width="0dp"
+            android:layout_marginStart="8dp"
+            android:text="@string/wallet_button_send"
+            app:icon="@drawable/ic_send"
+            app:iconGravity="textEnd"
             android:textAlignment="center"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/btn_trade"
-        app:layout_constraintVertical_bias="1" />
+            app:layout_constraintStart_toEndOf="@id/btn_trade"
+            app:layout_constraintVertical_bias="1" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>