diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
index db2d3b541..99ec09ac4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
@@ -45,6 +45,7 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
+import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.repeats.RepeatControlSet;
 import com.todoroo.astrid.ui.NumberPicker;
 import com.todoroo.astrid.utility.Preferences;
@@ -83,7 +84,7 @@ public class NotificationActivity extends TaskListActivity implements OnTimeSetL
     private void populateFilter(Intent intent) {
         taskId = intent.getLongExtra(TOKEN_ID, -1);
         if(taskId == -1)
-            taskId = 389; // TODO no
+            return;
 
         Filter itemFilter = new Filter(getString(R.string.rmd_NoA_filter),
                 getString(R.string.rmd_NoA_filter),
@@ -126,6 +127,16 @@ public class NotificationActivity extends TaskListActivity implements OnTimeSetL
                 snooze();
             }
         });
+
+        ((Button)findViewById(R.id.done)).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                Task task = new Task();
+                task.setId(taskId);
+                taskService.setComplete(task, true);
+                finish();
+            }
+        });
     }
 
     public static class SnoozeDialog extends FrameLayout implements DialogInterface.OnClickListener {
diff --git a/astrid/res/drawable/tango_clock.png b/astrid/res/drawable/tango_clock.png
index d676ffd46..d53b15a27 100644
Binary files a/astrid/res/drawable/tango_clock.png and b/astrid/res/drawable/tango_clock.png differ
diff --git a/astrid/res/drawable/timers_decoration.png b/astrid/res/drawable/timers_decoration.png
index 18b7c6781..ce8414ff9 100644
Binary files a/astrid/res/drawable/timers_decoration.png and b/astrid/res/drawable/timers_decoration.png differ
diff --git a/astrid/res/layout/notification_control.xml b/astrid/res/layout/notification_control.xml
index 5e623bd1a..c82768ddc 100644
--- a/astrid/res/layout/notification_control.xml
+++ b/astrid/res/layout/notification_control.xml
@@ -6,41 +6,52 @@
     android:visibility="visible"
     android:layout_weight="1">
     
-    <TextView android:id="@+id/reminderLabel"
+            
+    <LinearLayout android:id="@+id/buttons"
         android:layout_width="fill_parent" 
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:text="I want you to be the walrus."
-        android:background="@drawable/reminder_popup"
-        style="@style/TextAppearance.TLA_Reminder" />
-      
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/reminderLabel"
         android:layout_alignParentLeft="true"
-        android:orientation="horizontal">
+        android:orientation="vertical">
+        
+        <Button android:id="@+id/done"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="49"
+            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:layout_weight="49"
+            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: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>
+
+    <TextView android:id="@+id/reminderLabel"
+        android:layout_width="fill_parent" 
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/buttons"
+        android:text="I want you to be the walrus."
+        android:background="@drawable/reminder_popup"
+        style="@style/TextAppearance.TLA_Reminder" />
+                  
+    <ImageView android:id="@+id/astridIcon"
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content"
+        android:layout_below="@id/reminderLabel"
+        android:layout_alignParentRight="true"
+        android:paddingRight="15dip"
+        android:src="@drawable/icon_blank" />
         
 </RelativeLayout>
\ No newline at end of file
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index d816c3588..cb1d6dd7c 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -42,6 +42,9 @@
   <!-- Name of filter when viewing a reminder -->
   <string name="rmd_NoA_filter">Reminder!</string>
   
+  <!-- Reminder: Task was already done -->
+  <string name="rmd_NoA_done">Already Done!</string>
+  
   <!-- Reminder: Snooze button (remind again later) -->
   <string name="rmd_NoA_snooze">Snooze...</string>
   
diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java
index 830e8d767..b2c2f81da 100644
--- a/astrid/src/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/com/todoroo/astrid/utility/Constants.java
@@ -30,7 +30,7 @@ public final class Constants {
     /**
      * Whether to turn on debugging logging and UI
      */
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = false;
 
     /**
      * Upgrade time