diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
index 5deff50687..d40eaa4496 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
@@ -42,7 +42,6 @@ class MultiWalletView : WalletView {
 
     private fun showMultiWalletView(fragment: WalletFragment) = with(fragment) {
         tv_twin_card_number.hide()
-        iv_twin_card.hide()
         rv_pending_transaction.hide()
         l_card_balance.hide()
         l_address.hide()
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 14883f5233..b80b989b70 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
@@ -96,7 +96,6 @@ class SingleWalletView : WalletView {
     ) = with(fragment) {
         twinCardsState?.cardNumber?.let { cardNumber ->
             tv_twin_card_number.show()
-            iv_twin_card.show()
             val number = when (cardNumber) {
                 TwinCardNumber.First -> "1"
                 TwinCardNumber.Second -> "2"
@@ -106,7 +105,6 @@ class SingleWalletView : WalletView {
         }
         if (twinCardsState?.cardNumber == null) {
             tv_twin_card_number.hide()
-            iv_twin_card.hide()
         }
         if (twinCardsState?.showTwinOnboarding == true) {
             store.dispatch(NavigationAction.NavigateTo(AppScreen.TwinsOnboarding))
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index c126a81921..3733c23089 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -61,39 +61,33 @@
                     android:src="@drawable/card_placeholder"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <ImageView
-                    android:id="@+id/iv_twin_card"
-                    android:layout_width="100dp"
-                    android:layout_height="30dp"
-                    android:layout_marginStart="25dp"
-                    android:elevation="3dp"
-                    android:src="@drawable/shape_chip"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_card"
-                    app:layout_constraintStart_toStartOf="@id/iv_card"
-                    app:layout_constraintTop_toBottomOf="@id/iv_card" />
-
                 <TextView
                     android:id="@+id/tv_twin_card_number"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minHeight="30dp"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
                     android:elevation="3dp"
                     android:gravity="center"
+                    android:layout_marginStart="25dp"
                     android:textColor="@color/buttonGray"
                     android:textSize="14sp"
                     android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_twin_card"
-                    app:layout_constraintEnd_toEndOf="@id/iv_twin_card"
-                    app:layout_constraintStart_toStartOf="@id/iv_twin_card"
-                    app:layout_constraintTop_toTopOf="@id/iv_twin_card"
+                    android:background="@drawable/shape_chip"
+                    app:layout_constraintBottom_toBottomOf="@id/iv_card"
+                    app:layout_constraintStart_toStartOf="@id/iv_card"
+                    app:layout_constraintTop_toBottomOf="@id/iv_card"
                     tools:text="Card 2 of 2" />
 
-
                 <androidx.constraintlayout.widget.Barrier
                     android:id="@+id/barrier"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:barrierDirection="bottom"
-                    app:constraint_referenced_ids="iv_card,iv_twin_card" />
+                    app:constraint_referenced_ids="iv_card,tv_twin_card_number" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_warning_messages"
@@ -190,7 +184,8 @@
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_scan_multiwallet"
                     style="@style/TapBlackButton"
-                    android:layout_width="100dp"
+                    android:layout_width="wrap_content"
+                    android:minWidth="100dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="30dp"
                     android:layout_marginBottom="33dp"
diff --git a/app/src/main/res/layout/item_currency_wallet.xml b/app/src/main/res/layout/item_currency_wallet.xml
index d4a2a6dfd2..ce49ed06df 100644
--- a/app/src/main/res/layout/item_currency_wallet.xml
+++ b/app/src/main/res/layout/item_currency_wallet.xml
@@ -17,7 +17,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="76dp">
+            android:layout_height="wrap_content"
+            android:minHeight="76dp">
 
             <ImageView
                 android:id="@+id/iv_currency"
@@ -46,10 +47,17 @@
                 app:layout_constraintTop_toTopOf="@id/iv_currency"
                 tools:text="J" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.5"/>
+
             <TextView
                 android:id="@+id/tv_currency"
                 android:layout_width="wrap_content"
-                android:layout_height="24dp"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="2dp"
@@ -58,38 +66,41 @@
                 android:textStyle="bold"
                 app:layout_constraintStart_toEndOf="@id/iv_currency"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/guideline"
                 tools:text="Bitcoin" />
 
             <TextView
                 android:id="@+id/tv_exchange_rate"
                 android:layout_width="wrap_content"
-                android:layout_height="20dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
-                android:layout_marginBottom="16dp"
                 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"
                 tools:text="USD 3 588" />
 
             <TextView
                 android:id="@+id/tv_status_error_message"
                 android:layout_width="wrap_content"
-                android:layout_height="20dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
-                android:layout_marginBottom="16dp"
                 android:textColor="@color/warning"
                 android:textSize="14sp"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="@id/guideline"
                 app:layout_constraintStart_toEndOf="@id/iv_currency" />
 
             <TextView
                 android:id="@+id/tv_status_loading"
                 android:layout_width="wrap_content"
-                android:layout_height="20dp"
+                android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
                 android:drawablePadding="5dp"
                 android:paddingStart="16dp"
@@ -104,12 +115,12 @@
             <TextView
                 android:id="@+id/tv_amount"
                 android:layout_width="0dp"
-                android:layout_height="24dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:layout_marginTop="16dp"
                 android:ellipsize="end"
                 android:gravity="end"
                 android:maxLines="1"
-                android:layout_marginStart="2dp"
-                android:layout_marginTop="16dp"
                 android:textColor="@color/darkGray6"
                 android:textSize="17sp"
                 android:textStyle="bold"
@@ -122,12 +133,12 @@
             <TextView
                 android:id="@+id/tv_currency_symbol"
                 android:layout_width="wrap_content"
-                android:layout_height="24dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
                 android:gravity="end"
                 android:maxLines="1"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="16dp"
                 android:textColor="@color/darkGray6"
                 android:textSize="17sp"
                 android:textStyle="bold"
@@ -140,13 +151,13 @@
             <TextView
                 android:id="@+id/tv_amount_fiat"
                 android:layout_width="wrap_content"
-                android:layout_height="20dp"
-                android:layout_marginBottom="16dp"
+                android:layout_height="wrap_content"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:textColor="@color/darkGray2"
                 android:textSize="14sp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/tv_exchange_rate"
+                app:layout_constraintTop_toTopOf="@id/tv_exchange_rate"
                 app:layout_constraintEnd_toEndOf="parent"
                 tools:text="0.43 USD" />
 
diff --git a/app/src/main/res/layout/item_popular_token.xml b/app/src/main/res/layout/item_popular_token.xml
index 9e988b2d7a..a052651d61 100644
--- a/app/src/main/res/layout/item_popular_token.xml
+++ b/app/src/main/res/layout/item_popular_token.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="52dp"
+    android:layout_height="wrap_content"
+    android:minHeight="52dp"
     android:layout_marginBottom="1dp"
     android:background="@android:color/white">
 
@@ -31,6 +32,13 @@
         app:layout_constraintTop_toTopOf="@id/iv_currency"
         tools:text="J" />
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.5"/>
+
     <TextView
         android:id="@+id/tv_currency_name"
         android:layout_width="0dp"
@@ -44,20 +52,23 @@
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@id/barrier_chip_button"
         app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintVertical_bias="1"
         app:layout_constraintStart_toEndOf="@id/iv_currency"
-        app:layout_constraintTop_toTopOf="@id/iv_currency"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/guideline"
         tools:text="NODLE" />
 
     <TextView
         android:id="@+id/tv_currency_symbol"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        app:layout_constraintVertical_bias="0"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textColor="@color/darkGray6"
         android:textSize="14sp"
-        app:layout_constraintBottom_toBottomOf="@id/iv_currency"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@id/guideline"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/iv_currency"
         tools:text="NODLE" />
diff --git a/app/src/main/res/layout/layout_warning.xml b/app/src/main/res/layout/layout_warning.xml
index a9a76d4637..e2f6f41d6f 100644
--- a/app/src/main/res/layout/layout_warning.xml
+++ b/app/src/main/res/layout/layout_warning.xml
@@ -44,7 +44,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="4dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
             android:text="Test text messaging, or texting, is the act of composing and sending electronic messages, typically consisting of alphabetic and numeric characters, between"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ae260a7854..3642ef243c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -36,7 +36,8 @@
         <item name="cornerRadius">@dimen/btn_corner_radius</item>
         <item name="android:fontFamily">@font/saira_semi_condensed_regular</item>
         <item name="android:layout_width">93dp</item>
-        <item name="android:layout_height">52dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">52dp</item>
         <item name="elevation">3dp</item>
     </style>