diff --git a/astrid/res/layout/notification_control.xml b/astrid/res/layout/notification_control.xml
index ed75c787c..d76c37b10 100644
--- a/astrid/res/layout/notification_control.xml
+++ b/astrid/res/layout/notification_control.xml
@@ -17,23 +17,9 @@
         <Button android:id="@+id/done"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
+            android:textSize="16sp"
             android:drawableLeft="@drawable/tango_check"
             android:text="@string/rmd_NoA_done"/>
-        
-        <Button android:id="@+id/snooze"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:drawableLeft="@drawable/tango_clock"
-            android:text="@string/rmd_NoA_snooze" />
-        
-        <Button android:id="@+id/goAway"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:drawableLeft="@drawable/tango_stop"
-            android:text="@string/rmd_NoA_goAway" />
             
     </LinearLayout>
 
@@ -46,12 +32,36 @@
         android:background="@drawable/reminder_popup"
         style="@style/TextAppearance.TLA_Reminder" />
                   
-    <ImageView android:id="@+id/astridIcon"
-        android:layout_width="wrap_content" 
+    <LinearLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/reminderLabel"
-        android:layout_alignParentRight="true"
-        android:paddingRight="15dip"
-        android:src="@drawable/icon_blank" />
+        android:layout_alignParentLeft="true"
+        android:orientation="horizontal">
+        
+        <Button android:id="@+id/snooze"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="49"
+            android:textSize="16sp"
+            android:drawableLeft="@drawable/tango_clock"
+            android:text="@string/rmd_NoA_snooze" />
+        
+        <Button android:id="@+id/goAway"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="49"
+            android:textSize="16sp"
+            android:drawableLeft="@drawable/tango_stop"
+            android:text="@string/rmd_NoA_goAway" />
+          
+        <ImageView android:id="@+id/astridIcon"
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:paddingRight="15dip"
+            android:paddingLeft="5dip"
+            android:src="@drawable/icon_blank" />
+    </LinearLayout>
         
 </RelativeLayout>
\ No newline at end of file