diff --git a/res/drawable/light_touch_highlight_background.xml b/res/drawable/light_touch_highlight_background.xml
new file mode 100644
index 0000000000..805a3ef218
--- /dev/null
+++ b/res/drawable/light_touch_highlight_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/light_button_highlight" />
+    <item android:drawable="@color/light_button" />
+</selector>
diff --git a/res/layout/reminder_header.xml b/res/layout/reminder_header.xml
index 1af3d4ed06..9739a5faf9 100644
--- a/res/layout/reminder_header.xml
+++ b/res/layout/reminder_header.xml
@@ -1,62 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout android:id="@+id/container"
-              xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:gravity="center_vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
               android:visibility="gone"
-              android:background="?reminder_header_background">
-
-    <LinearLayout android:id="@+id/reminder"
-                  android:layout_width="0dp"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+    <LinearLayout android:id="@+id/container"
+                  android:orientation="horizontal"
+                  android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:layout_margin="10dp"
-                  android:orientation="vertical">
+                  android:gravity="center_vertical"
+                  android:background="?reminder_header_background">
 
-        <TextView android:id="@+id/reminder_title"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textColor="@color/white"
-                  android:textSize="16sp"
-                  tools:text="@string/reminder_header_push_title" />
+        <LinearLayout android:id="@+id/reminder"
+                      android:layout_width="0dp"
+                      android:layout_height="wrap_content"
+                      android:layout_weight="1"
+                      android:layout_margin="10dp"
+                      android:orientation="vertical">
 
-        <TextView android:id="@+id/reminder_text"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:fontFamily="sans-serif-light"
-                  android:textColor="@color/white"
-                  android:textSize="14sp"
-                  tools:text="@string/reminder_header_push_text" />
+            <TextView android:id="@+id/reminder_title"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginBottom="5dp"
+                      android:textColor="@color/white"
+                      android:textSize="18sp"/>
+
+            <TextView android:id="@+id/reminder_text"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:fontFamily="sans-serif-light"
+                      android:textColor="@color/white"
+                      android:textSize="16sp"/>
+
+        </LinearLayout>
+
+        <LinearLayout android:layout_width="wrap_content"
+                      android:layout_height="match_parent"
+                      android:gravity="right"
+                      android:layout_marginLeft="15dp"
+                      android:orientation="vertical">
+
+            <LinearLayout android:layout_width="wrap_content"
+                          android:layout_height="0dp"
+                          android:layout_weight="1"
+                          android:gravity="top">
+
+                <ImageButton android:id="@+id/cancel"
+                             android:layout_width="40dp"
+                             android:layout_height="40dp"
+                             android:padding="10dp"
+                             android:background="@drawable/touch_highlight_background"
+                             android:src="@drawable/ic_menu_remove_holo_light"/>
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="wrap_content"
+                          android:layout_height="0dp"
+                          android:layout_weight="1"
+                          android:gravity="bottom">
+
+                <Button android:id="@+id/ok"
+                        android:layout_width="60sp"
+                        android:layout_height="40sp"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:background="@drawable/light_touch_highlight_background"
+                        android:fontFamily="sans-serif-light"
+                        android:textColor="@color/white"
+                        android:clickable="false"
+                        android:text="@string/yes"
+                        android:padding="2dp"/>
+
+            </LinearLayout>
+
+          </LinearLayout>
 
     </LinearLayout>
-
-    <TextView android:id="@+id/cancel"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textSize="16sp"
-              android:fontFamily="sans-serif-medium"
-              android:paddingLeft="6dp"
-              android:paddingRight="6dp"
-              android:paddingTop="8dp"
-              android:paddingBottom="8dp"
-              android:textColor="#99ffffff"
-              android:clickable="true"
-              android:text="@string/reminder_header_close_button" />
-
-    <TextView android:id="@+id/accept"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textSize="16sp"
-              android:fontFamily="sans-serif-medium"
-              android:paddingLeft="6dp"
-              android:paddingRight="6dp"
-              android:paddingTop="8dp"
-              android:paddingBottom="8dp"
-              android:textColor="@color/white"
-              tools:text="ENABLE" />
-
 </LinearLayout>
