diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
index 6f66fb31..3a878930 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
@@ -11,7 +11,10 @@ import com.simplemobiletools.clock.extensions.*
 import com.simplemobiletools.clock.helpers.ALARM_ID
 import com.simplemobiletools.clock.helpers.getPassedSeconds
 import com.simplemobiletools.clock.models.Alarm
-import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.extensions.applyColorFilter
+import com.simplemobiletools.commons.extensions.beVisibleIf
+import com.simplemobiletools.commons.extensions.showPickSecondsDialog
+import com.simplemobiletools.commons.extensions.updateTextColors
 import com.simplemobiletools.commons.helpers.MINUTE_SECONDS
 import kotlinx.android.synthetic.main.activity_reminder.*
 
@@ -49,7 +52,6 @@ class ReminderActivity : SimpleActivity() {
 
         reminder_title.text = label
         reminder_text.text = if (isAlarmReminder) getFormattedTime(getPassedSeconds(), false, false) else getString(R.string.time_expired)
-        reminder_stop.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, getAdjustedPrimaryColor())
         reminder_stop.setOnClickListener {
             finish()
         }
diff --git a/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png
new file mode 100644
index 00000000..28988eb4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png
new file mode 100644
index 00000000..4703ce91
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png
new file mode 100644
index 00000000..fadca3b5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png
new file mode 100644
index 00000000..222be58d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png differ
diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml
index 685c3433..c97f7965 100644
--- a/app/src/main/res/layout/activity_reminder.xml
+++ b/app/src/main/res/layout/activity_reminder.xml
@@ -35,26 +35,37 @@
         style="@style/MyBorderlessBackgroundStyle"
         android:layout_width="@dimen/stopwatch_button_small_size"
         android:layout_height="@dimen/stopwatch_button_small_size"
-        android:layout_alignParentBottom="true"
-        android:layout_toLeftOf="@+id/reminder_stop"
         android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_snooze_big"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/reminder_stop"
-        app:layout_constraintEnd_toStartOf="@+id/reminder_stop"
+        app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
+        app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/reminder_stop"/>
+        app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/>
+
+    <ImageView
+        android:id="@+id/reminder_draggable"
+        android:layout_width="@dimen/stopwatch_button_small_size"
+        android:layout_height="@dimen/stopwatch_button_small_size"
+        android:layout_marginBottom="16dp"
+        android:padding="@dimen/normal_margin"
+        android:src="@drawable/ic_alarm"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/reminder_stop"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
+        app:layout_constraintTop_toBottomOf="@+id/reminder_text"/>
 
     <ImageView
         android:id="@+id/reminder_stop"
-        android:layout_width="@dimen/stopwatch_button_size"
-        android:layout_height="@dimen/stopwatch_button_size"
-        android:layout_marginBottom="@dimen/big_margin"
+        android:layout_width="@dimen/stopwatch_button_small_size"
+        android:layout_height="@dimen/stopwatch_button_small_size"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_stop"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/ic_dismiss_alarm_big"
+        app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
+        app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/>
 
 </android.support.constraint.ConstraintLayout>