diff --git a/app/src/main/res/layout/alarm_edit_row.xml b/app/src/main/res/layout/alarm_edit_row.xml
index ab259a1d8..7bd3c44eb 100644
--- a/app/src/main/res/layout/alarm_edit_row.xml
+++ b/app/src/main/res/layout/alarm_edit_row.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
-  android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom"
-  android:paddingBottom="@dimen/task_edit_double_padding_top_bottom"
+  android:layout_marginBottom="@dimen/keyline_first"
+  android:paddingBottom="@dimen/keyline_first"
   android:baselineAligned="false"
   android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/control_set_repeat_display.xml b/app/src/main/res/layout/control_set_repeat_display.xml
index 38c8dd5f2..5078619bd 100644
--- a/app/src/main/res/layout/control_set_repeat_display.xml
+++ b/app/src/main/res/layout/control_set_repeat_display.xml
@@ -23,7 +23,7 @@
     android:id="@+id/repeatTypeContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
+    android:paddingTop="@dimen/keyline_first"
     android:orientation="horizontal"
     android:visibility="gone">
 
diff --git a/app/src/main/res/layout/control_set_template.xml b/app/src/main/res/layout/control_set_template.xml
index c5b4ecb19..209495ecf 100644
--- a/app/src/main/res/layout/control_set_template.xml
+++ b/app/src/main/res/layout/control_set_template.xml
@@ -4,8 +4,8 @@
   android:id="@+id/content"
   android:layout_width="fill_parent"
   android:layout_height="wrap_content"
-  android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
-  android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
+  android:paddingTop="@dimen/keyline_first"
+  android:paddingBottom="@dimen/keyline_first"
   android:paddingStart="0dp"
   android:paddingEnd="@dimen/keyline_first"
   android:orientation="horizontal">
diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml
index 5fc408ed0..d22a3754c 100644
--- a/app/src/main/res/layout/file_row.xml
+++ b/app/src/main/res/layout/file_row.xml
@@ -7,7 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:paddingBottom="@dimen/task_edit_double_padding_top_bottom">
+  android:paddingBottom="@dimen/keyline_first">
 
   <include layout="@layout/control_set_clear_button"/>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 25044a424..425597b78 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,8 +8,6 @@
   <dimen name="task_list_footer_height">88dp</dimen>
   <dimen name="task_list_fab_margin">16dp</dimen>
 
-  <dimen name="task_edit_double_padding_top_bottom">18dp</dimen>
-  <dimen name="task_edit_drawable_padding_top_bottom">17dp</dimen>
   <dimen name="task_edit_text_size">16sp</dimen>
 
   <item format="float" name="alpha_primary" type="dimen">0.87</item>