diff --git a/green/src/main/res/layout/about_fragment.xml b/green/src/main/res/layout/about_fragment.xml
index 6ca0e788e..496705a3f 100644
--- a/green/src/main/res/layout/about_fragment.xml
+++ b/green/src/main/res/layout/about_fragment.xml
@@ -140,7 +140,7 @@
             android:text="@{buildVersion}"
             android:textAppearance="?attr/textAppearanceBodySmall"
             android:textColor="@color/color_on_surface_emphasis_high"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintEnd_toEndOf="@+id/logo"
             app:layout_constraintTop_toBottomOf="@+id/logo"
             tools:text="4.0.0" />
diff --git a/green/src/main/res/layout/account_asset_layout.xml b/green/src/main/res/layout/account_asset_layout.xml
index 63f1fa847..46c444f62 100644
--- a/green/src/main/res/layout/account_asset_layout.xml
+++ b/green/src/main/res/layout/account_asset_layout.xml
@@ -95,7 +95,7 @@
             android:textAllCaps="true"
             android:textAppearance="?attr/textAppearanceLabelSmall"
             android:textColor="@color/color_on_surface_emphasis_medium"
-            android:textSize="11sp"
+            android:textSize="11dp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/accountType"
             app:layout_constraintEnd_toStartOf="@+id/barrier"
@@ -140,7 +140,7 @@
             android:text="@{ExtensionsKt.titleRes(account.type)}"
             android:textAlignment="center"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="9sp"
+            android:textSize="9dp"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/icon"
diff --git a/green/src/main/res/layout/account_card_layout.xml b/green/src/main/res/layout/account_card_layout.xml
index e4df7cb1d..b1dfc8ada 100644
--- a/green/src/main/res/layout/account_card_layout.xml
+++ b/green/src/main/res/layout/account_card_layout.xml
@@ -102,7 +102,7 @@
                     android:text="@{account.name}"
                     android:textAppearance="?attr/textAppearanceBodyMedium"
                     android:textColor="@color/color_on_surface_emphasis_high"
-                    android:textSize="16sp"
+                    android:textSize="16dp"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@+id/assetsIcons"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/green/src/main/res/layout/device_info_fragment.xml b/green/src/main/res/layout/device_info_fragment.xml
index f183612bd..6f1049870 100644
--- a/green/src/main/res/layout/device_info_fragment.xml
+++ b/green/src/main/res/layout/device_info_fragment.xml
@@ -143,7 +143,7 @@
             android:enabled="@{!vm.onProgress}"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/green/src/main/res/layout/drawer_fragment.xml b/green/src/main/res/layout/drawer_fragment.xml
index d36c892e2..19141c5a3 100644
--- a/green/src/main/res/layout/drawer_fragment.xml
+++ b/green/src/main/res/layout/drawer_fragment.xml
@@ -189,7 +189,7 @@
                 android:layout_marginEnd="4dp"
                 android:text="@string/id_app_settings"
                 android:textColor="@color/color_on_surface_emphasis_medium"
-                android:textSize="12sp"
+                android:textSize="12dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/green/src/main/res/layout/enter_recovery_phrase_fragment.xml b/green/src/main/res/layout/enter_recovery_phrase_fragment.xml
index b01e1fee8..05802a549 100644
--- a/green/src/main/res/layout/enter_recovery_phrase_fragment.xml
+++ b/green/src/main/res/layout/enter_recovery_phrase_fragment.xml
@@ -100,7 +100,7 @@
                 android:singleLine="true"
                 android:text="@{vm.messageResource}"
                 android:textColor="@color/color_on_surface_emphasis_low"
-                android:textSize="12sp"
+                android:textSize="12dp"
                 android:textStyle="italic"
                 app:drawableEndCompat="@drawable/ic_info_16"
                 app:drawableTint="@color/color_on_surface_emphasis_low"
@@ -218,7 +218,7 @@
                 android:singleLine="true"
                 android:text="@string/id_invalid_mnemonic"
                 android:textColor="@color/error"
-                android:textSize="14sp"
+                android:textSize="14dp"
                 app:drawableStartCompat="@drawable/ic_baseline_error_outline_18"
                 app:drawableTint="@color/error"
                 app:layout_constraintBottom_toBottomOf="@+id/buttonHelp"
diff --git a/green/src/main/res/layout/green_switch.xml b/green/src/main/res/layout/green_switch.xml
index a444c6bc6..b55f00060 100644
--- a/green/src/main/res/layout/green_switch.xml
+++ b/green/src/main/res/layout/green_switch.xml
@@ -56,7 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textSize="12sp"
+                android:textSize="12dp"
                 android:visibility="gone"
                 android:includeFontPadding="false"
                 tools:text="Caption\nMultiline"
