diff --git a/astrid/res/drawable-hdpi/check_box_1.png b/astrid/res/drawable-hdpi/check_box_1.png
new file mode 100644
index 000000000..65aae5bf6
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_1.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_2.png b/astrid/res/drawable-hdpi/check_box_2.png
new file mode 100644
index 000000000..324ef27c6
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_2.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_3.png b/astrid/res/drawable-hdpi/check_box_3.png
new file mode 100644
index 000000000..08930eb49
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_3.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_4.png b/astrid/res/drawable-hdpi/check_box_4.png
new file mode 100644
index 000000000..8c99fd606
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_4.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_checked_1.png b/astrid/res/drawable-hdpi/check_box_checked_1.png
new file mode 100644
index 000000000..3b07c03c6
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_checked_1.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_checked_2.png b/astrid/res/drawable-hdpi/check_box_checked_2.png
new file mode 100644
index 000000000..44176360f
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_checked_2.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_checked_3.png b/astrid/res/drawable-hdpi/check_box_checked_3.png
new file mode 100644
index 000000000..43f6d1ee2
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_checked_3.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_checked_4.png b/astrid/res/drawable-hdpi/check_box_checked_4.png
new file mode 100644
index 000000000..9443c88d6
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_checked_4.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_large_1.png b/astrid/res/drawable-hdpi/check_box_large_1.png
new file mode 100644
index 000000000..0a464b6d9
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_large_1.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_large_2.png b/astrid/res/drawable-hdpi/check_box_large_2.png
new file mode 100644
index 000000000..ab118406e
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_large_2.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_large_3.png b/astrid/res/drawable-hdpi/check_box_large_3.png
new file mode 100644
index 000000000..d79f07003
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_large_3.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_large_4.png b/astrid/res/drawable-hdpi/check_box_large_4.png
new file mode 100644
index 000000000..d93936938
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_large_4.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_1.png b/astrid/res/drawable-hdpi/check_box_repeat_1.png
new file mode 100644
index 000000000..e53d2db19
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_1.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_2.png b/astrid/res/drawable-hdpi/check_box_repeat_2.png
new file mode 100644
index 000000000..a78730dcb
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_2.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_3.png b/astrid/res/drawable-hdpi/check_box_repeat_3.png
new file mode 100644
index 000000000..694d2a498
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_3.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_4.png b/astrid/res/drawable-hdpi/check_box_repeat_4.png
new file mode 100644
index 000000000..dc6302544
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_4.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_1.png b/astrid/res/drawable-hdpi/check_box_repeat_checked_1.png
new file mode 100644
index 000000000..574e17075
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_checked_1.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_2.png b/astrid/res/drawable-hdpi/check_box_repeat_checked_2.png
new file mode 100644
index 000000000..1dc0e6183
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_checked_2.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_3.png b/astrid/res/drawable-hdpi/check_box_repeat_checked_3.png
new file mode 100644
index 000000000..96c692999
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_checked_3.png differ
diff --git a/astrid/res/drawable-hdpi/check_box_repeat_checked_4.png b/astrid/res/drawable-hdpi/check_box_repeat_checked_4.png
new file mode 100644
index 000000000..3965fff4c
Binary files /dev/null and b/astrid/res/drawable-hdpi/check_box_repeat_checked_4.png differ
diff --git a/astrid/res/drawable/check_box_large_1.png b/astrid/res/drawable/check_box_large_1.png
index 02f55098b..0a464b6d9 100644
Binary files a/astrid/res/drawable/check_box_large_1.png and b/astrid/res/drawable/check_box_large_1.png differ
diff --git a/astrid/res/drawable/check_box_large_2.png b/astrid/res/drawable/check_box_large_2.png
index 9d9e37924..ab118406e 100644
Binary files a/astrid/res/drawable/check_box_large_2.png and b/astrid/res/drawable/check_box_large_2.png differ
diff --git a/astrid/res/drawable/check_box_large_3.png b/astrid/res/drawable/check_box_large_3.png
index aab8907b1..d79f07003 100644
Binary files a/astrid/res/drawable/check_box_large_3.png and b/astrid/res/drawable/check_box_large_3.png differ
diff --git a/astrid/res/drawable/check_box_large_4.png b/astrid/res/drawable/check_box_large_4.png
index 838fa734b..d93936938 100644
Binary files a/astrid/res/drawable/check_box_large_4.png and b/astrid/res/drawable/check_box_large_4.png differ
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index 730c33d50..62154cb32 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -21,20 +21,6 @@
 	    android:layout_height="wrap_content"
 	    android:minHeight="57dip">
 	
-	    <!-- completion check-box -->
-	    <greendroid.widget.AsyncImageView
-	        android:id="@+id/picture"
-	        android:layout_width="47dip"
-	        android:layout_height="45dip"
-	        android:layout_centerVertical="true"
-	        android:padding="2dip"
-	        android:paddingTop="1dip"
-	        android:paddingLeft="1dip"
-	        android:layout_marginLeft="5dip"
-	        astrid:defaultSrc="@drawable/icn_default_person_image"
-	        android:scaleType="fitCenter"
-	        android:visibility="gone" >
-	    </greendroid.widget.AsyncImageView>
 	    <ImageView
 	        android:id="@+id/pictureBorder"
 	        android:layout_width="47dip"
@@ -45,6 +31,17 @@
 	        android:scaleType="center"
 	        android:visibility="gone" >
 	    </ImageView>
+	    <greendroid.widget.AsyncImageView
+	        android:id="@+id/picture"
+	        android:layout_width="47dip"
+	        android:layout_height="47dip"
+	        android:padding="2dip"
+	        android:layout_marginLeft="5dip"
+	        android:layout_centerVertical="true"
+	        astrid:defaultSrc="@drawable/icn_default_person_image"
+	        android:scaleType="fitCenter"
+	        android:visibility="gone" >
+	    </greendroid.widget.AsyncImageView>
 	    
 	    <CheckBox
 	        android:id="@+id/completeBox"