diff --git a/res/drawable-hdpi/ic_close_white_24dp.png b/res/drawable-hdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000..d42adbaae1
Binary files /dev/null and b/res/drawable-hdpi/ic_close_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_close_white_24dp.png b/res/drawable-mdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000..bb62b22d4a
Binary files /dev/null and b/res/drawable-mdpi/ic_close_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_close_white_24dp.png b/res/drawable-xhdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000..856427baf5
Binary files /dev/null and b/res/drawable-xhdpi/ic_close_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_close_white_24dp.png b/res/drawable-xxhdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000..1690d6f732
Binary files /dev/null and b/res/drawable-xxhdpi/ic_close_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_close_white_24dp.png b/res/drawable-xxxhdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000..8d6b78513b
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_close_white_24dp.png differ
diff --git a/res/layout/reminder_header.xml b/res/layout/reminder_header.xml
index 64d6091604..2d4354abee 100644
--- a/res/layout/reminder_header.xml
+++ b/res/layout/reminder_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content">
@@ -9,6 +10,8 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:visibility="gone"
+                  tools:visibility="visible"
+                  android:padding="2dp"
                   android:gravity="center_vertical"
                   android:background="?reminder_header_background">
 
@@ -23,12 +26,14 @@
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_marginBottom="5dp"
+                      tools:text="Invite to Signal"
                       android:textColor="@color/white"
                       android:textSize="18sp"/>
 
             <TextView android:id="@+id/reminder_text"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
+                      tools:text="Take your conversation with Jules Bonnot to the next level."
                       android:fontFamily="sans-serif-light"
                       android:textColor="@color/white"
                       android:textSize="16sp"/>
@@ -51,27 +56,8 @@
                              android:layout_height="40dp"
                              android:padding="10dp"
                              android:background="@drawable/touch_highlight_background"
-                             android:src="@drawable/ic_menu_remove_holo_light"/>
+                             android:src="@drawable/ic_close_white_24dp"/>
             </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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a49b6b33f..ce1f3af98b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1039,16 +1039,16 @@
     <string name="reminder_header_expired_build">Your build of Signal has expired!</string>
     <string name="reminder_header_expired_build_details">Messages will no longer send successfully, please update to the most recent version.</string>
     <string name="reminder_header_expired_build_button">UPGRADE</string>
-    <string name="reminder_header_sms_default_title">Use as default SMS app?</string>
+    <string name="reminder_header_sms_default_title">Use as default SMS app</string>
     <string name="reminder_header_sms_default_text">Tap to make Signal your default SMS app.</string>
     <string name="reminder_header_sms_default_button">SET</string>
-    <string name="reminder_header_sms_import_title">Import system SMS?</string>
+    <string name="reminder_header_sms_import_title">Import system SMS</string>
     <string name="reminder_header_sms_import_text">Tap to copy your phone\'s SMS messages into its encrypted database.</string>
     <string name="reminder_header_sms_import_button">IMPORT</string>
-    <string name="reminder_header_push_title">Enable Signal?</string>
+    <string name="reminder_header_push_title">Enable Signal</string>
     <string name="reminder_header_push_text">Upgrade your messaging experience.</string>
     <string name="reminder_header_push_button">ENABLE</string>
-    <string name="reminder_header_invite_title">Invite to Signal?</string>
+    <string name="reminder_header_invite_title">Invite to Signal</string>
     <string name="reminder_header_invite_text">Take your conversation with %1$s to the next level.</string>
     <string name="reminder_header_invite_button">INVITE</string>
     <string name="reminder_header_close_button">CLOSE</string>
diff --git a/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java b/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
index 5c00a36e59..7f92944b87 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
@@ -41,7 +41,7 @@ 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);
+    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);