diff --git a/green/src/main/res/layout/intro_fragment.xml b/green/src/main/res/layout/intro_fragment.xml
index 49bf3d9b9..fce96e926 100644
--- a/green/src/main/res/layout/intro_fragment.xml
+++ b/green/src/main/res/layout/intro_fragment.xml
@@ -113,7 +113,7 @@
             android:layout_marginStart="9dp"
             android:text="@string/id_about"
             android:textColor="@color/color_on_surface_emphasis_medium"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:icon="@drawable/ic_shield_white"
             app:iconSize="24dp"
             app:iconTint="@color/color_on_surface_emphasis_medium"
@@ -136,7 +136,7 @@
             android:enabled="@{!vm.onProgress}"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_medium"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/green/src/main/res/layout/list_item_account.xml b/green/src/main/res/layout/list_item_account.xml
index a85d7eeb5..2bb0f91fd 100644
--- a/green/src/main/res/layout/list_item_account.xml
+++ b/green/src/main/res/layout/list_item_account.xml
@@ -83,7 +83,7 @@
                     android:text="@{account.name}"
                     android:textAppearance="?attr/textAppearanceBodyMedium"
                     android:textColor="@color/color_on_surface_emphasis_high"
-                    android:textSize="16sp"
+                    android:textSize="16dp"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toTopOf="@+id/accountType"
                     app:layout_constraintEnd_toStartOf="@+id/linearLayout2"
@@ -105,7 +105,7 @@
                     android:textAllCaps="true"
                     android:textAppearance="?attr/textAppearanceBodySmall"
                     android:textColor="@color/color_on_surface_emphasis_low"
-                    android:textSize="11sp"
+                    android:textSize="11dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/linearLayout2"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -128,7 +128,7 @@
                     android:text="@{ExtensionsKt.titleRes(account.type)}"
                     android:textAlignment="center"
                     android:textColor="@color/color_on_surface_emphasis_low"
-                    android:textSize="9sp"
+                    android:textSize="9dp"
                     android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="@+id/icon"
diff --git a/green/src/main/res/layout/list_item_account_type.xml b/green/src/main/res/layout/list_item_account_type.xml
index 805c62007..2ee99ee55 100644
--- a/green/src/main/res/layout/list_item_account_type.xml
+++ b/green/src/main/res/layout/list_item_account_type.xml
@@ -80,7 +80,7 @@
                 android:textAllCaps="true"
                 android:textAppearance="?attr/textAppearanceBodySmall"
                 android:textColor="@color/color_on_surface_emphasis_medium"
-                android:textSize="11sp"
+                android:textSize="11dp"
                 app:layout_constraintEnd_toStartOf="@+id/arrow"
                 app:layout_constraintStart_toEndOf="@+id/policyIcon"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/green/src/main/res/layout/list_item_network_small.xml b/green/src/main/res/layout/list_item_network_small.xml
index 645a69a84..bc51226ec 100644
--- a/green/src/main/res/layout/list_item_network_small.xml
+++ b/green/src/main/res/layout/list_item_network_small.xml
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textSize="18sp"
+                android:textSize="18dp"
                 android:textStyle="bold"
                 tools:text="Bitcoin" />
 
diff --git a/green/src/main/res/layout/list_item_preference.xml b/green/src/main/res/layout/list_item_preference.xml
index 24863fe5a..ff5dfd1c5 100644
--- a/green/src/main/res/layout/list_item_preference.xml
+++ b/green/src/main/res/layout/list_item_preference.xml
@@ -95,7 +95,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
                     android:text="@string/id_change"
-                    android:textSize="12sp"
+                    android:textSize="12dp"
                     tools:visibility="gone"
                     app:textAllCaps="true" />
 
diff --git a/green/src/main/res/layout/list_item_recovery_phrase_word.xml b/green/src/main/res/layout/list_item_recovery_phrase_word.xml
index 6415f93ee..14501036f 100644
--- a/green/src/main/res/layout/list_item_recovery_phrase_word.xml
+++ b/green/src/main/res/layout/list_item_recovery_phrase_word.xml
@@ -23,7 +23,7 @@
             android:minWidth="40dp"
             android:textAlignment="textEnd"
             android:textColor="@color/brand_green"
-            android:textSize="14sp"
+            android:textSize="14dp"
             app:layout_constraintBaseline_toBaselineOf="@+id/word"
             app:layout_constraintEnd_toStartOf="@+id/word"
             tools:text="99" />
