diff --git a/myExpenses/src/main/res/layout-v29/onboarding_theme_selection.xml b/myExpenses/src/main/res/layout-v29/onboarding_theme_selection.xml
index 3c425ad934..c59a5339cc 100644
--- a/myExpenses/src/main/res/layout-v29/onboarding_theme_selection.xml
+++ b/myExpenses/src/main/res/layout-v29/onboarding_theme_selection.xml
@@ -3,8 +3,6 @@
 <Spinner xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/themeSpinner"
     style="@style/OnboardingSpinner"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:entries="@array/pref_ui_theme_entries" />
 </merge>
\ No newline at end of file
diff --git a/myExpenses/src/main/res/layout/amount_edittext.xml b/myExpenses/src/main/res/layout/amount_edittext.xml
index c1b68f2e70..bedfc6df68 100644
--- a/myExpenses/src/main/res/layout/amount_edittext.xml
+++ b/myExpenses/src/main/res/layout/amount_edittext.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/AmountEditText"
     android:layout_width="0dp"
+    android:minHeight="@dimen/accessibility_clickable_minimum"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:layout_weight="1"
diff --git a/myExpenses/src/main/res/layout/color_input.xml b/myExpenses/src/main/res/layout/color_input.xml
index 0016cf23d6..b5034ce787 100644
--- a/myExpenses/src/main/res/layout/color_input.xml
+++ b/myExpenses/src/main/res/layout/color_input.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/colorInput"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/accessibility_clickable_minimum"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     tools:showIn="@layout/one_account">
@@ -12,7 +12,7 @@
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/ColorIndicator"
         android:layout_width="0dp"
-        android:layout_height="40dp"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:contentDescription="@string/color_component_title"
@@ -22,7 +22,7 @@
         android:id="@+id/ColorEdit"
         style="?actionButtonStyle"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:contentDescription="@string/color_component_title"
         android:focusable="true"
diff --git a/myExpenses/src/main/res/layout/onboarding_wizzard_data.xml b/myExpenses/src/main/res/layout/onboarding_wizzard_data.xml
index 6709de28d9..47a79f7c3f 100644
--- a/myExpenses/src/main/res/layout/onboarding_wizzard_data.xml
+++ b/myExpenses/src/main/res/layout/onboarding_wizzard_data.xml
@@ -53,8 +53,6 @@
             <Spinner
                 android:id="@+id/Currency"
                 style="@style/OnboardingSpinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical" />
 
             <Button
@@ -96,8 +94,6 @@
                 <Spinner
                     android:id="@+id/AccountType"
                     style="@style/OnboardingSpinner"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical" />
 
                 <TextView
diff --git a/myExpenses/src/main/res/layout/one_expense.xml b/myExpenses/src/main/res/layout/one_expense.xml
index fdfb38bd84..abe73a6cad 100644
--- a/myExpenses/src/main/res/layout/one_expense.xml
+++ b/myExpenses/src/main/res/layout/one_expense.xml
@@ -380,7 +380,7 @@
                         <EditText
                             android:id="@+id/Comment"
                             android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_gravity="center_vertical"
                             android:layout_weight="1"
                             android:inputType="textCapSentences|textMultiLine" />
@@ -388,7 +388,7 @@
                         <Spinner
                             android:id="@+id/Status"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_gravity="center_vertical" />
 
                     </LinearLayout>
diff --git a/myExpenses/src/main/res/values/styles.xml b/myExpenses/src/main/res/values/styles.xml
index dd083e2f86..fe1dcbfdab 100644
--- a/myExpenses/src/main/res/values/styles.xml
+++ b/myExpenses/src/main/res/values/styles.xml
@@ -43,13 +43,14 @@
     <style name="FormLabel">
         <item name="android:gravity">center_vertical</item>
         <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:minHeight">50dp</item>
+        <item name="android:minHeight">@dimen/accessibility_clickable_minimum</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">1</item>
         <item name="android:paddingEnd">12dp</item>
     </style>
 
     <style name="FormField">
+        <item name="android:minHeight">@dimen/accessibility_clickable_minimum</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">@dimen/form_table_ratio</item>
         <item name="android:layout_gravity">center_vertical</item>
@@ -258,6 +259,8 @@
     </style>
 
     <style name="OnboardingSpinner">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/accessibility_clickable_minimum</item>
         <item name="android:layout_marginStart">-8dp</item>
     </style>