diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml
index c462b3bd4..972fc5b51 100644
--- a/app/src/main/res/layout/meeting_edit_fragment.xml
+++ b/app/src/main/res/layout/meeting_edit_fragment.xml
@@ -177,7 +177,7 @@
                         android:layout_width="0dp"
                         android:layout_height="50dp"
                         android:layout_marginEnd="16dp"
-                        android:layout_marginTop="5dp"
+                        android:layout_marginTop="8dp"
                         android:paddingStart="20dp"
                         android:paddingEnd="20dp"
                         android:textSize="14sp"
diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml
index 0bc0f2c6e..09edb393f 100644
--- a/app/src/main/res/layout/meeting_schedule_fragment.xml
+++ b/app/src/main/res/layout/meeting_schedule_fragment.xml
@@ -316,7 +316,7 @@
                         android:layout_width="0dp"
                         android:layout_height="50dp"
                         android:layout_marginEnd="16dp"
-                        android:layout_marginTop="5dp"
+                        android:layout_marginTop="8dp"
                         android:paddingStart="20dp"
                         android:paddingEnd="20dp"
                         android:textSize="14sp"
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index 0ac011ec4..00bfe7af4 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -119,6 +119,7 @@
                     android:layout_width="0dp"
                     android:layout_height="50dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_marginTop="8dp"
                     android:paddingStart="20dp"
                     android:paddingEnd="20dp"
                     android:textSize="14sp"
@@ -333,6 +334,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_marginTop="8dp"
                     android:paddingBottom="16dp"
                     android:background="@drawable/shape_squircle_white_background"
                     android:orientation="vertical"
@@ -361,6 +363,7 @@
                         android:layout_width="0dp"
                         android:layout_height="50dp"
                         android:layout_marginEnd="16dp"
+                        android:layout_marginTop="8dp"
                         android:paddingStart="20dp"
                         android:paddingEnd="20dp"
                         android:textSize="14sp"
@@ -409,6 +412,7 @@
                         android:layout_width="0dp"
                         android:layout_height="50dp"
                         android:layout_marginEnd="16dp"
+                        android:layout_marginTop="8dp"
                         android:paddingStart="20dp"
                         android:paddingEnd="20dp"
                         android:textSize="14sp"
@@ -462,6 +466,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_marginTop="8dp"
                     android:orientation="vertical"
                     android:paddingBottom="16dp"
                     android:background="@drawable/shape_squircle_white_background"
@@ -496,6 +501,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
+                    android:layout_marginTop="8dp"
                     android:orientation="vertical"
                     android:paddingBottom="16dp"
                     android:background="@drawable/shape_squircle_white_background"
diff --git a/app/src/main/res/layout/settings_meetings.xml b/app/src/main/res/layout/settings_meetings.xml
index 2dcdca625..0cfd3e216 100644
--- a/app/src/main/res/layout/settings_meetings.xml
+++ b/app/src/main/res/layout/settings_meetings.xml
@@ -37,6 +37,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginTop="8dp"
             android:background="@drawable/edit_text_background"
             android:paddingStart="@dimen/spinner_start_padding"
             android:paddingEnd="@dimen/spinner_end_padding"
diff --git a/app/src/main/res/layout/settings_tunnel.xml b/app/src/main/res/layout/settings_tunnel.xml
index 004fca49c..114347bb8 100644
--- a/app/src/main/res/layout/settings_tunnel.xml
+++ b/app/src/main/res/layout/settings_tunnel.xml
@@ -23,8 +23,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="20dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:text="@string/settings_tunnel_main_host_label"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
@@ -35,6 +33,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginTop="8dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:text="@={viewModel.tunnelMainHost}"
@@ -57,8 +56,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:text="@string/settings_tunnel_main_port_label"
             app:layout_constraintTop_toBottomOf="@id/tunnel_host"
             app:layout_constraintStart_toStartOf="parent"/>
@@ -69,6 +66,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginTop="8dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:text="@={viewModel.tunnelMainPort}"
@@ -119,8 +117,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:text="@string/settings_tunnel_second_host_label"
             android:visibility="@{viewModel.tunnelDualMode ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/tunnel_dual_mode_switch"
@@ -132,6 +128,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginTop="8dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:text="@={viewModel.tunnelDualHost}"
@@ -155,8 +152,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:text="@string/settings_tunnel_second_port_label"
             android:visibility="@{viewModel.tunnelDualMode ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/tunnel_dual_host"
@@ -168,6 +163,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginTop="8dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:text="@={viewModel.tunnelDualPort}"
@@ -191,8 +187,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:text="@string/settings_tunnel_mode_label"
             app:layout_constraintTop_toBottomOf="@id/tunnel_dual_port"
             app:layout_constraintStart_toStartOf="parent"/>
@@ -203,6 +197,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginTop="8dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:textSize="14sp"
diff --git a/app/src/main/res/layout/settings_user_interface.xml b/app/src/main/res/layout/settings_user_interface.xml
index 652bef073..ec419767b 100644
--- a/app/src/main/res/layout/settings_user_interface.xml
+++ b/app/src/main/res/layout/settings_user_interface.xml
@@ -49,6 +49,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginTop="8dp"
             android:background="@drawable/edit_text_background"
             android:paddingStart="@dimen/spinner_start_padding"
             android:paddingEnd="@dimen/spinner_end_padding"
@@ -92,6 +93,7 @@
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginTop="8dp"
             android:background="@drawable/edit_text_background"
             android:paddingStart="@dimen/spinner_start_padding"
             android:paddingEnd="@dimen/spinner_end_padding"