@@ -42,7 +42,7 @@
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
             android:textColor="@color/color_on_surface_emphasis_high"
-            android:textSize="16sp"
+            android:textSize="16dp"
             android:singleLine="true"
             android:ellipsize="end"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/green/src/main/res/layout/list_item_wallet.xml b/green/src/main/res/layout/list_item_wallet.xml
index 003437709..a5deb7299 100644
--- a/green/src/main/res/layout/list_item_wallet.xml
+++ b/green/src/main/res/layout/list_item_wallet.xml
@@ -95,7 +95,7 @@
                     android:text="@{device != null ? device.name : wallet.ephemeralBip39Name}"
                     android:textAppearance="?attr/textAppearanceBodySmall"
                     android:textColor="@color/color_on_surface_emphasis_medium"
-                    android:textSize="10sp"
+                    android:textSize="10dp"
                     app:layout_constraintEnd_toEndOf="@+id/title"
                     app:layout_constraintStart_toStartOf="@+id/title"
                     app:layout_constraintTop_toBottomOf="@+id/title"
diff --git a/green/src/main/res/layout/login_fragment.xml b/green/src/main/res/layout/login_fragment.xml
index 163365b24..0582a739a 100644
--- a/green/src/main/res/layout/login_fragment.xml
+++ b/green/src/main/res/layout/login_fragment.xml
@@ -334,7 +334,7 @@
             android:layout_marginStart="24dp"
             android:text="@string/id_login_with_biometrics"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -348,7 +348,7 @@
             android:enabled="@{!vm.onProgress}"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/green/src/main/res/layout/login_watch_only_fragment.xml b/green/src/main/res/layout/login_watch_only_fragment.xml
index 924ea8134..414b07e15 100644
--- a/green/src/main/res/layout/login_watch_only_fragment.xml
+++ b/green/src/main/res/layout/login_watch_only_fragment.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="vm"
             type="com.blockstream.green.ui.onboarding.LoginWatchOnlyViewModel" />
@@ -22,250 +23,264 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <TextView
-            android:id="@+id/textView3"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
-            android:text="@{isSinglesig ? @string/id_watchonly_details : @string/id_login}"
-            android:textAppearance="?attr/textAppearanceDisplayMedium"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="spread_inside" />
-
-        <TextView
-            android:id="@+id/textView4"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="24dp"
-            android:text="@{isSinglesig ? @string/id_scan_or_paste_your_extended : @string/id_log_in_via_watchonly_to_receive}"
-            android:textAppearance="?attr/textAppearanceBodyLarge"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView3"
-            app:layout_constraintVertical_chainStyle="spread_inside"
-            tools:text="@string/id_log_in_via_watchonly_to_receive" />
-
-        <com.blockstream.green.views.GappedLinearLayout
-            android:id="@+id/gappedLinearLayout5"
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
-            android:gravity="center"
-            android:orientation="vertical"
-            app:gap="0dp"
+            android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/buttonAppSettings"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView4"
-            app:layout_constraintVertical_bias="0.0">
-
-            <com.google.android.material.textfield.TextInputLayout
-                style="?attr/textInputFilledStyle"
-                isVisible="@{!isSinglesig}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/id_username">
+            app:layout_constraintTop_toTopOf="parent">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/username"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="username"
-                    android:imeOptions="actionNext"
-                    android:inputType="textNoSuggestions|textVisiblePassword"
-                    android:text="@={vm.username}" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                style="?attr/textInputFilledStyle"
-                isVisible="@{!isSinglesig}"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
-                android:hint="@string/id_password"
-                app:passwordToggleEnabled="true">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="flagNoPersonalizedLearning|actionGo"
-                    android:importantForAccessibility="no"
-                    android:inputType="textPassword"
-                    android:text="@={vm.password}" />
+                android:layout_height="match_parent">
 
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/descriptorType"
-                isVisible="@{isSinglesig}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                app:selectionRequired="true"
-                app:singleSelection="true">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/xpub"
-                    style="@style/Widget.Green.Button.Outlined.Small"
+                <TextView
+                    android:id="@+id/textView3"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/id_xpub" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/descriptor"
-                    style="@style/Widget.Green.Button.Outlined.Small"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginEnd="24dp"
+                    android:text="@{isSinglesig ? @string/id_watchonly_details : @string/id_login}"
+                    android:textAppearance="?attr/textAppearanceDisplayMedium"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="spread_inside" />
+
+                <TextView
+                    android:id="@+id/textView4"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/id_descriptor" />
-            </com.google.android.material.button.MaterialButtonToggleGroup>
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                isVisible="@{isSinglesig}">
-
-                <LinearLayout
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="24dp"
+                    android:text="@{isSinglesig ? @string/id_scan_or_paste_your_extended : @string/id_log_in_via_watchonly_to_receive}"
+                    android:textAppearance="?attr/textAppearanceBodyLarge"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/textView3"
+                    app:layout_constraintVertical_chainStyle="spread_inside"
+                    tools:text="@string/id_log_in_via_watchonly_to_receive" />
+
+                <com.blockstream.green.views.GappedLinearLayout
+                    android:id="@+id/gappedLinearLayout5"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginEnd="24dp"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    app:gap="0dp"
+                    app:layout_constraintBottom_toTopOf="@+id/buttonAppSettings"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/textView4"
+                    app:layout_constraintVertical_bias="0.0">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="?attr/textInputFilledStyle"
+                        isVisible="@{!isSinglesig}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/id_username">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/username"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:autofillHints="username"
+                            android:imeOptions="actionNext"
+                            android:inputType="textNoSuggestions|textVisiblePassword"
+                            android:text="@={vm.username}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <EditText
-                        android:id="@+id/amountEditText"
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="?attr/textInputFilledStyle"
+                        isVisible="@{!isSinglesig}"
                         android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_gravity="center_vertical|end"