diff --git a/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
index 0035a42190..eb7888221e 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java
@@ -17,8 +17,7 @@ public class DefaultSmsReminder extends Reminder {
   @TargetApi(VERSION_CODES.KITKAT)
   public DefaultSmsReminder(final Context context) {
     super(context.getString(R.string.reminder_header_sms_default_title),
-          context.getString(R.string.reminder_header_sms_default_text),
-          context.getString(R.string.reminder_header_sms_default_button));
+          context.getString(R.string.reminder_header_sms_default_text));
 
     final OnClickListener okListener = new OnClickListener() {
       @Override
diff --git a/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java b/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java
index f5a5b0fc9c..7de9c41626 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java
@@ -14,8 +14,7 @@ public class ExpiredBuildReminder extends Reminder {
 
   public ExpiredBuildReminder(final Context context) {
     super(context.getString(R.string.reminder_header_expired_build),
-          context.getString(R.string.reminder_header_expired_build_details),
-          context.getString(R.string.reminder_header_expired_build_button));
+          context.getString(R.string.reminder_header_expired_build_details));
     setOkListener(new OnClickListener() {
       @Override public void onClick(View v) {
         try {
diff --git a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
index 255d944771..48c0a0dde9 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
@@ -16,8 +16,7 @@ public class InviteReminder extends Reminder {
                         final @NonNull Recipients recipients)
   {
     super(context.getString(R.string.reminder_header_invite_title),
-          context.getString(R.string.reminder_header_invite_text, recipients.toShortString()),
-          context.getString(R.string.reminder_header_invite_button));
+          context.getString(R.string.reminder_header_invite_text, recipients.toShortString()));
 
     setDismissListener(new OnClickListener() {
       @Override public void onClick(View v) {
diff --git a/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java b/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
index 12843f4b1f..5ea461f883 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
@@ -14,8 +14,7 @@ public class PushRegistrationReminder extends Reminder {
 
   public PushRegistrationReminder(final Context context, final MasterSecret masterSecret) {
     super(context.getString(R.string.reminder_header_push_title),
-          context.getString(R.string.reminder_header_push_text),
-          context.getString(R.string.reminder_header_push_button));
+          context.getString(R.string.reminder_header_push_text));
 
     final OnClickListener okListener = new OnClickListener() {
       @Override
diff --git a/src/org/thoughtcrime/securesms/components/reminder/Reminder.java b/src/org/thoughtcrime/securesms/components/reminder/Reminder.java
index 652a59cecf..4812007d51 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/Reminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/Reminder.java
@@ -1,12 +1,9 @@
 package org.thoughtcrime.securesms.components.reminder;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
 import android.view.View.OnClickListener;
 
 public abstract class Reminder {
-  private CharSequence buttonText;
   private CharSequence title;
   private CharSequence text;
 
@@ -14,12 +11,10 @@ public abstract class Reminder {
   private OnClickListener dismissListener;
 
   public Reminder(@NonNull CharSequence title,
-                  @NonNull CharSequence text,
-                  @NonNull CharSequence buttonText)
+                  @NonNull CharSequence text)
   {
     this.title      = title;
     this.text       = text;
-    this.buttonText = buttonText;
   }
 
   public CharSequence getTitle() {
@@ -30,10 +25,6 @@ public abstract class Reminder {
     return text;
   }
 
-  public CharSequence getButtonText() {
-    return buttonText;
-  }
-
   public OnClickListener getOkListener() {
     return okListener;
   }
diff --git a/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java b/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
index 3657f2d0ed..5c00a36e59 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
@@ -7,6 +7,7 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -18,8 +19,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
  */
 public class ReminderView extends LinearLayout {
   private ViewGroup   container;
-  private TextView    acceptButton;
-  private TextView    closeButton;
+  private ImageButton closeButton;
   private TextView    title;
   private TextView    text;
 
@@ -41,19 +41,17 @@ public class ReminderView extends LinearLayout {
 
   private void initialize() {
     LayoutInflater.from(getContext()).inflate(R.layout.reminder_header, this, true);
-    container    = ViewUtil.findById(this, R.id.container);
-    acceptButton = ViewUtil.findById(this, R.id.accept);
-    closeButton  = ViewUtil.findById(this, R.id.cancel);
-    title        = ViewUtil.findById(this, R.id.reminder_title);
-    text         = ViewUtil.findById(this, R.id.reminder_text);
+    container = ViewUtil.findById(this, R.id.container);
+    closeButton = ViewUtil.findById(this, R.id.cancel);
+    title       = ViewUtil.findById(this, R.id.reminder_title);
+    text        = ViewUtil.findById(this, R.id.reminder_text);
   }
 
   public void showReminder(final Reminder reminder) {
     title.setText(reminder.getTitle());
     text.setText(reminder.getText());
-    acceptButton.setText(reminder.getButtonText());
 
-    acceptButton.setOnClickListener(reminder.getOkListener());
+    setOnClickListener(reminder.getOkListener());
 
     if (reminder.isDismissable()) {
       closeButton.setOnClickListener(new OnClickListener() {
diff --git a/src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java b/src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java
index 56e5d40d49..229074626d 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java
@@ -15,8 +15,7 @@ public class SystemSmsImportReminder extends Reminder {
 
   public SystemSmsImportReminder(final Context context, final MasterSecret masterSecret) {
     super(context.getString(R.string.reminder_header_sms_import_title),
-          context.getString(R.string.reminder_header_sms_import_text),
-          context.getString(R.string.reminder_header_sms_import_button));
+          context.getString(R.string.reminder_header_sms_import_text));
 
     final OnClickListener okListener = new OnClickListener() {
       @Override