diff --git a/res/drawable/btn_check_buttonless_off.png b/res/drawable/btn_check_buttonless_off.png
new file mode 100755
index 000000000..f8972fc45
Binary files /dev/null and b/res/drawable/btn_check_buttonless_off.png differ
diff --git a/res/drawable/btn_check_buttonless_on.png b/res/drawable/btn_check_buttonless_on.png
new file mode 100755
index 000000000..a10a37ae5
Binary files /dev/null and b/res/drawable/btn_check_buttonless_on.png differ
diff --git a/res/drawable/checkbox.xml b/res/drawable/checkbox.xml
index a35336c26..eecda8fa4 100644
--- a/res/drawable/checkbox.xml
+++ b/res/drawable/checkbox.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-     <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/checkbox_on_background_focus_yellow" />
-
-     <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/checkbox_off_background_focus_yellow" />
-
      <item android:state_checked="false"
-          android:drawable="@drawable/checkbox_off_background" />
+         android:drawable="@drawable/btn_check_buttonless_off" />
 
      <item android:state_checked="true"
-          android:drawable="@drawable/checkbox_on_background" />
-
-</selector>
\ No newline at end of file
+         android:drawable="@drawable/btn_check_buttonless_on" />
+</selector>
diff --git a/res/layout/message_list_item_touchable.xml b/res/layout/message_list_item_touchable.xml
index 905063bf4..bd4d36f60 100644
--- a/res/layout/message_list_item_touchable.xml
+++ b/res/layout/message_list_item_touchable.xml
@@ -19,7 +19,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@id/chip"
+                android:button="@drawable/checkbox"
+                android:layout_centerVertical="true"
                 android:focusable="false"
+                android:paddingLeft="3dip"
                 />
        <CheckBox
                  android:id="@+id/flagged"
@@ -39,7 +42,7 @@
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dip"
+        android:layout_marginLeft="1dip"
         android:layout_toLeftOf="@id/date"
         android:layout_toRightOf="@+id/selected_checkbox"
         android:layout_marginRight="1dip"
@@ -65,9 +68,9 @@
            android:singleLine="false"
            android:layout_width="fill_parent"
            android:layout_height="fill_parent"
-        android:paddingLeft="10dip"
+        android:layout_marginLeft="1dip"
         android:layout_toLeftOf="@id/flagged"
-        android:layout_marginRight="1dip"
+        android:layout_marginRight="0dip"
         android:bufferType="spannable"
            />
 
diff --git a/res/layout/message_list_widgets.xml b/res/layout/message_list_widgets.xml
index 4a1645fde..9172c3346 100644
--- a/res/layout/message_list_widgets.xml
+++ b/res/layout/message_list_widgets.xml
@@ -23,6 +23,5 @@
                 android:layout_centerVertical="true"
                 android:focusable="false"
                 android:button="@drawable/checkbox"
-                android:background="@drawable/checkbox_background"
                 />
     </LinearLayout>