+                        android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_weight="1"
-                        android:background="@android:color/transparent"
-                        android:gravity="start|top"
-                        android:fontFamily="monospace"
-                        android:lines="15"
-                        android:textSize="12sp"
-                        android:hint="@{vm.isOutputDescriptors ? `Descriptor1,Descriptor2,…` : `xPub1,yPub1,zPub1,xPub2,…`}"
-                        android:imeOptions="flagNoPersonalizedLearning|actionGo"
-                        android:importantForAccessibility="no"
-                        android:inputType="textMultiLine|textNoSuggestions"
-                        android:text="@={vm.watchOnlyDescriptor}" />
-
-                    <LinearLayout
+                        android:layout_marginBottom="16dp"
+                        android:hint="@string/id_password"
+                        app:passwordToggleEnabled="true">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:imeOptions="flagNoPersonalizedLearning|actionGo"
+                            android:importantForAccessibility="no"
+                            android:inputType="textPassword"
+                            android:text="@={vm.password}" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.button.MaterialButtonToggleGroup
+                        android:id="@+id/descriptorType"
+                        isVisible="@{isSinglesig}"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:gravity="end">
-
-                        <ImageButton
-                            android:id="@+id/buttonClear"
-                            isVisible="@{!vm.watchOnlyDescriptor.empty}"
-                            android:layout_width="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        app:selectionRequired="true"
+                        app:singleSelection="true">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/xpub"
+                            style="@style/Widget.Green.Button.Outlined.Small"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:adjustViewBounds="true"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/ic_x_circle"
-                            android:paddingTop="12dp"
-                            android:paddingEnd="6dp"
-                            android:paddingBottom="12dp"
-                            android:paddingStart="12dp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="@+id/addressInputLayout" />
-
-                        <ImageButton
-                            android:id="@+id/buttonPaste"
-                            android:layout_width="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/id_xpub" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/descriptor"
+                            style="@style/Widget.Green.Button.Outlined.Small"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:adjustViewBounds="true"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/ic_clipboard"
-                            android:paddingTop="12dp"
-                            android:paddingEnd="6dp"
-                            android:paddingBottom="12dp"
-                            android:paddingStart="6dp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="@+id/addressInputLayout" />
-
-                        <ImageButton
-                            android:id="@+id/buttonScan"
-                            android:layout_width="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/id_descriptor" />
+                    </com.google.android.material.button.MaterialButtonToggleGroup>
+
+                    <com.google.android.material.card.MaterialCardView
+                        isVisible="@{isSinglesig}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:adjustViewBounds="true"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/ic_qr_code"
-                            android:paddingTop="12dp"
-                            android:paddingEnd="12dp"
-                            android:paddingBottom="12dp"
-                            android:paddingStart="6dp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="@+id/addressInputLayout" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </com.google.android.material.card.MaterialCardView>
-
-            <Button
-                android:id="@+id/buttonImport"
-                style="@style/Widget.Green.Button.Text.Tiny"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:paddingStart="0dp"
-                android:text="@string/id_import_from_file"
-                android:textAlignment="viewStart" />
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                isVisible="@{!isSinglesig}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:checked="@={vm.isRememberMe}"
-                android:text="@string/id_remember_me"
-                app:useMaterialThemeColors="false" />
+                            android:orientation="vertical">
+
+                            <EditText
+                                android:id="@+id/amountEditText"
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_gravity="center_vertical|end"
+                                android:layout_marginStart="16dp"
+                                android:layout_marginTop="16dp"
+                                android:layout_marginEnd="16dp"
+                                android:layout_weight="1"
+                                android:background="@android:color/transparent"
+                                android:fontFamily="monospace"
+                                android:gravity="start|top"
+                                android:hint="@{vm.isOutputDescriptors ? `Descriptor1,Descriptor2,…` : `xPub1,yPub1,zPub1,xPub2,…`}"
+                                android:imeOptions="flagNoPersonalizedLearning|actionGo"
+                                android:importantForAccessibility="no"
+                                android:inputType="textMultiLine|textNoSuggestions"
+                                android:lines="15"
+                                android:text="@={vm.watchOnlyDescriptor}"
+                                android:textSize="12dp" />
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="end"
+                                android:orientation="horizontal">
+
+                                <ImageButton
+                                    android:id="@+id/buttonClear"
+                                    isVisible="@{!vm.watchOnlyDescriptor.empty}"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:adjustViewBounds="true"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:paddingStart="12dp"
+                                    android:paddingTop="12dp"
+                                    android:paddingEnd="6dp"
+                                    android:paddingBottom="12dp"
+                                    android:scaleType="centerInside"
+                                    android:src="@drawable/ic_x_circle"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="@+id/addressInputLayout" />
+
+                                <ImageButton
+                                    android:id="@+id/buttonPaste"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:adjustViewBounds="true"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:paddingStart="6dp"
+                                    android:paddingTop="12dp"
+                                    android:paddingEnd="6dp"
+                                    android:paddingBottom="12dp"
+                                    android:scaleType="centerInside"
+                                    android:src="@drawable/ic_clipboard"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="@+id/addressInputLayout" />
+
+                                <ImageButton
+                                    android:id="@+id/buttonScan"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:adjustViewBounds="true"
+                                    android:background="?attr/selectableItemBackgroundBorderless"
+                                    android:paddingStart="6dp"
+                                    android:paddingTop="12dp"
+                                    android:paddingEnd="12dp"
+                                    android:paddingBottom="12dp"
+                                    android:scaleType="centerInside"
+                                    android:src="@drawable/ic_qr_code"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="@+id/addressInputLayout" />
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <Button
+                        android:id="@+id/buttonImport"
+                        style="@style/Widget.Green.Button.Text.Tiny"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        android:paddingStart="0dp"
+                        android:text="@string/id_import_from_file"
+                        android:textAlignment="viewStart" />
 
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:checked="@={vm.withBiometrics}"
-                android:enabled="@{vm.isRememberMe &amp;&amp; vm.canUseBiometrics}"
-                android:text="@string/id_login_with_biometrics"
-                app:useMaterialThemeColors="false" />
-
-            <Button
-                android:id="@+id/buttonLogin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:enabled="@{vm.isLoginEnabled}"
-                android:text="@string/id_log_in" />
-
-            <TextView
-                style="?attr/textAppearanceBodySmall"
-                isVisible="@{!isSinglesig}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/id_watchonly_mode_can_be_activated" />
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        isVisible="@{!isSinglesig}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:checked="@={vm.isRememberMe}"
+                        android:text="@string/id_remember_me"
+                        app:useMaterialThemeColors="false" />
+
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:checked="@={vm.withBiometrics}"
+                        android:enabled="@{vm.isRememberMe &amp;&amp; vm.canUseBiometrics}"
+                        android:text="@string/id_login_with_biometrics"
+                        app:useMaterialThemeColors="false" />
+
+                    <Button
+                        android:id="@+id/buttonLogin"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:enabled="@{vm.isLoginEnabled}"
+                        android:text="@string/id_log_in" />
+
+                    <TextView
+                        style="?attr/textAppearanceBodySmall"
+                        isVisible="@{!isSinglesig}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/id_watchonly_mode_can_be_activated" />
 
 
-        </com.blockstream.green.views.GappedLinearLayout>
+                </com.blockstream.green.views.GappedLinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </ScrollView>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/buttonAppSettings"
@@ -276,7 +291,7 @@
             android:layout_marginEnd="24dp"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/green/src/main/res/layout/recovery_phrase_keyboard_view.xml b/green/src/main/res/layout/recovery_phrase_keyboard_view.xml
