diff --git a/app/build.gradle b/app/build.gradle
index 0ca0d29e1..f90c9cc0d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,7 +46,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.15.0'
+    implementation 'com.simplemobiletools:commons:3.15.4'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'com.android.support:multidex:1.0.3'
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
index 58a984037..6fa3f9cac 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
@@ -307,27 +307,27 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupUseSameSnooze() {
-        settings_snooze_delay_holder.beVisibleIf(config.useSameSnooze)
+        settings_snooze_time_holder.beVisibleIf(config.useSameSnooze)
         settings_use_same_snooze.isChecked = config.useSameSnooze
         settings_use_same_snooze_holder.setOnClickListener {
             settings_use_same_snooze.toggle()
             config.useSameSnooze = settings_use_same_snooze.isChecked
-            settings_snooze_delay_holder.beVisibleIf(config.useSameSnooze)
+            settings_snooze_time_holder.beVisibleIf(config.useSameSnooze)
         }
     }
 
     private fun setupSnoozeDelay() {
         updateSnoozeText()
-        settings_snooze_delay_holder.setOnClickListener {
-            showEventReminderDialog(config.snoozeDelay, true) {
-                config.snoozeDelay = it
+        settings_snooze_time_holder.setOnClickListener {
+            showEventReminderDialog(config.snoozeTime, true) {
+                config.snoozeTime = it
                 updateSnoozeText()
             }
         }
     }
 
     private fun updateSnoozeText() {
-        settings_snooze_delay.text = res.getQuantityString(R.plurals.by_minutes, config.snoozeDelay, config.snoozeDelay)
+        settings_snooze_delay.text = res.getQuantityString(R.plurals.by_minutes, config.snoozeTime, config.snoozeTime)
     }
 
     private fun getHoursString(hours: Int): String {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt
index 27f4b9bbc..00285a0b5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt
@@ -12,10 +12,10 @@ class SnoozeReminderActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        showEventReminderDialog(config.snoozeDelay, true, cancelCallback = { dialogCancelled() }) {
+        showEventReminderDialog(config.snoozeTime, true, cancelCallback = { dialogCancelled() }) {
             val eventId = intent.getIntExtra(EVENT_ID, 0)
             val event = dbHelper.getEventWithId(eventId)
-            config.snoozeDelay = it
+            config.snoozeTime = it
             rescheduleReminder(event, it)
             finishActivity()
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt
index 865091359..691bd6b32 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt
@@ -11,9 +11,9 @@ import com.simplemobiletools.calendar.extensions.getNowSeconds
 import com.simplemobiletools.calendar.extensions.seconds
 import com.simplemobiletools.calendar.helpers.Formatter
 import com.simplemobiletools.commons.extensions.getDialogTheme
-import com.simplemobiletools.commons.extensions.isLollipopPlus
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.extensions.value
+import com.simplemobiletools.commons.helpers.isLollipopPlus
 import kotlinx.android.synthetic.main.dialog_repeat_limit_type_picker.view.*
 import org.joda.time.DateTime
 import java.util.*
@@ -40,10 +40,10 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Int,
                 .setPositiveButton(R.string.ok, { dialogInterface, i -> confirmRepetition() })
                 .setNegativeButton(R.string.cancel, null)
                 .create().apply {
-            activity.setupDialogStuff(view, this) {
-                activity.currentFocus?.clearFocus()
-            }
-        }
+                    activity.setupDialogStuff(view, this) {
+                        activity.currentFocus?.clearFocus()
+                    }
+                }
     }
 
     private fun getCheckedItem() = when {
@@ -86,7 +86,7 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Int,
         val datepicker = DatePickerDialog(activity, activity.getDialogTheme(), repetitionLimitDateSetListener, repeatLimitDateTime.year,
                 repeatLimitDateTime.monthOfYear - 1, repeatLimitDateTime.dayOfMonth)
 
-        if (activity.isLollipopPlus()) {
+        if (isLollipopPlus()) {
             datepicker.datePicker.firstDayOfWeek = if (activity.config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY
         }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
index 2ad685347..de454b106 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
@@ -31,6 +31,10 @@ import com.simplemobiletools.calendar.receivers.CalDAVSyncReceiver
 import com.simplemobiletools.calendar.receivers.NotificationReceiver
 import com.simplemobiletools.calendar.services.SnoozeService
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.isKitkatPlus
+import com.simplemobiletools.commons.helpers.isLollipopPlus
+import com.simplemobiletools.commons.helpers.isMarshmallowPlus
+import com.simplemobiletools.commons.helpers.isOreoPlus
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import java.io.File
@@ -186,7 +190,7 @@ fun Context.notifyEvent(event: Event) {
 @SuppressLint("NewApi")
 private fun getNotification(context: Context, pendingIntent: PendingIntent, event: Event, content: String): Notification {
     val channelId = "reminder_channel"
-    if (context.isOreoPlus()) {
+    if (isOreoPlus()) {
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val name = context.resources.getString(R.string.event_reminders)
         val importance = NotificationManager.IMPORTANCE_HIGH
@@ -218,7 +222,7 @@ private fun getNotification(context: Context, pendingIntent: PendingIntent, even
             .setChannelId(channelId)
             .addAction(R.drawable.ic_snooze, context.getString(R.string.snooze), getSnoozePendingIntent(context, event))
 
-    if (context.isLollipopPlus()) {
+    if (isLollipopPlus()) {
         builder.setVisibility(Notification.VISIBILITY_PUBLIC)
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
index 42e0d0bc9..919659d9f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
@@ -48,14 +48,6 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getInt(REMINDER_MINUTES_3, REMINDER_OFF)
         set(defaultReminderMinutes3) = prefs.edit().putInt(REMINDER_MINUTES_3, defaultReminderMinutes3).apply()
 
-    var useSameSnooze: Boolean
-        get() = prefs.getBoolean(USE_SAME_SNOOZE, false)
-        set(useSameSnooze) = prefs.edit().putBoolean(USE_SAME_SNOOZE, useSameSnooze).apply()
-
-    var snoozeDelay: Int
-        get() = prefs.getInt(SNOOZE_DELAY, 10)
-        set(snoozeDelay) = prefs.edit().putInt(SNOOZE_DELAY, snoozeDelay).apply()
-
     var displayPastEvents: Int
         get() = prefs.getInt(DISPLAY_PAST_EVENTS, 0)
         set(displayPastEvents) = prefs.edit().putInt(DISPLAY_PAST_EVENTS, displayPastEvents).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
index c3d303665..844d6f4cc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@@ -47,10 +47,8 @@ const val FONT_SIZE = "font_size"
 const val CALDAV_SYNC = "caldav_sync"
 const val CALDAV_SYNCED_CALENDAR_IDS = "caldav_synced_calendar_ids"
 const val LAST_USED_CALDAV_CALENDAR = "last_used_caldav_calendar"
-const val SNOOZE_DELAY = "snooze_delay"
 const val DISPLAY_PAST_EVENTS = "display_past_events"
 const val REPLACE_DESCRIPTION = "replace_description"
-const val USE_SAME_SNOOZE = "use_same_snooze"
 
 // repeat_rule for monthly repetition
 const val REPEAT_MONTH_SAME_DAY = 1                   // ie 25th every month
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/services/SnoozeService.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/services/SnoozeService.kt
index 32ebf1e6e..a16cbe568 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/services/SnoozeService.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/services/SnoozeService.kt
@@ -11,6 +11,6 @@ class SnoozeService : IntentService("Snooze") {
     override fun onHandleIntent(intent: Intent) {
         val eventId = intent.getIntExtra(EVENT_ID, 0)
         val event = dbHelper.getEventWithId(eventId)
-        rescheduleReminder(event, config.snoozeDelay)
+        rescheduleReminder(event, config.snoozeTime)
     }
 }
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index fc69d28ca..fd09879ae 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -269,7 +269,7 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/settings_snooze_delay_holder"
+            android:id="@+id/settings_snooze_time_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
@@ -280,7 +280,7 @@
             android:paddingTop="@dimen/bigger_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_snooze_delay_label"
+                android:id="@+id/settings_snooze_time_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -288,7 +288,7 @@
                 android:layout_toStartOf="@+id/settings_snooze_delay"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingRight="@dimen/medium_margin"
-                android:text="@string/snooze_delay"/>
+                android:text="@string/snooze_time"/>
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_snooze_delay"
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 16be9ac69..96a9a8d8f 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">War a-seblant n\'ho peus darvoud ebet da zont.</string>
     <string name="add_some_events">Gallout a rit ouzhpennañ reoù gant an afell \"Mui\" en traoñ.</string>
     <string name="go_to_today">Mont da hiziv</string>
-    <string name="snooze">Daleañ</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Deiziataer miziek</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">Goubredañ CalDAV</string>
     <string name="event_lists">Roll an darvoudoù</string>
     <string name="display_past_events">Skrammañ darvoudoù an amzer tremenet</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Daleañ an adc\'halv eus</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 57603bfd2..0264fffe9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Nemáte žádné nadcházející události.</string>
     <string name="add_some_events">Přidejte událost tlačítkem Plus dole.</string>
     <string name="go_to_today">Přejít na dnešek</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Měsíční kalendář</string>
@@ -172,8 +171,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Seznamy událostí</string>
     <string name="display_past_events">Zobrazit minulé události</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Odložit připomenutí pomocí funkce Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a38bd7024..153505b02 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Du ser ikke ud til at have nogen forestående begivenheder.</string>
     <string name="add_some_events">Du kan tilføje nogle med plus-knappen nederst.</string>
     <string name="go_to_today">Gå til i dag</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Månedlig kalender</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Begivenhedsliste</string>
     <string name="display_past_events">Vis overståede begivenheder</string>
-    <string name="use_same_snooze">Brug altid samme snooze-tid</string>
-    <string name="snooze_delay">Udsæt påmindelsen med en snooze på</string>
     <string name="replace_description_with_location">Erstat beskrivelse med sted</string>
     <string name="delete_all_events">Slet alle begivenheder</string>
     <string name="delete_all_events_confirmation">Er du sikker på at du vil slette alle begivenheder? Dine begivenhedstyper og andre indstillinger vil forblive intakte.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c0efb2630..8f167d915 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Keine anstehenden Termine</string>
     <string name="add_some_events">Du kannst neue Termine mit dem Hinzufügen Button unten rechts erstellen.</string>
     <string name="go_to_today">Gehe zu Heute</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Monatskalender</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV Synchronisierung</string>
     <string name="event_lists">Terminlisten</string>
     <string name="display_past_events">Vergangene Termine anzeigen</string>
-    <string name="use_same_snooze">Immer dasselbe Snooze-Intervall nutzen</string>
-    <string name="snooze_delay">Erinnerung mit Snooze verschieben um</string>
     <string name="replace_description_with_location">Ersetze Terminbeschreibung mit Ort</string>
     <string name="delete_all_events">Alle Termine löschen</string>
     <string name="delete_all_events_confirmation">Bist du sicher, dass du alle Termine löschen willst? Deine Termintypen und Einstellungen bleiben erhalten.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5790dcada..abf14b018 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Parece que no tienes ningún evento próximo.</string>
     <string name="add_some_events">Puede añadir eventos con el botón Más en la parte inferior.</string>
     <string name="go_to_today">Ir al día de hoy</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendario mensual</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">Sincronizar CalDAV</string>
     <string name="event_lists">Listas de eventos</string>
     <string name="display_past_events">Mostrar eventos pasados</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Retrasar recordatorio durante</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 93e75def7..470d70df3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Il semblerait que vous n\'ayez aucun événement à venir.</string>
     <string name="add_some_events">Vous pouvez ajouter des événements avec le bouton + en bas.</string>
     <string name="go_to_today">Aller à aujourd\'hui</string>
-    <string name="snooze">Sommeiller</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendrier mensuel</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">Synchronisation CalDAV</string>
     <string name="event_lists">Listes d\'événements</string>
     <string name="display_past_events">Afficher les événements du passé</string>
-    <string name="use_same_snooze">Toujours utiliser le même intervalle de répétition</string>
-    <string name="snooze_delay">Reporter le rappel avec Snooze de</string>
     <string name="replace_description_with_location">Remplacer la description de l\'événement par l\'emplacement</string>
     <string name="delete_all_events">Supprimer tous les événements</string>
     <string name="delete_all_events_confirmation">Êtes-vous sûr de vouloir supprimer tous les événements? Cela laissera vos types d\'événements et autres paramètres intacts.</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 0e1e59b8a..53768cf49 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Semella que non ten ningún evento próximo.</string>
     <string name="add_some_events">Pode engadir algún co botón Máis na parte inferior.</string>
     <string name="go_to_today">Ir ao día de hoxe</string>
-    <string name="snooze">Retrasar</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendario mensual</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sincr.</string>
     <string name="event_lists">Listas de eventos</string>
     <string name="display_past_events">Mostrar eventos do pasado</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Retrasar recordatorio con Snooze</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index eaa677aef..90e25e0a0 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string>
     <string name="add_some_events">You can add some with the Plus button at the bottom.</string>
     <string name="go_to_today">Go to today</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendar monthly</string>
@@ -170,8 +169,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index fe41682c8..b7572e368 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string>
     <string name="add_some_events">You can add some with the Plus button at the bottom.</string>
     <string name="go_to_today">Go to today</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Havi naptár</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d9c409bf2..a126e343b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string>
     <string name="add_some_events">You can add some with the Plus button at the bottom.</string>
     <string name="go_to_today">Go to today</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendario mensile</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 5f9eaaf70..52216991c 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">נראה שאין לך אירועים בזמן הקרוב.</string>
     <string name="add_some_events">ניתן להוסיף אירועים בעזרת כפתור הפלוס למטה.</string>
     <string name="go_to_today">Go to today</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">לוח השנה חודשית</string>
@@ -170,8 +169,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f2dcb4337..696d9657b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string>
     <string name="add_some_events">You can add some with the Plus button at the bottom.</string>
     <string name="go_to_today">Go to today</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">カレンダー月</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b5a074ff0..8759cd792 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">다가올 이벤트가 없는 것 같습니다.</string>
     <string name="add_some_events">아래의 더하기 버튼을 눌러 추가할 수 있습니다.</string>
     <string name="go_to_today">오늘로 이동</string>
-    <string name="snooze">스누즈</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">월별 달력</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV 동기화</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">과거의 이벤트 표시</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">스누즈 알림 시간</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 0d61af57e..7edce51d2 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Ser ut som du ikke har noen kommende hendelser.</string>
     <string name="add_some_events">Du kan legge til noen med Pluss-knappen nederst.</string>
     <string name="go_to_today">Gå til idag</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Månedskalender</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV-synkronisering</string>
     <string name="event_lists">Hendelseslister</string>
     <string name="display_past_events">Vis hendelser fra fortiden</string>
-    <string name="use_same_snooze">Bruk alltid samme intervall for Snooze</string>
-    <string name="snooze_delay">Utsett påminnelser med Snooze</string>
     <string name="replace_description_with_location">Erstatt hendelsesbeskrivelse med sted</string>
     <string name="delete_all_events">Slett alle hendelser</string>
     <string name="delete_all_events_confirmation">Er du sikker på at du vil slette alle hendelser? Dine hendelsestyper og andre innstillinger blir beholdt.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 91b44597e..4ce528815 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Niets gepland.</string>
     <string name="add_some_events">Gebruik de plus-knop om iets te plannen.</string>
     <string name="go_to_today">Naar vandaag</string>
-    <string name="snooze">Uitstellen</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Maandweergave</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV-synchronisatie</string>
     <string name="event_lists">Afsprakenlijst</string>
     <string name="display_past_events">Afgelopen afspraken tonen</string>
-    <string name="use_same_snooze">Altijd dezelfde interval voor uitstellen gebruiken</string>
-    <string name="snooze_delay">Herinnering uitstellen met</string>
     <string name="replace_description_with_location">Beschrijving vervangen door locatie van afspraken</string>
     <string name="delete_all_events">Alle afspraken verwijderen</string>
     <string name="delete_all_events_confirmation">Alle afspraken verwijderen? Afspraaktypes en andere instellingen blijven behouden.</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index ce61211f5..d3f1d1dca 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Ser ut som du ikke har noen kommende hendelser.</string>
     <string name="add_some_events">Du kan legge til noen med Pluss-knappen nederst.</string>
     <string name="go_to_today">Gå til idag</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Månedskalender</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV-synkronisering</string>
     <string name="event_lists">Hendelseslister</string>
     <string name="display_past_events">Vis hendelser fra fortiden</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Utsett påminnelser med Snooze med</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7730fcc0d..4608d372e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Wygląda na to, że nie masz żadnych nadchodzących wydarzeń.</string>
     <string name="add_some_events">Możesz je dodawać za pomocą przycisku \"+\" znajdującego na dole.</string>
     <string name="go_to_today">Przejdź do dnia dzisiejszego</string>
-    <string name="snooze">Drzemka</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Prosty Kalendarz - widok miesięczny</string>
@@ -171,8 +170,6 @@
     <string name="caldav_sync">Synchronizacja CalDAV</string>
     <string name="event_lists">Lista wydarzeń</string>
     <string name="display_past_events">Pokazuj wydarzenia z przeszłości</string>
-    <string name="use_same_snooze">Zawsze używaj tego samego przedziału przypomnienia</string>
-    <string name="snooze_delay">Opóźnij przypomnienie o</string>
     <string name="replace_description_with_location">Zamieniaj opis wydarzenia na lokalizację</string>
     <string name="delete_all_events">Usuń wszystkie wydarzenia</string>
     <string name="delete_all_events_confirmation">Czy na pewno mam usunąć wszystkie wydarzenia? Nie naruszy to typów wydarzeń i innych ustawień.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fc8765cfc..0c2a8e043 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Parece que você não tem eventos próximos.</string>
     <string name="add_some_events">Pode-se adicionar um evento através do botão existente na base da tela.</string>
     <string name="go_to_today">Ir para hoje</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendário mensal</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 5cab54f3e..572283ffa 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Parece que você não tem eventos para breve.</string>
     <string name="add_some_events">Pode adicionar um evento através do botão existente na base do ecrã.</string>
     <string name="go_to_today">Ir para hoje</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendário mensal</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">Sincronização CalDAV</string>
     <string name="event_lists">Lista de eventos</string>
     <string name="display_past_events">Mostrar eventos passados</string>
-    <string name="use_same_snooze">Usar sempre o mesmo intervalo para snooze</string>
-    <string name="snooze_delay">Adiar lembrete com a opção Snooze</string>
     <string name="replace_description_with_location">Substituir descrição pela localização do evento</string>
     <string name="delete_all_events">Apagar todos os eventos</string>
     <string name="delete_all_events_confirmation">Tem a certeza de que deseja apagar todos os eventos? Esta ação não afeta os tipos de eventos nem as outras definições.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4e674f2a8..a45cbb4d7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Похоже, у вас нет предстоящих событий.</string>
     <string name="add_some_events">Вы можете их добавить, нажав на кнопку с плюсом внизу.</string>
     <string name="go_to_today">Сегодня</string>
-    <string name="snooze">Отложить</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Календарь на месяц</string>
@@ -175,8 +174,6 @@
     <string name="caldav_sync">Синхронизация по CalDAV</string>
     <string name="event_lists">Списки событий</string>
     <string name="display_past_events">Показывать прошедшие события</string>
-    <string name="use_same_snooze">Всегда использовать один и тот же интервал повтора</string>
-    <string name="snooze_delay">Отложить напоминание на</string>
     <string name="replace_description_with_location">Заменить описание события местоположением</string>
     <string name="delete_all_events">Удалить все события</string>
     <string name="delete_all_events_confirmation">Вы действительно хотите удалить все события? Это не затронет ваши типы событий и другие настройки.</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d63b3b710..e507c29f7 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Nemáte žiadne naplánované udalosti.</string>
     <string name="add_some_events">Viete ich pridať pomocou tlačidla Plus v pravom dolnom rohu.</string>
     <string name="go_to_today">Prejsť na dnešok</string>
-    <string name="snooze">Odložiť</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Kalendár mesačný</string>
@@ -172,8 +171,6 @@
     <string name="caldav_sync">CalDAV synchronizácia</string>
     <string name="event_lists">Zoznamy udalostí</string>
     <string name="display_past_events">Zobraziť minulé udalosti spred</string>
-    <string name="use_same_snooze">Použiť stále rovnaký odklad s Odložiť</string>
-    <string name="snooze_delay">Posunúť pripomienku s Odložiť o</string>
     <string name="replace_description_with_location">Nahradiť popis udalosti miestom</string>
     <string name="delete_all_events">Odstrániť všetky udalosti</string>
     <string name="delete_all_events_confirmation">Ste si istý, že chcete odstrániť všetky udalosti? Všetky typy udalostí a nastavenia ostanú nedotknuté.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b16b3f501..82d1335e5 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Det ser ut som att du inte har några kommande händelser.</string>
     <string name="add_some_events">Du kan lägga till händelser via plus-knappen som du ser längst ner.</string>
     <string name="go_to_today">Gå till idag</string>
-    <string name="snooze">Snooza</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Kalender månadsvis</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV-synkronisering</string>
     <string name="event_lists">Händelselistor</string>
     <string name="display_past_events">Visa tidigare händelser</string>
-    <string name="use_same_snooze">Använd alltid samma snooze-intervall</string>
-    <string name="snooze_delay">Skjut upp påminnelse med Snooza</string>
     <string name="replace_description_with_location">Ersätt händelsebeskrivning med plats</string>
     <string name="delete_all_events">Ta bort alla händelser</string>
     <string name="delete_all_events_confirmation">Är du säker på att du vill ta bort alla händelser? Dina händelsetyper och andra inställningar påverkas inte av borttagningen.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6ec5894a4..8d2cf01f8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Gelecekteki etkinliğiniz yok gibi görünüyor.</string>
     <string name="add_some_events">Artı düğmesinin alt kısmında bazılarını ekleyebilirsiniz.</string>
     <string name="go_to_today">Bugüne git</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Aylık takvim</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b5cd34cbd..9011520f5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">看來你近期沒有任何活動。</string>
     <string name="add_some_events">你可以用底部的[加號]按鈕添加一些活動。</string>
     <string name="go_to_today">前往今天</string>
-    <string name="snooze">延遲</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">月曆</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV同步</string>
     <string name="event_lists">活動列表</string>
     <string name="display_past_events">顯示過去的活動</string>
-    <string name="use_same_snooze">總是使用相同延遲間隔</string>
-    <string name="snooze_delay">再次提醒的延遲時間</string>
     <string name="replace_description_with_location">活動描述改成地點</string>
     <string name="delete_all_events">刪除全部活動</string>
     <string name="delete_all_events_confirmation">你確定要刪除全部活動嗎?會完整留下你的活動類型和其他設定。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 454db1cd9..24b4aed3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,6 @@
     <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string>
     <string name="add_some_events">You can add some with the Plus button at the bottom.</string>
     <string name="go_to_today">Go to today</string>
-    <string name="snooze">Snooze</string>
 
     <!-- Widget titles -->
     <string name="widget_monthly">Calendar monthly</string>
@@ -169,8 +168,6 @@
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
     <string name="display_past_events">Display events from the past</string>
-    <string name="use_same_snooze">Always use same snooze interval</string>
-    <string name="snooze_delay">Postpone reminder with Snooze by</string>
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="delete_all_events">Delete all events</string>
     <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>