diff --git a/app/src/main/res/layout/item_currency_wallet.xml b/app/src/main/res/layout/item_currency_wallet.xml
index 3b74abdffd..05af6fcb26 100644
--- a/app/src/main/res/layout/item_currency_wallet.xml
+++ b/app/src/main/res/layout/item_currency_wallet.xml
@@ -52,33 +52,56 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.5"/>
+                app:layout_constraintGuide_percent="0.5" />
 
             <TextView
                 android:id="@+id/tv_currency"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:ellipsize="end"
+                android:maxLines="1"
                 android:paddingStart="16dp"
                 android:paddingEnd="2dp"
                 android:textColor="@color/darkGray6"
                 android:textSize="17sp"
                 android:textStyle="bold"
-                app:layout_constraintStart_toEndOf="@id/iv_currency"
-                android:ellipsize="end"
-                android:maxLines="1"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="@id/vertical_guideline"
                 app:layout_constraintBottom_toBottomOf="@id/guideline"
-                tools:text="Bitcoin" />
+                app:layout_constraintEnd_toStartOf="@+id/tv_amount"
+                app:layout_constraintStart_toEndOf="@id/iv_currency"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Binance Smart Chain Optimal" />
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/vertical_guideline"
+                android:id="@+id/guideline2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintGuide_percent="0.5" />
+                app:layout_constraintGuide_percent="0.45"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="4dp"
+                android:ellipsize="end"
+                android:gravity="end"
+                android:maxEms="12"
+                android:maxLength="12"
+                android:maxLines="1"
+                android:textColor="@color/darkGray6"
+                android:textSize="17sp"
+                android:textStyle="bold"
+                android:visibility="visible"
+                app:layout_constraintEnd_toStartOf="@+id/tv_currency_symbol"
+                app:layout_constraintHorizontal_bias="1.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline2"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="1234567890.1234567890" />
 
             <TextView
                 android:id="@+id/tv_exchange_rate"
@@ -90,8 +113,8 @@
                 android:textColor="@color/darkGray2"
                 android:textSize="14sp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="@id/guideline"
                 app:layout_constraintStart_toEndOf="@id/iv_currency"
+                app:layout_constraintTop_toTopOf="@id/guideline"
                 tools:text="USD 3 588" />
 
             <TextView
@@ -105,8 +128,8 @@
                 android:textSize="14sp"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="@id/guideline"
-                app:layout_constraintStart_toEndOf="@id/iv_currency" />
+                app:layout_constraintStart_toEndOf="@id/iv_currency"
+                app:layout_constraintTop_toTopOf="@id/guideline" />
 
             <TextView
                 android:id="@+id/tv_status_loading"
@@ -123,29 +146,10 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
-            <TextView
-                android:id="@+id/tv_amount"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:layout_marginTop="16dp"
-                android:ellipsize="end"
-                android:gravity="end"
-                android:maxLines="1"
-                android:textColor="@color/darkGray6"
-                android:textSize="17sp"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@id/tv_currency_symbol"
-                app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintStart_toEndOf="@id/vertical_guideline"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="3 588" />
-
             <TextView
                 android:id="@+id/tv_currency_symbol"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:gravity="end"
@@ -155,7 +159,6 @@
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintStart_toEndOf="@id/tv_amount"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="BTC" />
 
@@ -168,8 +171,8 @@
                 android:textColor="@color/darkGray2"
                 android:textSize="14sp"
                 app:layout_constraintBottom_toBottomOf="@id/tv_exchange_rate"
-                app:layout_constraintTop_toTopOf="@id/tv_exchange_rate"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/tv_exchange_rate"
                 tools:text="0.43 USD" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_balance.xml b/app/src/main/res/layout/layout_balance.xml
index b4ac0497dd..9fcac27366 100644
--- a/app/src/main/res/layout/layout_balance.xml
+++ b/app/src/main/res/layout/layout_balance.xml
@@ -9,17 +9,29 @@
 
     <TextView
         android:id="@+id/tv_currency"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:paddingStart="16dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textColor="@color/darkGray6"
         android:textSize="20sp"
         android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/tv_amount"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Bitcoin" />
+        tools:text="Binance Smart Chain Optimal" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.45"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_status_verified"
@@ -90,24 +102,27 @@
 
     <TextView
         android:id="@+id/tv_amount"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:gravity="end"
+        android:maxEms="12"
+        android:maxLength="12"
         android:maxLines="1"
         android:textColor="@color/darkGray6"
         android:textSize="20sp"
         android:textStyle="bold"
+        android:visibility="visible"
         app:autoSizeMaxTextSize="20sp"
         app:autoSizeMinTextSize="12sp"
         app:autoSizeStepGranularity="1sp"
         app:autoSizeTextType="uniform"
         app:layout_constraintBottom_toBottomOf="@id/tv_currency"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@id/tv_currency"
-        tools:text="0.43 BTC" />
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="@+id/guideline2"
+        tools:text="111230.98123128293475943 BTC" />
 
     <TextView
         android:id="@+id/tv_fiat_amount"
@@ -179,8 +194,7 @@
         app:layout_constraintHorizontal_bias="1"
         app:layout_constraintStart_toEndOf="@id/tv_base_currency"
         app:layout_constraintTop_toBottomOf="@id/v_divider"
-        tools:text="0.00434143 ETH"
-        />
+        tools:text="0.00434143 ETH" />
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/group_base_currency"