index f715dec27..4da95295b 100644
--- a/green/src/main/res/layout/recovery_phrase_keyboard_view.xml
+++ b/green/src/main/res/layout/recovery_phrase_keyboard_view.xml
@@ -250,7 +250,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="WORD1"
-            android:textSize="16sp" />
+            android:textSize="16dp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/word2"
@@ -259,7 +259,7 @@
             android:layout_height="wrap_content"
 
             android:text="WORD2"
-            android:textSize="16sp" />
+            android:textSize="16dp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/word3"
@@ -267,7 +267,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="WORD2"
-            android:textSize="16sp" />
+            android:textSize="16dp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/word4"
@@ -275,7 +275,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="WORD2"
-            android:textSize="16sp" />
+            android:textSize="16dp" />
 
     </LinearLayout>
 
diff --git a/green/src/main/res/layout/send_fragment.xml b/green/src/main/res/layout/send_fragment.xml
index f572c2ba7..acdd37069 100644
--- a/green/src/main/res/layout/send_fragment.xml
+++ b/green/src/main/res/layout/send_fragment.xml
@@ -121,7 +121,7 @@
                             android:text="@{`(`+vm.feeAmountRate+`)`}"
                             android:textAppearance="?attr/textAppearanceBodySmall"
                             android:textColor="@color/color_on_surface_emphasis_medium"
