diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1612a3d2a4..8464ee95a5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,13 +17,13 @@
     <dimen name="empty_wallet_left_col_width">140dp</dimen>
     <dimen name="empty_wallet_left_col_margin">16dp</dimen>
 
-    <dimen name="text_size_2_small">11dp</dimen>
-    <dimen name="text_size_small">13dp</dimen>
-    <dimen name="text_size_1_small">15dp</dimen>
-    <dimen name="text_size_medium">19dp</dimen>
-    <dimen name="text_size_1_large">23dp</dimen>
-    <dimen name="text_size_large">26dp</dimen>
-    <dimen name="text_size_pin">34dp</dimen>
+    <dimen name="text_size_2_small">11sp</dimen>
+    <dimen name="text_size_small">13sp</dimen>
+    <dimen name="text_size_1_small">15sp</dimen>
+    <dimen name="text_size_medium">19sp</dimen>
+    <dimen name="text_size_1_large">23sp</dimen>
+    <dimen name="text_size_large">26sp</dimen>
+    <dimen name="text_size_pin">34sp</dimen>
 
     <dimen name="size_qr_image">180dp</dimen>
     <dimen name="size_explore_image">30dp</dimen>
diff --git a/app/src/tangemAccess/res/layout/activity_confirm_transaction.xml b/app/src/tangemAccess/res/layout/activity_confirm_transaction.xml
index c94c3a66f6..8e8c0c19e0 100644
--- a/app/src/tangemAccess/res/layout/activity_confirm_transaction.xml
+++ b/app/src/tangemAccess/res/layout/activity_confirm_transaction.xml
@@ -139,7 +139,7 @@
                 android:layout_marginBottom="1dp"
                 android:fontFamily="@font/maax"
                 android:textColor="@color/primary"
-                android:textSize="14dp"
+                android:textSize="@dimen/text_size_small"
                 app:layout_constraintBottom_toBottomOf="@+id/textView3"
                 app:layout_constraintLeft_toRightOf="@+id/textView3"
                 tools:text="(including fee)" />
diff --git a/app/src/tangemAccess/res/layout/activity_prepare_transaction.xml b/app/src/tangemAccess/res/layout/activity_prepare_transaction.xml
index 8da055a7a0..1852b43d86 100644
--- a/app/src/tangemAccess/res/layout/activity_prepare_transaction.xml
+++ b/app/src/tangemAccess/res/layout/activity_prepare_transaction.xml
@@ -192,7 +192,8 @@
                 android:textSize="@dimen/text_size_1_large"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tvCurrency"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintWidth_min="150dp" />
 
@@ -201,13 +202,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="16dp"
                 android:fontFamily="@font/maax"
                 android:text="@string/m_btc"
                 android:textColor="@color/primary"
                 android:textSize="@dimen/text_size_1_large"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@+id/etAmount" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/etAmount"
+                app:layout_constraintTop_toTopOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml b/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml
index 6cf10efd5e..c363c4a000 100644
--- a/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml
+++ b/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml
@@ -195,7 +195,8 @@
                 android:textSize="@dimen/text_size_1_large"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tvCurrency"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintWidth_min="150dp" />
 
@@ -204,13 +205,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="16dp"
                 android:fontFamily="@font/maax"
                 android:text="@string/m_btc"
                 android:textColor="@color/primary"
                 android:textSize="@dimen/text_size_1_large"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@+id/etAmount" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/etAmount"
+                app:layout_constraintTop_toTopOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>