diff --git a/src/main/res/layout/control_set_template.xml b/src/main/res/layout/control_set_template.xml
index 3fb8b4dce..4e33e4e60 100644
--- a/src/main/res/layout/control_set_template.xml
+++ b/src/main/res/layout/control_set_template.xml
@@ -14,17 +14,15 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingTop="@dimen/task_edit_padding_top_bottom"
+        android:layout_marginTop="@dimen/task_edit_padding_top_bottom">
 
         <LinearLayout
             android:id="@+id/content"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/task_edit_padding_top_bottom"
-            android:paddingBottom="@dimen/task_edit_padding_top_bottom"
-            android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
-            android:layout_marginBottom="@dimen/task_edit_padding_top_bottom" />
+            android:orientation="vertical" />
 
         <include layout="@layout/task_edit_divider" />
 
diff --git a/src/main/res/layout/task_edit_divider.xml b/src/main/res/layout/task_edit_divider.xml
index 00ad2a65e..710145bf3 100644
--- a/src/main/res/layout/task_edit_divider.xml
+++ b/src/main/res/layout/task_edit_divider.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<View xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:layout_height="1px"
-    android:background="?attr/task_edit_divider"
-    android:layout_gravity="end|bottom"/>
\ No newline at end of file
+    android:paddingTop="@dimen/task_edit_padding_top_bottom"
+    android:layout_marginTop="@dimen/task_edit_padding_top_bottom">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?attr/task_edit_divider"
+        android:layout_gravity="end|bottom" />
+</LinearLayout>