-                            android:textSize="11sp"
+                            android:textSize="11dp"
                             android:layout_marginStart="16dp"
                             android:layout_marginTop="16dp"
                             app:layout_constraintStart_toStartOf="parent"
diff --git a/green/src/main/res/layout/setup_new_wallet_fragment.xml b/green/src/main/res/layout/setup_new_wallet_fragment.xml
index e1378fc0e..dc2b78fd5 100644
--- a/green/src/main/res/layout/setup_new_wallet_fragment.xml
+++ b/green/src/main/res/layout/setup_new_wallet_fragment.xml
@@ -126,7 +126,7 @@
             android:enabled="@{!vm.onProgress}"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_medium"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/green/src/main/res/layout/swap_proposal_fragment.xml b/green/src/main/res/layout/swap_proposal_fragment.xml
index 6ccda9cea..d276d03d4 100644
--- a/green/src/main/res/layout/swap_proposal_fragment.xml
+++ b/green/src/main/res/layout/swap_proposal_fragment.xml
@@ -95,7 +95,7 @@
                         android:text="@{vm.currentFrame + `/` + vm.totalFrames}"
                         android:textAppearance="?attr/textAppearanceBodySmall"
                         android:textColor="@color/color_on_surface_emphasis_low"
-                        android:textSize="10sp"
+                        android:textSize="10dp"
                         app:layout_constraintEnd_toEndOf="@+id/qrWrap"
                         app:layout_constraintTop_toBottomOf="@+id/qrWrap"
                         tools:text="1/30" />
diff --git a/green/src/main/res/layout/twofactor_setup_fragment.xml b/green/src/main/res/layout/twofactor_setup_fragment.xml
index 11b66fc7c..83b60348b 100644
--- a/green/src/main/res/layout/twofactor_setup_fragment.xml
+++ b/green/src/main/res/layout/twofactor_setup_fragment.xml
@@ -176,7 +176,7 @@
                         android:drawablePadding="8dp"
                         android:textAlignment="center"
                         android:textColor="@color/brand_green"
-                        android:textSize="13sp"
+                        android:textSize="13dp"
                         android:text="@{vm.authenticatorCode}"
                         android:layout_marginTop="16dp"
                         android:textStyle="bold"
diff --git a/green/src/main/res/layout/utxo_layout.xml b/green/src/main/res/layout/utxo_layout.xml
index d42e23958..77e440fd8 100644
--- a/green/src/main/res/layout/utxo_layout.xml
+++ b/green/src/main/res/layout/utxo_layout.xml
@@ -49,7 +49,7 @@
             android:textAlignment="textEnd"
             android:textAppearance="?attr/textAppearanceBodyMedium"
             android:textColor="@color/color_on_surface_emphasis_high"
-            android:textSize="16sp"
+            android:textSize="16dp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/green/src/main/res/values-hdpi/dimens.xml b/green/src/main/res/values-hdpi/dimens.xml
index e263dca84..c998f3b9d 100644
--- a/green/src/main/res/values-hdpi/dimens.xml
+++ b/green/src/main/res/values-hdpi/dimens.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="pin_circle">12dp</dimen>
-    <dimen name="pin_textsize">14sp</dimen>
+    <dimen name="pin_textsize">14dp</dimen>
 
     <dimen name="two_factor_dialog_icon">24dp</dimen>
 
     <dimen name="green_pin_view_button">20dip</dimen>
 
