diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 41152c3de..740e592b3 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -49,8 +49,8 @@
                     android:paddingLeft="16dp"
                     android:paddingRight="16dp"
                     android:paddingEnd="16dp"
-                    android:paddingBottom="20dp"
-                    android:paddingTop="20dp"
+                    android:paddingBottom="@dimen/task_top_bottom_padding"
+                    android:paddingTop="@dimen/task_top_bottom_padding"
                     android:id="@+id/linearLayout"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentLeft="true"
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index 5fc74041a..ba2794a53 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -16,6 +16,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:background="@color/white">
+        android:minHeight="@dimen/task_min_height">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -56,8 +57,8 @@
                     android:paddingLeft="16dp"
                     android:paddingRight="16dp"
                     android:paddingEnd="16dp"
-                    android:paddingBottom="20dp"
-                    android:paddingTop="20dp">
+                    android:paddingBottom="@dimen/task_top_bottom_padding"
+                    android:paddingTop="@dimen/task_top_bottom_padding">
                     <TextView
                         android:id="@+id/checkedTextView"
                         style="@style/CardTitle"
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 65a2efb70..86697f3bd 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -42,10 +42,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <LinearLayout
-                    android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:padding="5dp">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_centerVertical="true"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="@dimen/task_top_bottom_padding"
+                    android:paddingTop="@dimen/task_top_bottom_padding">
                     <CheckedTextView
                         android:id="@+id/checkedTextView"
                         style="@style/CardTitle"
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index b31fdc899..923a73336 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -44,4 +44,5 @@
 	<dimen name="checkbox_size">30dp</dimen>
 
 	<dimen name="login_field_width">350dp</dimen>
+	<dimen name="task_top_bottom_padding">20dp</dimen>
 </resources>
\ No newline at end of file