diff --git a/astrid/res/layout/empty_linear_layout.xml b/astrid/res/layout/empty_linear_layout.xml
index e61eaa6b6..775639f6c 100644
--- a/astrid/res/layout/empty_linear_layout.xml
+++ b/astrid/res/layout/empty_linear_layout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/body"
-    android:layout_width="wrap_content"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="5dip">
diff --git a/astrid/res/layout/note_decoration.xml b/astrid/res/layout/note_decoration.xml
index 551bc7a3b..b66fee7d4 100644
--- a/astrid/res/layout/note_decoration.xml
+++ b/astrid/res/layout/note_decoration.xml
@@ -3,15 +3,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:paddingLeft="5px"
-    android:paddingRight="3px">
+    android:orientation="vertical">
     
-    <ImageView android:id="@+id/icon"
+    <ImageButton android:id="@+id/icon"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="5"
+        android:paddingLeft="5px"
+        android:paddingRight="5px"
         android:gravity="center_horizontal"
+        android:background="#00000000"
         android:scaleType="center"
         android:src="@drawable/silk_note" />