-    <dimen name="headline1_textsize">22sp</dimen>
-    <dimen name="headline5_textsize">13sp</dimen>
-    <dimen name="headline6_textsize">12sp</dimen>
-    <dimen name="body1_textsize">11sp</dimen>
-    <dimen name="body2_textsize">11sp</dimen>
+    <dimen name="headline1_textsize">22dp</dimen>
+    <dimen name="headline5_textsize">13dp</dimen>
+    <dimen name="headline6_textsize">12dp</dimen>
+    <dimen name="body1_textsize">11dp</dimen>
+    <dimen name="body2_textsize">11dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/green/src/main/res/values-xhdpi/dimens.xml b/green/src/main/res/values-xhdpi/dimens.xml
index 79afbd6fc..dec116568 100644
--- a/green/src/main/res/values-xhdpi/dimens.xml
+++ b/green/src/main/res/values-xhdpi/dimens.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="pin_circle">18dp</dimen>
-    <dimen name="pin_textsize">28sp</dimen>
+    <dimen name="pin_textsize">28dp</dimen>
 
     <dimen name="two_factor_dialog_icon">60dp</dimen>
 
     <dimen name="green_pin_view_button">48dip</dimen>
 
-    <dimen name="headline1_textsize">30sp</dimen>
-    <dimen name="headline5_textsize">24sp</dimen>
-    <dimen name="headline6_textsize">20sp</dimen>
-    <dimen name="body1_textsize">15sp</dimen>
-    <dimen name="body2_textsize">14sp</dimen>
+    <dimen name="headline1_textsize">30dp</dimen>
+    <dimen name="headline5_textsize">24dp</dimen>
+    <dimen name="headline6_textsize">20dp</dimen>
+    <dimen name="body1_textsize">15dp</dimen>
+    <dimen name="body2_textsize">14dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/green/src/main/res/values/styles.xml b/green/src/main/res/values/styles.xml
index 0645e4bfc..9639aad5d 100644
--- a/green/src/main/res/values/styles.xml
+++ b/green/src/main/res/values/styles.xml
@@ -43,7 +43,7 @@
     </style>
 
     <style name="Widget.Green.Button.Tiny" parent="Widget.Green.Button">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">12dp</item>
         <item name="android:minHeight">0dip</item>
         <item name="android:minWidth">0dip</item>
     </style>
@@ -80,7 +80,7 @@
     </style>
 
     <style name="Widget.Green.Button.Outlined.Tiny" parent="Widget.Green.Button.Outlined">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">12dp</item>
         <item name="android:minHeight">0dip</item>
         <item name="android:minWidth">0dip</item>
     </style>
@@ -122,7 +122,7 @@
     </style>
 
     <style name="Widget.Green.Button.Text.Tiny" parent="Widget.Green.Button.Text">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">12dp</item>
         <item name="android:minHeight">0dip</item>
         <item name="android:minWidth">0dip</item>
     </style>
@@ -213,7 +213,7 @@
 
     <style name="MaterialImportantAlertDialog.Green.Body.Text" parent="MaterialAlertDialog.Material3.Body.Text">
         <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">14dp</item>
     </style>
 
     <style name="MaterialAlertDialog.Green.Title.Text" parent="MaterialAlertDialog.Material3.Title.Text">
@@ -223,14 +223,14 @@
 
     <style name="MaterialAlertDialog.Green.Body.Text" parent="MaterialAlertDialog.Material3.Body.Text">
         <item name="android:textColor">@color/color_on_surface_emphasis_high</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">14dp</item>
     </style>
 
     <style name="RecoveryPhraseKeyboardButton" parent="Widget.Material3.Button">
         <item name="android:padding">0dp</item>
         <item name="android:layout_margin">3dp</item>
         <item name="android:includeFontPadding">false</item>
-        <item name="android:textSize">22sp</item>
+        <item name="android:textSize">22dp</item>
         <item name="backgroundTint">@color/brand_surface_light</item>
         <item name="android:background">@drawable/recovery_phrase_keyboard_background</item>
     </style>
@@ -262,7 +262,7 @@
     </style>
 
     <style name="SquarePinButton" parent="Widget.Green.Button.Outlined">
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">16dp</item>
         <item name="android:layout_width">72dp</item>
         <item name="android:layout_height">72dp</item>
         <item name="android:insetLeft">4dp</item>
