diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
index d71adc7cc8..15044dd26f 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@@ -243,7 +243,7 @@ internal class SendStateSubscriber(
         }
 
         val filter = DecimalDigitsInputFilter(
-            digitsBeforeDecimal = 12,
+            digitsBeforeDecimal = 40,
             digitsAfterDecimal = state.maxLengthOfAmount,
             decimalSeparator = state.decimalSeparator,
         )
diff --git a/app/src/main/res/layout/layout_send_amount.xml b/app/src/main/res/layout/layout_send_amount.xml
index fb744b5755..b8f987e234 100644
--- a/app/src/main/res/layout/layout_send_amount.xml
+++ b/app/src/main/res/layout/layout_send_amount.xml
@@ -7,63 +7,34 @@
     android:layout_height="wrap_content"
     app:layout_constraintTop_toBottomOf="@+id/tilAddress">
 
-    <FrameLayout
-        android:id="@+id/flAmountToSend"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilAmountToSend"
+        style="@style/SecondaryTextInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:errorIconDrawable="@null"
+        android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <FrameLayout
-            android:id="@+id/flShadow"
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/etAmountToSend"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:focusable="false"
-            android:visibility="invisible">
+            android:layout_height="82dp"
+            android:background="@color/background_secondary"
+            android:fontFamily="sans-serif-light"
+            android:imeOptions="actionDone"
+            android:inputType="numberDecimal"
+            android:paddingStart="0dp"
+            android:paddingEnd="96dp"
+            android:textColor="@color/text_primary_1"
+            android:textSize="@dimen/text_size_amount_to_send"
+            tools:text="139" />
 
-            <TextView
-                android:id="@+id/tvAmountToSendShadow"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:focusable="false"
-                android:fontFamily="sans-serif-light"
-                android:maxLines="1"
-                android:paddingStart="0dp"
-                android:paddingEnd="96dp"
-                android:textSize="@dimen/text_size_amount_to_send"
-                app:autoSizeTextType="uniform" />
-
-        </FrameLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/tilAmountToSend"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            style="@style/SecondaryTextInputLayout"
-            app:errorIconDrawable="@null">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/etAmountToSend"
-                android:background="@color/background_secondary"
-                android:layout_width="match_parent"
-                android:layout_height="82dp"
-                android:fontFamily="sans-serif-light"
-                android:imeOptions="actionDone"
-                android:inputType="numberDecimal"
-                android:paddingStart="0dp"
-                android:paddingEnd="96dp"
-                android:textSize="@dimen/text_size_amount_to_send"
-                android:textColor="@color/text_primary_1"
-                tools:text="139" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-    </FrameLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <TextView
         android:id="@+id/tvAmountCurrency"
@@ -84,14 +55,17 @@
 
     <TextView
         android:id="@+id/tvBalance"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
+        android:gravity="end"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:textColor="@color/text_tertiary"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/flAmountToSend" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tilAmountToSend" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file