diff --git a/app/src/main/res/layout/activity_confirm_transaction.xml b/app/src/main/res/layout/activity_confirm_transaction.xml
index 6e10638831..5a48672aa3 100644
--- a/app/src/main/res/layout/activity_confirm_transaction.xml
+++ b/app/src/main/res/layout/activity_confirm_transaction.xml
@@ -139,7 +139,7 @@
                 android:layout_marginBottom="1dp"
                 android:fontFamily="@font/maax"
                 android:textColor="@color/primary"
-                android:textSize="14sp"
+                android:textSize="14dp"
                 app:layout_constraintBottom_toBottomOf="@+id/textView3"
                 app:layout_constraintLeft_toRightOf="@+id/textView3"
                 tools:text="(including fee)" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cc0bdcca10..48a209311f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -30,7 +30,7 @@
             android:layout_marginTop="12dp"
             android:fontFamily="@font/maax"
             android:gravity="center"
-            android:lineSpacingExtra="8sp"
+            android:lineSpacingExtra="8dp"
             android:minHeight="200dp"
             android:paddingLeft="20dp"
             android:paddingTop="20dp"
diff --git a/app/src/main/res/layout/activity_pin_request.xml b/app/src/main/res/layout/activity_pin_request.xml
index 3bdeda2f16..d0a3f210a5 100644
--- a/app/src/main/res/layout/activity_pin_request.xml
+++ b/app/src/main/res/layout/activity_pin_request.xml
@@ -15,7 +15,7 @@
         android:paddingBottom="16dp"
         android:singleLine="false"
         android:textAlignment="center"
-        android:textSize="36sp"
+        android:textSize="36dp"
         tools:ignore="TextViewEdits"
         tools:text="1234" />
 
diff --git a/app/src/main/res/layout/activity_pin_save.xml b/app/src/main/res/layout/activity_pin_save.xml
index 7475cab91a..c9c3d906bc 100644
--- a/app/src/main/res/layout/activity_pin_save.xml
+++ b/app/src/main/res/layout/activity_pin_save.xml
@@ -15,7 +15,7 @@
         android:paddingBottom="8dp"
         android:singleLine="false"
         android:textAlignment="center"
-        android:textSize="36sp"
+        android:textSize="36dp"
         tools:ignore="TextViewEdits" />
 
     <TextView
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index 85a18b6774..439fcf3690 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -134,7 +134,7 @@
                         android:fontFamily="@font/maaxmedium"
                         android:textAlignment="center"
                         android:textColor="@color/primary_dark"
-                        android:textSize="18sp"
+                        android:textSize="18dp"
                         android:textStyle="normal"
                         tools:text="Bitcoin" />
 
diff --git a/app/src/main/res/layout/layout_tangem_card.xml b/app/src/main/res/layout/layout_tangem_card.xml
index e7bc7d65d1..9b4136a6df 100644
--- a/app/src/main/res/layout/layout_tangem_card.xml
+++ b/app/src/main/res/layout/layout_tangem_card.xml
@@ -42,7 +42,7 @@
             android:fontFamily="@font/maaxmedium"
             android:text="@string/verifying"
             android:textColor="@color/colorPrimary"
-            android:textSize="12sp"
+            android:textSize="12dp"
             android:textStyle="bold" />
 
         <ProgressBar
diff --git a/app/src/main/res/layout/layout_touch_card.xml b/app/src/main/res/layout/layout_touch_card.xml
index 592067c9dd..dca92447ab 100644
--- a/app/src/main/res/layout/layout_touch_card.xml
+++ b/app/src/main/res/layout/layout_touch_card.xml
@@ -92,7 +92,7 @@
             android:alpha="1"
             android:text="@string/reading"
             android:textColor="@color/colorPrimary"
-            android:textSize="12sp"
+            android:textSize="12dp"
             android:textStyle="bold" />
 
         <ProgressBar