diff --git a/green/src/main/res/values/types.xml b/green/src/main/res/values/types.xml
index a09df9c3f..8c2c877fc 100644
--- a/green/src/main/res/values/types.xml
+++ b/green/src/main/res/values/types.xml
@@ -2,125 +2,111 @@
 
     <style name="TextAppearance.Green.DisplayLarge" parent="TextAppearance.Material3.DisplayLarge">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">36sp</item>
-        <item name="lineHeight">40sp</item>
-        <item name="android:lineHeight" tools:ignore="NewApi">40sp</item>
+        <item name="android:textSize">36dp</item>
+        <item name="lineHeight">40dp</item>
+        <item name="android:lineHeight" tools:ignore="NewApi">40dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.DisplayMedium" parent="TextAppearance.Material3.DisplayMedium">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">30sp</item>
-        <item name="lineHeight">36sp</item>
-        <item name="android:lineHeight" tools:ignore="NewApi">36sp</item>
+        <item name="android:textSize">30dp</item>
+        <item name="lineHeight">36dp</item>
+        <item name="android:lineHeight" tools:ignore="NewApi">36dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.DisplaySmall" parent="TextAppearance.Material3.DisplaySmall">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">28sp</item>
-        <item name="lineHeight">33sp</item>
-        <item name="android:lineHeight" tools:ignore="NewApi">33sp</item>
+        <item name="android:textSize">28dp</item>
+        <item name="lineHeight">33dp</item>
+        <item name="android:lineHeight" tools:ignore="NewApi">33dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">26sp</item>
-        <item name="lineHeight">28sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">28sp</item>
+        <item name="android:textSize">26dp</item>
+        <item name="lineHeight">28dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">28dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">24sp</item>
-        <item name="lineHeight">26sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">26sp</item>
+        <item name="android:textSize">24dp</item>
+        <item name="lineHeight">26dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">26dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">22sp</item>
-        <item name="lineHeight">24sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">24sp</item>
+        <item name="android:textSize">22dp</item>
+        <item name="lineHeight">24dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">24dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">20sp</item>
+        <item name="android:textSize">20dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">18dp</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Green.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
         <item name="android:textStyle">bold</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="fontFamily">@font/inter</item>
+        <item name="android:textSize">16dp</item>
     </style>
 
     <style name="TextAppearance.Green.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
-        <item name="android:textSize">16sp</item>
-        <item name="lineHeight">20sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">20sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="fontFamily">@font/inter</item>
+        <item name="android:textSize">16dp</item>
+        <item name="lineHeight">20dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">20dp</item>
     </style>
 
     <style name="TextAppearance.Green.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
-        <item name="android:textSize">14sp</item>
-        <item name="lineHeight">16sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">16sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="fontFamily">@font/inter</item>
+        <item name="android:textSize">14dp</item>
+        <item name="lineHeight">16dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">16dp</item>
     </style>
 
     <style name="TextAppearance.Green.BodySmall" parent="TextAppearance.Material3.BodySmall">
-        <item name="android:textSize">11sp</item>
-        <item name="lineHeight">12sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">12sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="fontFamily">@font/inter</item>
+        <item name="android:textSize">11dp</item>
+        <item name="lineHeight">12dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">12dp</item>
     </style>
 
     <style name="TextAppearance.Green.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
-        <item name="android:textSize">14sp</item>
-        <item name="lineHeight">20sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">20sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="fontFamily">@font/inter</item>
+        <item name="android:textSize">14dp</item>
+        <item name="lineHeight">20dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">20dp</item>
     </style>
 
     <style name="TextAppearance.Green.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
-        <item name="android:textSize">12sp</item>
-        <item name="lineHeight">16sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">16sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="fontFamily">@font/inter</item>
+        <item name="android:textSize">12dp</item>
+        <item name="lineHeight">16dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">16dp</item>
     </style>
 
     <style name="TextAppearance.Green.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
-        <item name="android:textSize">9sp</item>
-        <item name="lineHeight">9sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">9sp</item>
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="fontFamily">@font/inter</item>
+        <item name="android:textSize">9dp</item>
+        <item name="lineHeight">9dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">9dp</item>
     </style>
 
     <style name="TextAppearance.Green.Overline" parent="TextAppearance.Green.LabelMedium">
@@ -128,9 +114,8 @@
     </style>
 
     <style name="TextAppearance.Green.Subtitle" parent="TextAppearance.Green.BodyMedium">
-        <item name="lineHeight">22sp</item>
-        <item name="android:lineHeight" tools:targetApi="p">22sp</item>
+        <item name="lineHeight">22dp</item>
+        <item name="android:lineHeight" tools:targetApi="p">22dp</item>
     </style>
 
-
 </resources>