diff --git a/app/src/main/res/layout/dialog_edit_alarm.xml b/app/src/main/res/layout/dialog_edit_alarm.xml
index 00e5c56d..6be80b27 100644
--- a/app/src/main/res/layout/dialog_edit_alarm.xml
+++ b/app/src/main/res/layout/dialog_edit_alarm.xml
@@ -49,9 +49,9 @@
             android:layout_below="@+id/edit_alarm_days_holder"
             android:background="?attr/selectableItemBackground"
             android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/normal_margin"
+            android:paddingTop="@dimen/medium_margin"
             android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/normal_margin"
+            android:paddingBottom="@dimen/medium_margin"
             android:textSize="@dimen/bigger_text_size">
 
             <ImageView
@@ -84,42 +84,45 @@
             android:background="?attr/selectableItemBackground"
             android:drawableLeft="@drawable/ic_bell_vector"
             android:drawablePadding="@dimen/normal_margin"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/normal_margin"
-            android:paddingBottom="@dimen/normal_margin"
+            android:padding="@dimen/activity_margin"
             android:textSize="@dimen/bigger_text_size"
             tools:text="Default alarm" />
 
-        <ImageView
-            android:id="@+id/edit_alarm_label_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/edit_alarm_sound"
-            android:layout_alignTop="@+id/edit_alarm_hint"
-            android:layout_alignBottom="@+id/edit_alarm_hint"
-            android:layout_marginStart="@dimen/activity_margin"
-            android:layout_marginEnd="@dimen/tiny_margin"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_label_vector" />
-
-        <com.simplemobiletools.commons.views.MyTextInputLayout
-            android:id="@+id/edit_alarm_hint"
+        <LinearLayout
+            android:id="@+id/edit_alarm_label_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/edit_alarm_sound"
-            android:layout_marginStart="@dimen/medium_margin"
-            android:layout_marginEnd="@dimen/bigger_margin"
-            android:layout_toEndOf="@+id/edit_alarm_label_image"
-            android:hint="@string/label">
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/activity_margin"
+            android:paddingTop="@dimen/medium_margin"
+            android:paddingEnd="@dimen/activity_margin"
+            android:paddingBottom="@dimen/medium_margin"
+            android:layout_below="@+id/edit_alarm_sound">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/edit_alarm"
+            <ImageView
+                android:id="@+id/edit_alarm_label_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_label_vector" />
+
+            <com.simplemobiletools.commons.views.MyTextInputLayout
+                android:id="@+id/edit_alarm_hint"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:singleLine="true"
-                android:textSize="@dimen/normal_text_size" />
+                android:layout_marginStart="@dimen/medium_margin"
+                android:layout_marginEnd="@dimen/medium_margin"
+                android:hint="@string/label">
 
-        </com.simplemobiletools.commons.views.MyTextInputLayout>
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edit_alarm"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:singleLine="true"
+                    android:textSize="@dimen/normal_text_size" />
+
+            </com.simplemobiletools.commons.views.MyTextInputLayout>
+        </LinearLayout>
     </RelativeLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_edit_timer.xml b/app/src/main/res/layout/dialog_edit_timer.xml
index ea502d93..50493600 100644
--- a/app/src/main/res/layout/dialog_edit_timer.xml
+++ b/app/src/main/res/layout/dialog_edit_timer.xml
@@ -29,7 +29,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/activity_margin"
+            android:paddingStart="@dimen/activity_margin"
+            android:paddingTop="@dimen/medium_margin"
+            android:paddingEnd="@dimen/activity_margin"
+            android:paddingBottom="@dimen/medium_margin"
             app:layout_constraintTop_toBottomOf="@+id/edit_timer_initial_time">
 
             <ImageView