diff --git a/android/app/src/main/java/com/github/quarck/calnotify/prefs/CalendarsActivity.kt b/android/app/src/main/java/com/github/quarck/calnotify/prefs/CalendarsActivity.kt
index cfc0a95fc..bfcd42d9a 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/prefs/CalendarsActivity.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/prefs/CalendarsActivity.kt
@@ -35,7 +35,7 @@ import android.view.ViewGroup
 import android.widget.CheckBox
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.RecyclerView
@@ -244,7 +244,7 @@ class CalendarsActivity : AppCompatActivity() {
     }
 
     private fun showCalendarSyncHelp() {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.calendar_sync_help_title)
             .setMessage(R.string.calendar_sync_help_message)
             .setPositiveButton(android.R.string.ok, null)
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/prefs/ListPreference.kt b/android/app/src/main/java/com/github/quarck/calnotify/prefs/ListPreference.kt
index 37e062126..af0bc9490 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/prefs/ListPreference.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/prefs/ListPreference.kt
@@ -19,7 +19,7 @@
 
 package com.github.quarck.calnotify.prefs
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.content.Context
 import android.widget.ArrayAdapter
 import com.github.quarck.calnotify.R
@@ -35,7 +35,7 @@ class ListPreference<T>(
 
     fun create() {
 
-        val builder = AlertDialog.Builder(context)
+        val builder = MaterialAlertDialogBuilder(context)
         builder.setIcon(R.drawable.ic_launcher)
         builder.setTitle(context.resources.getString(titleId))
 
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/prefs/MiscSettingsFragmentX.kt b/android/app/src/main/java/com/github/quarck/calnotify/prefs/MiscSettingsFragmentX.kt
index 751c460ae..86ecdbb50 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/prefs/MiscSettingsFragmentX.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/prefs/MiscSettingsFragmentX.kt
@@ -22,9 +22,9 @@ package com.github.quarck.calnotify.prefs
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.github.quarck.calnotify.R
@@ -123,7 +123,7 @@ class MiscSettingsFragmentX : PreferenceFragmentCompat() {
     }
 
     private fun showImportConfirmation(uri: android.net.Uri) {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.import_confirm_title)
             .setMessage(R.string.import_confirm_message)
             .setPositiveButton(android.R.string.ok) { _, _ ->
@@ -191,7 +191,7 @@ class MiscSettingsFragmentX : PreferenceFragmentCompat() {
             append(getString(R.string.import_summary_restart_note))
         }
 
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.import_summary_title)
             .setMessage(message)
             .setPositiveButton(android.R.string.ok, null)
@@ -199,6 +199,6 @@ class MiscSettingsFragmentX : PreferenceFragmentCompat() {
     }
 
     private fun showToast(messageResId: Int) {
-        Toast.makeText(requireContext(), messageResId, Toast.LENGTH_LONG).show()
+        view?.let { Snackbar.make(it, messageResId, Snackbar.LENGTH_LONG).show() }
     }
 }
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/prefs/NavigationSettingsFragmentX.kt b/android/app/src/main/java/com/github/quarck/calnotify/prefs/NavigationSettingsFragmentX.kt
index a99eb96a6..24679edf2 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/prefs/NavigationSettingsFragmentX.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/prefs/NavigationSettingsFragmentX.kt
@@ -24,7 +24,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.github.quarck.calnotify.R
@@ -61,7 +61,7 @@ class NavigationSettingsFragmentX : PreferenceFragmentCompat() {
     
     private fun showSwitchToClassicViewDialog() {
         val ctx = context ?: return
-        AlertDialog.Builder(ctx)
+        MaterialAlertDialogBuilder(ctx)
             .setMessage(R.string.switch_to_classic_view_confirm)
             .setPositiveButton(android.R.string.ok) { _, _ ->
                 switchToClassicView()
@@ -72,7 +72,7 @@ class NavigationSettingsFragmentX : PreferenceFragmentCompat() {
     
     private fun showSwitchToNewViewDialog() {
         val ctx = context ?: return
-        AlertDialog.Builder(ctx)
+        MaterialAlertDialogBuilder(ctx)
             .setMessage(R.string.switch_to_new_view_confirm)
             .setPositiveButton(android.R.string.ok) { _, _ ->
                 switchToNewView()
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/prefs/ReminderPatternPreferenceX.kt b/android/app/src/main/java/com/github/quarck/calnotify/prefs/ReminderPatternPreferenceX.kt
index 1c0190a92..9826a3971 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/prefs/ReminderPatternPreferenceX.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/prefs/ReminderPatternPreferenceX.kt
@@ -23,9 +23,15 @@ import android.content.Context
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.View
-import android.widget.*
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
+import android.widget.CheckBox
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.NumberPicker
 import androidx.preference.DialogPreference
 import androidx.preference.PreferenceDialogFragmentCompat
+import com.google.android.material.snackbar.Snackbar
 import com.github.quarck.calnotify.Consts
 import com.github.quarck.calnotify.R
 import com.github.quarck.calnotify.utils.findOrThrow
@@ -60,7 +66,7 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
         return a.getString(index) ?: "10m"
     }
 
-    class Dialog : PreferenceDialogFragmentCompat(), AdapterView.OnItemSelectedListener {
+    class Dialog : PreferenceDialogFragmentCompat() {
         private val SecondsIndex = 0
         private val MinutesIndex = 1
         private val HoursIndex = 2
@@ -68,9 +74,11 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
 
         private var reminderPatternMillis = longArrayOf(0)
         private var simpleIntervalMode = true
+        private var selectedPosition: Int = MinutesIndex
 
         private lateinit var numberPicker: NumberPicker
-        private lateinit var timeUnitsSpinners: Spinner
+        private lateinit var timeUnitsDropdown: AutoCompleteTextView
+        private lateinit var timeUnitsArray: Array<String>
         private lateinit var checkboxCustomPattern: CheckBox
         private lateinit var editTextCustomPattern: EditText
         private lateinit var layoutSimpleInterval: LinearLayout
@@ -80,20 +88,25 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
             super.onBindDialogView(view)
 
             numberPicker = view.findOrThrow(R.id.numberPickerTimeInterval)
-            timeUnitsSpinners = view.findOrThrow(R.id.spinnerTimeIntervalUnit)
+            timeUnitsDropdown = view.findOrThrow(R.id.spinnerTimeIntervalUnit)
             checkboxCustomPattern = view.findOrThrow(R.id.checkbox_custom_reminder_pattern)
             editTextCustomPattern = view.findOrThrow(R.id.edittext_custom_reminder_pattern)
             layoutSimpleInterval = view.findOrThrow(R.id.layout_reminder_interval_simple)
             layoutCustomPattern = view.findOrThrow(R.id.layout_reminder_interval_custom)
 
-            timeUnitsSpinners.adapter = ArrayAdapter(
+            timeUnitsArray = view.context.resources.getStringArray(R.array.time_units_plurals_with_seconds)
+            val adapter = ArrayAdapter(
                 view.context,
-                android.R.layout.simple_list_item_1,
-                view.context.resources.getStringArray(R.array.time_units_plurals_with_seconds)
+                android.R.layout.simple_dropdown_item_1line,
+                timeUnitsArray
             )
+            timeUnitsDropdown.setAdapter(adapter)
 
-            timeUnitsSpinners.onItemSelectedListener = this
-            timeUnitsSpinners.setSelection(MinutesIndex)
+            timeUnitsDropdown.setOnItemClickListener { _, _, position, _ ->
+                selectedPosition = position
+                onItemSelected(position)
+            }
+            setSelection(MinutesIndex)
 
             numberPicker.minValue = 1
             numberPicker.maxValue = 100
@@ -113,6 +126,13 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
                 updateLayout()
             }
         }
+        
+        private fun setSelection(position: Int) {
+            selectedPosition = position
+            if (position >= 0 && position < timeUnitsArray.size) {
+                timeUnitsDropdown.setText(timeUnitsArray[position], false)
+            }
+        }
 
         private fun updateLayout() {
             if (simpleIntervalMode) {
@@ -128,7 +148,7 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
 
         private fun clearFocus() {
             numberPicker.clearFocus()
-            timeUnitsSpinners.clearFocus()
+            timeUnitsDropdown.clearFocus()
         }
 
         override fun onDialogClosed(positiveResult: Boolean) {
@@ -142,7 +162,7 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
                     var simpleIntervalMillis = simpleIntervalSeconds * 1000L
                     if (simpleIntervalMillis == 0L) {
                         simpleIntervalMillis = 60 * 1000L
-                        Toast.makeText(context, R.string.invalid_reminder_interval, Toast.LENGTH_LONG).show()
+                        view?.let { Snackbar.make(it, R.string.invalid_reminder_interval, Snackbar.LENGTH_LONG).show() }
                     }
                     reminderPatternMillis = longArrayOf(simpleIntervalMillis)
                     newPattern = PreferenceUtils.formatPattern(reminderPatternMillis)
@@ -156,7 +176,7 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
                         }.toLongArray()
                         newPattern = PreferenceUtils.formatPattern(reminderPatternMillis)
                     } else {
-                        Toast.makeText(context, R.string.error_cannot_parse_pattern, Toast.LENGTH_LONG).show()
+                        view?.let { Snackbar.make(it, R.string.error_cannot_parse_pattern, Snackbar.LENGTH_LONG).show() }
                         return
                     }
                 }
@@ -167,7 +187,7 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
             }
         }
 
-        override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        private fun onItemSelected(position: Int) {
             if (position == SecondsIndex) {
                 numberPicker.minValue = Consts.MIN_REMINDER_INTERVAL_SECONDS
                 numberPicker.maxValue = 60
@@ -177,13 +197,11 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
             }
         }
 
-        override fun onNothingSelected(parent: AdapterView<*>?) {}
-
         private var simpleIntervalSeconds: Int
             get() {
                 clearFocus()
                 val number = numberPicker.value
-                val multiplier = when (timeUnitsSpinners.selectedItemPosition) {
+                val multiplier = when (selectedPosition) {
                     SecondsIndex -> 1
                     MinutesIndex -> 60
                     HoursIndex -> 60 * 60
@@ -209,7 +227,7 @@ class ReminderPatternPreferenceX @JvmOverloads constructor(
                     number /= 24
                 }
 
-                timeUnitsSpinners.setSelection(units)
+                setSelection(units)
                 numberPicker.value = number
             }
 
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/prefs/SnoozePresetPreferenceX.kt b/android/app/src/main/java/com/github/quarck/calnotify/prefs/SnoozePresetPreferenceX.kt
index ed2edcc8f..0369cc4ed 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/prefs/SnoozePresetPreferenceX.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/prefs/SnoozePresetPreferenceX.kt
@@ -19,7 +19,7 @@
 
 package com.github.quarck.calnotify.prefs
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.content.Context
 import android.os.Bundle
 import android.util.AttributeSet
@@ -106,7 +106,7 @@ class SnoozePresetPreferenceX @JvmOverloads constructor(
 
         private fun showMessage(id: Int) {
             val context = requireContext()
-            AlertDialog.Builder(context)
+            MaterialAlertDialogBuilder(context)
                 .setMessage(context.getString(id))
                 .setCancelable(false)
                 .setPositiveButton(android.R.string.ok) { _, _ -> }
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/ActiveEventsFragment.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/ActiveEventsFragment.kt
index 669f84def..11dccc9ba 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/ActiveEventsFragment.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/ActiveEventsFragment.kt
@@ -29,8 +29,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.ImageButton
 import android.widget.LinearLayout
+import com.google.android.material.button.MaterialButton
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
@@ -121,7 +121,7 @@ class ActiveEventsFragment : Fragment(), EventListCallback, SearchableFragment,
     private fun setupNewUIBanner(view: View) {
         newUIBanner = view.findViewById(R.id.new_ui_banner)
         val bannerText = view.findViewById<TextView>(R.id.new_ui_banner_text)
-        val dismissButton = view.findViewById<ImageButton>(R.id.new_ui_banner_dismiss)
+        val dismissButton = view.findViewById<MaterialButton>(R.id.new_ui_banner_dismiss)
         
         // Show banner if enabled in settings
         if (settings.showNewUIBanner) {
@@ -146,7 +146,7 @@ class ActiveEventsFragment : Fragment(), EventListCallback, SearchableFragment,
         selectionCountText = view.findViewById(R.id.selection_count_text)
         
         // Close selection button
-        view.findViewById<ImageButton>(R.id.btn_close_selection)?.setOnClickListener {
+        view.findViewById<MaterialButton>(R.id.btn_close_selection)?.setOnClickListener {
             adapter.exitSelectionMode()
         }
         
@@ -156,7 +156,7 @@ class ActiveEventsFragment : Fragment(), EventListCallback, SearchableFragment,
         }
         
         // Snooze selected button
-        view.findViewById<Button>(R.id.btn_snooze_selected)?.setOnClickListener {
+        view.findViewById<Button>(  R.id.btn_snooze_selected)?.setOnClickListener {
             showSnoozeSelectedDialog()
         }
         
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventListAdapter.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventListAdapter.kt
index 36fbe423e..a33cb3c5c 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventListAdapter.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventListAdapter.kt
@@ -80,7 +80,7 @@ class DismissedEventListAdapter(
         //var eventId: Long = 0;
         var entry: DismissedEventAlertRecord? = null
 
-        var eventHolder: RelativeLayout?
+        var eventHolder: View?
         var eventTitleText: TextView
         //var eventTitleLayout: RelativeLayout?
         var eventDateText: TextView
@@ -89,13 +89,13 @@ class DismissedEventListAdapter(
         var snoozedUntilText: TextView?
         val compactViewCalendarColor: View?
 
-        val compactViewContentLayout: RelativeLayout?
-        var undoLayout: RelativeLayout?
+        val compactViewContentLayout: ViewGroup?
+        var undoLayout: ViewGroup?
 
         var calendarColor: ColorDrawable
 
         init {
-            eventHolder = itemView.find<RelativeLayout>(R.id.card_view_main_holder)
+            eventHolder = itemView.find<View>(R.id.card_view_main_holder)
             eventTitleText = itemView.findOrThrow<TextView>(R.id.card_view_event_name)
             //eventTitleLayout = itemView.findOrThrow<RelativeLayout?>(R.id.card_view_event_title_layout)
 
@@ -103,9 +103,9 @@ class DismissedEventListAdapter(
             eventTimeText = itemView.findOrThrow<TextView>(R.id.card_view_event_time)
             snoozedUntilText = itemView.find<TextView>(R.id.card_view_snoozed_until)
 
-            undoLayout = itemView.find<RelativeLayout?>(R.id.event_card_undo_layout)
+            undoLayout = itemView.find<ViewGroup?>(R.id.event_card_undo_layout)
 
-            compactViewContentLayout = itemView.find<RelativeLayout?>(R.id.compact_view_content_layout)
+            compactViewContentLayout = itemView.find<ViewGroup?>(R.id.compact_view_content_layout)
             compactViewCalendarColor = itemView.find<View?>(R.id.compact_view_calendar_color)
 
             calendarColor = ColorDrawable(0)
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsActivity.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsActivity.kt
index ebc22f217..ca4c39402 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsActivity.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsActivity.kt
@@ -1,6 +1,6 @@
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
@@ -117,7 +117,7 @@ class DismissedEventsActivity : AppCompatActivity(), DismissedEventListCallback
         when (item.itemId) {
             R.id.action_remove_all -> {
 
-                AlertDialog.Builder(this)
+                MaterialAlertDialogBuilder(this)
                         .setMessage(resources.getString(R.string.remove_all_confirmation))
                         .setCancelable(false)
                         .setPositiveButton(android.R.string.ok) {
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsFragment.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsFragment.kt
index 1e56f31fe..9f727f2e1 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsFragment.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/DismissedEventsFragment.kt
@@ -19,7 +19,7 @@
 
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -120,7 +120,7 @@ class DismissedEventsFragment : Fragment(), DismissedEventListCallback, Searchab
     
     private fun showRemoveAllConfirmation() {
         val ctx = context ?: return
-        AlertDialog.Builder(ctx)
+        MaterialAlertDialogBuilder(ctx)
             .setMessage(getString(R.string.remove_all_confirmation))
             .setCancelable(false)
             .setPositiveButton(android.R.string.ok) { _, _ ->
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/EditEventActivity.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/EditEventActivity.kt
index 478c6f90f..465aae4f6 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/EditEventActivity.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/EditEventActivity.kt
@@ -19,9 +19,10 @@
 
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
-import android.app.DatePickerDialog
-import android.app.TimePickerDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.timepicker.MaterialTimePicker
+import com.google.android.material.timepicker.TimeFormat
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
@@ -37,6 +38,7 @@ import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import com.google.android.material.snackbar.Snackbar
 import com.github.quarck.calnotify.Consts
 import com.github.quarck.calnotify.R
 import com.github.quarck.calnotify.Settings
@@ -338,7 +340,7 @@ open class EditEventActivity : AppCompatActivity() {
             originalEvent = CalendarProvider.getEvent(this, eventId)
 
             if (originalEvent == null) {
-                Toast.makeText(this, R.string.event_not_found, Toast.LENGTH_LONG).show()
+                Snackbar.make(findViewById(android.R.id.content), R.string.event_not_found, Snackbar.LENGTH_LONG).show()
                 finish()
                 return
             }
@@ -419,7 +421,7 @@ open class EditEventActivity : AppCompatActivity() {
 
             accountName.text = "" // remove debug mess
 
-            AlertDialog.Builder(this)
+            MaterialAlertDialogBuilder(this)
                     .setMessage(R.string.no_active_calendars)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
                         finish()
@@ -506,7 +508,7 @@ open class EditEventActivity : AppCompatActivity() {
 
             val cal = calendars.find { it.calendarId == eventToEdit.calendarId }
             if (cal == null) {
-                Toast.makeText(this, R.string.calendar_not_found, Toast.LENGTH_LONG).show()
+                Snackbar.make(findViewById(android.R.id.content), R.string.calendar_not_found, Snackbar.LENGTH_LONG).show()
                 finish()
                 return
             }
@@ -706,7 +708,7 @@ open class EditEventActivity : AppCompatActivity() {
     override fun onBackPressed() {
         if (anyChanges) {
 
-            AlertDialog.Builder(this)
+            MaterialAlertDialogBuilder(this)
                     .setMessage(R.string.discard_new_event)
                     .setCancelable(false)
                     .setPositiveButton(android.R.string.yes) {
@@ -735,7 +737,7 @@ open class EditEventActivity : AppCompatActivity() {
         if (originalEvent != null)
             return // not editable anymore
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         val adapter = ArrayAdapter<String>(this, R.layout.simple_list_item_medium)
 
@@ -816,21 +818,21 @@ open class EditEventActivity : AppCompatActivity() {
 
                 val nextReminder = calendarProvider.getNextEventReminderTime(this, eventId, startTime)
                 if (nextReminder != 0L) {
-                    Toast.makeText(
-                            this,
+                    Snackbar.make(
+                            findViewById(android.R.id.content),
                             resources.getString(R.string.event_was_created_reminder_at).format(dateToStr(this, nextReminder)),
-                            Toast.LENGTH_LONG
+                            Snackbar.LENGTH_LONG
                     ).show()
                 }
                 else {
-                    Toast.makeText(this, R.string.event_was_created, Toast.LENGTH_LONG).show()
+                    Snackbar.make(findViewById(android.R.id.content), R.string.event_was_created, Snackbar.LENGTH_LONG).show()
                 }
                 finish()
 
             } else {
                 DevLog.error(LOG_TAG, "Failed to create event")
 
-                AlertDialog.Builder(this)
+                MaterialAlertDialogBuilder(this)
                         .setMessage(R.string.new_event_failed_to_create_event)
                         .setPositiveButton(android.R.string.ok) { _, _ -> }
                         .show()
@@ -842,20 +844,20 @@ open class EditEventActivity : AppCompatActivity() {
             if (success) {
                 val nextReminder = calendarProvider.getNextEventReminderTime(this, eventToEdit.eventId, details.startTime)
                 if (nextReminder != 0L) {
-                    Toast.makeText(
-                            this,
+                    Snackbar.make(
+                            findViewById(android.R.id.content),
                             resources.getString(R.string.event_was_updated_next_reminder).format(dateToStr(this, nextReminder)),
-                            Toast.LENGTH_LONG
+                            Snackbar.LENGTH_LONG
                     ).show()
                 }
                 else {
-                    Toast.makeText(this, getString(R.string.event_was_updated), Toast.LENGTH_LONG).show()
+                    Snackbar.make(findViewById(android.R.id.content), getString(R.string.event_was_updated), Snackbar.LENGTH_LONG).show()
                 }
 
                 finish()
             }
             else {
-                Toast.makeText(this, R.string.failed_to_update_event_details, Toast.LENGTH_LONG).show()
+                Snackbar.make(findViewById(android.R.id.content), R.string.failed_to_update_event_details, Snackbar.LENGTH_LONG).show()
             }
         }
     }
@@ -879,126 +881,108 @@ open class EditEventActivity : AppCompatActivity() {
 
     @Suppress("UNUSED_PARAMETER")
     fun onDateFromClick(v: View) {
-
         val durationMinutes = (to.timeInMillis - from.timeInMillis) / Consts.MINUTE_IN_MILLISECONDS
 
-        val dialog = DatePickerDialog(
-                this,
-                {
-                    _, year, month, day ->
-
-                    from.year = year
-                    from.month = month
-                    from.dayOfMonth = day
+        val picker = MaterialDatePicker.Builder.datePicker()
+                .setTitleText(R.string.choose_date)
+                .setSelection(from.timeInMillis)
+                .build()
 
-                    to = DateTimeUtils.createCalendarTime(from.timeInMillis)
-                    to.addMinutes(durationMinutes.toInt())
+        picker.addOnPositiveButtonClickListener { selection ->
+            val cal = Calendar.getInstance()
+            cal.timeInMillis = selection
+            from.year = cal.get(Calendar.YEAR)
+            from.month = cal.get(Calendar.MONTH)
+            from.dayOfMonth = cal.get(Calendar.DAY_OF_MONTH)
 
-                    updateDateTimeUI()
-
-                },
-                from.year,
-                from.month,
-                from.dayOfMonth
-        )
+            to = DateTimeUtils.createCalendarTime(from.timeInMillis)
+            to.addMinutes(durationMinutes.toInt())
 
-        val firstDayOfWeek = Settings(this).firstDayOfWeek
-        if (firstDayOfWeek != -1) {
-            dialog.datePicker.firstDayOfWeek = firstDayOfWeek
+            updateDateTimeUI()
         }
 
-        dialog.show()
-        //builder.setIcon(R.drawable.ic_launcher)
+        picker.show(supportFragmentManager, "dateFromPicker")
     }
 
     @Suppress("UNUSED_PARAMETER")
     fun onTimeFromClick(v: View) {
-
         val durationMinutes = (to.timeInMillis - from.timeInMillis) / Consts.MINUTE_IN_MILLISECONDS
+        val is24Hour = android.text.format.DateFormat.is24HourFormat(this)
 
-        val dialog = TimePickerDialog(
-                this,
-                {
-                    _, hour, min ->
+        val picker = MaterialTimePicker.Builder()
+                .setTimeFormat(if (is24Hour) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H)
+                .setHour(from.hourOfDay)
+                .setMinute(from.minute)
+                .setTitleText(R.string.choose_time)
+                .build()
 
-                    from.hourOfDay = hour
-                    from.minute = min
+        picker.addOnPositiveButtonClickListener {
+            from.hourOfDay = picker.hour
+            from.minute = picker.minute
 
-                    to = DateTimeUtils.createCalendarTime(from.timeInMillis)
-                    to.addMinutes(durationMinutes.toInt())
+            to = DateTimeUtils.createCalendarTime(from.timeInMillis)
+            to.addMinutes(durationMinutes.toInt())
 
-                    updateDateTimeUI()
-                },
-                from.hourOfDay,
-                from.minute,
-                android.text.format.DateFormat.is24HourFormat(this)
-        )
+            updateDateTimeUI()
+        }
 
-        dialog.show()
+        picker.show(supportFragmentManager, "timeFromPicker")
     }
 
     @Suppress("UNUSED_PARAMETER")
     fun onDateToClick(v: View) {
-
         val durationMinutes = (to.timeInMillis - from.timeInMillis) / Consts.MINUTE_IN_MILLISECONDS
 
-        val dialog = DatePickerDialog(
-                this,
-                {
-                    _, year, month, day ->
-
-                    to.year = year
-                    to.month = month
-                    to.dayOfMonth = day
-
-                    if (to.before(from)) {
-                        Toast.makeText(this, getString(R.string.end_time_before_start_time), Toast.LENGTH_LONG).show()
-                        to = DateTimeUtils.createCalendarTime(from.timeInMillis)
-                        to.addMinutes(durationMinutes.toInt())
-                    }
-
-                    updateDateTimeUI()
+        val picker = MaterialDatePicker.Builder.datePicker()
+                .setTitleText(R.string.choose_date)
+                .setSelection(to.timeInMillis)
+                .build()
+
+        picker.addOnPositiveButtonClickListener { selection ->
+            val cal = Calendar.getInstance()
+            cal.timeInMillis = selection
+            to.year = cal.get(Calendar.YEAR)
+            to.month = cal.get(Calendar.MONTH)
+            to.dayOfMonth = cal.get(Calendar.DAY_OF_MONTH)
+
+            if (to.before(from)) {
+                Snackbar.make(findViewById(android.R.id.content), getString(R.string.end_time_before_start_time), Snackbar.LENGTH_LONG).show()
+                to = DateTimeUtils.createCalendarTime(from.timeInMillis)
+                to.addMinutes(durationMinutes.toInt())
+            }
 
-                },
-                to.year,
-                to.month,
-                to.dayOfMonth
-        )
-        val firstDayOfWeek = Settings(this).firstDayOfWeek
-        if (firstDayOfWeek != -1) {
-            dialog.datePicker.firstDayOfWeek = firstDayOfWeek
+            updateDateTimeUI()
         }
 
-        dialog.show()
+        picker.show(supportFragmentManager, "dateToPicker")
     }
 
     @Suppress("UNUSED_PARAMETER")
     fun onTimeToClick(v: View) {
-
         val durationMinutes = (to.timeInMillis - from.timeInMillis) / Consts.MINUTE_IN_MILLISECONDS
+        val is24Hour = android.text.format.DateFormat.is24HourFormat(this)
+
+        val picker = MaterialTimePicker.Builder()
+                .setTimeFormat(if (is24Hour) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H)
+                .setHour(to.hourOfDay)
+                .setMinute(to.minute)
+                .setTitleText(R.string.choose_time)
+                .build()
+
+        picker.addOnPositiveButtonClickListener {
+            to.hourOfDay = picker.hour
+            to.minute = picker.minute
+
+            if (to.before(from)) {
+                Snackbar.make(findViewById(android.R.id.content), getString(R.string.end_time_before_start_time), Snackbar.LENGTH_LONG).show()
+                to = DateTimeUtils.createCalendarTime(from.timeInMillis)
+                to.addMinutes(durationMinutes.toInt())
+            }
 
-        val dialog = TimePickerDialog(
-                this,
-                {
-                    _, hour, min ->
-
-                    to.hourOfDay = hour
-                    to.minute = min
-
-                    if (to.before(from)) {
-                        Toast.makeText(this, getString(R.string.end_time_before_start_time), Toast.LENGTH_LONG).show()
-                        to = DateTimeUtils.createCalendarTime(from.timeInMillis)
-                        to.addMinutes(durationMinutes.toInt())
-                    }
-
-                    updateDateTimeUI()
-                },
-                to.hourOfDay,
-                to.minute,
-                android.text.format.DateFormat.is24HourFormat(this)
-        )
+            updateDateTimeUI()
+        }
 
-        dialog.show()
+        picker.show(supportFragmentManager, "timeToPicker")
     }
 
     @Suppress("UNUSED_PARAMETER")
@@ -1024,7 +1008,7 @@ open class EditEventActivity : AppCompatActivity() {
 
         val isEmailCb = dialogView.find<CheckBox?>(R.id.checkbox_as_email)
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         builder.setView(dialogView)
 
@@ -1036,7 +1020,7 @@ open class EditEventActivity : AppCompatActivity() {
 
             if (intervalMilliseconds > Consts.NEW_EVENT_MAX_REMINDER_MILLISECONDS_BEFORE) {
                 intervalMilliseconds = Consts.NEW_EVENT_MAX_REMINDER_MILLISECONDS_BEFORE
-                Toast.makeText(this, R.string.new_event_max_reminder_is_28_days, Toast.LENGTH_LONG).show()
+                Snackbar.make(findViewById(android.R.id.content), R.string.new_event_max_reminder_is_28_days, Snackbar.LENGTH_LONG).show()
             }
 
             val reminder = EventReminderRecord(
@@ -1079,7 +1063,7 @@ open class EditEventActivity : AppCompatActivity() {
             return showAddReminderCustomDialog(currentReminder, existingReminderView)
         }
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         val adapter = ArrayAdapter<String>(this, R.layout.simple_list_item_medium)
 
@@ -1138,7 +1122,7 @@ open class EditEventActivity : AppCompatActivity() {
         timePicker.minuteCompat = min
 
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         builder.setView(dialogView)
 
@@ -1200,7 +1184,7 @@ open class EditEventActivity : AppCompatActivity() {
             return showAddReminderCustomAllDayDialog(currentReminder, existingReminderView)
         }
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         val adapter = ArrayAdapter<String>(this, R.layout.simple_list_item_medium)
 
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/EventListAdapter.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/EventListAdapter.kt
index 1677a24df..aaa350a9d 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/EventListAdapter.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/EventListAdapter.kt
@@ -78,7 +78,7 @@ class EventListAdapter(
         : RecyclerView.ViewHolder(itemView) {
         var eventId: Long = 0;
 
-        var eventHolder: RelativeLayout?
+        var eventHolder: View?
         var eventTitleText: TextView
         var eventDateText: TextView
         var eventTimeText: TextView
@@ -86,8 +86,8 @@ class EventListAdapter(
         var snoozedUntilText: TextView?
         val compactViewCalendarColor: View?
 
-        val compactViewContentLayout: RelativeLayout?
-        var undoLayout: RelativeLayout?
+        val compactViewContentLayout: ViewGroup?
+        var undoLayout: ViewGroup?
 
         var undoButton: Button?
 
@@ -100,16 +100,16 @@ class EventListAdapter(
         var calendarColor: ColorDrawable
 
         init {
-            eventHolder = itemView.find<RelativeLayout>(R.id.card_view_main_holder)
+            eventHolder = itemView.find<View>(R.id.card_view_main_holder)
             eventTitleText = itemView.findOrThrow<TextView>(R.id.card_view_event_name)
 
             eventDateText = itemView.findOrThrow<TextView>(R.id.card_view_event_date)
             eventTimeText = itemView.findOrThrow<TextView>(R.id.card_view_event_time)
             snoozedUntilText = itemView.find<TextView>(R.id.card_view_snoozed_until)
 
-            undoLayout = itemView.find<RelativeLayout?>(R.id.event_card_undo_layout)
+            undoLayout = itemView.find<ViewGroup?>(R.id.event_card_undo_layout)
 
-            compactViewContentLayout = itemView.find<RelativeLayout?>(R.id.compact_view_content_layout)
+            compactViewContentLayout = itemView.find<ViewGroup?>(R.id.compact_view_content_layout)
             compactViewCalendarColor = itemView.find<View?>(R.id.compact_view_calendar_color)
 
             undoButton = itemView.find<Button?>(R.id.card_view_button_undo)
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityBase.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityBase.kt
index bbc04dbce..8c35604e9 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityBase.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityBase.kt
@@ -20,7 +20,7 @@
 
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.database.SQLException
@@ -136,7 +136,7 @@ abstract class MainActivityBase : AppCompatActivity() {
 
         if (!hasPermissions) {
             if (PermissionsManager.shouldShowCalendarRationale(this)) {
-                AlertDialog.Builder(this)
+                MaterialAlertDialogBuilder(this)
                     .setMessage(R.string.application_has_no_access)
                     .setCancelable(false)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
@@ -157,7 +157,7 @@ abstract class MainActivityBase : AppCompatActivity() {
             // Check for power manager optimisations
             if (!settings.doNotShowBatteryOptimisationWarning &&
                 !powerManager.isIgnoringBatteryOptimizations(BuildConfig.APPLICATION_ID)) {
-                AlertDialog.Builder(this)
+                MaterialAlertDialogBuilder(this)
                     .setTitle(getString(R.string.battery_optimisation_title))
                     .setMessage(getString(R.string.battery_optimisation_details))
                     .setPositiveButton(getString(R.string.you_can_do_it)) { _, _ ->
@@ -183,7 +183,7 @@ abstract class MainActivityBase : AppCompatActivity() {
     protected fun checkNotificationPermission() {
         if (!PermissionsManager.hasNotificationPermission(this)) {
             if (PermissionsManager.shouldShowNotificationRationale(this)) {
-                AlertDialog.Builder(this)
+                MaterialAlertDialogBuilder(this)
                     .setTitle(R.string.notification_permission_title)
                     .setMessage(R.string.notification_permission_explanation)
                     .setCancelable(false)
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityLegacy.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityLegacy.kt
index 39b877c21..0556b0218 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityLegacy.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityLegacy.kt
@@ -20,7 +20,7 @@
 
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.app.SearchManager
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -406,7 +406,7 @@ class MainActivityLegacy : MainActivityBase(), EventListCallback {
     // === Bulk actions ===
 
     private fun onDismissAll() {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setMessage(R.string.dismiss_all_events_confirmation)
             .setCancelable(false)
             .setPositiveButton(android.R.string.yes) { _, _ ->
@@ -427,7 +427,7 @@ class MainActivityLegacy : MainActivityBase(), EventListCallback {
     }
 
     private fun onMuteAll() {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setMessage(R.string.mute_all_events_question)
             .setCancelable(false)
             .setPositiveButton(android.R.string.yes) { _, _ ->
@@ -450,7 +450,7 @@ class MainActivityLegacy : MainActivityBase(), EventListCallback {
             val intervalValues: IntArray = resources.getIntArray(R.array.custom_quiet_hours_interval_values)
             val intervalNames: Array<String> = resources.getStringArray(R.array.custom_quiet_hours_interval_names)
 
-            val builder = AlertDialog.Builder(this)
+            val builder = MaterialAlertDialogBuilder(this)
             val listAdapter = ArrayAdapter<String>(this, R.layout.simple_list_item_large)
 
             builder.setTitle(getString(R.string.start_quiet_hours_dialog_title))
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityModern.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityModern.kt
index e336a49a6..d078e9736 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityModern.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/MainActivityModern.kt
@@ -20,7 +20,7 @@
 
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.app.SearchManager
 import android.content.Context
 import android.content.Intent
@@ -29,8 +29,8 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.PopupMenu
-import android.widget.Toast
 import androidx.appcompat.widget.SearchView
+import com.google.android.material.snackbar.Snackbar
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -314,7 +314,7 @@ class MainActivityModern : MainActivityBase() {
                         hasFilter -> getString(R.string.snooze_all_no_events_filters)
                         else -> getString(R.string.snooze_all_no_events)
                     }
-                    Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+                    Snackbar.make(findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT).show()
                     return true
                 }
 
@@ -340,7 +340,7 @@ class MainActivityModern : MainActivityBase() {
     // === Bulk actions ===
 
     private fun onDismissAll() {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setMessage(R.string.dismiss_all_events_confirmation)
             .setCancelable(false)
             .setPositiveButton(android.R.string.yes) { _, _ ->
@@ -360,7 +360,7 @@ class MainActivityModern : MainActivityBase() {
     }
 
     private fun onMuteAll() {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setMessage(R.string.mute_all_events_question)
             .setCancelable(false)
             .setPositiveButton(android.R.string.yes) { _, _ ->
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/PreActionActivity.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/PreActionActivity.kt
index b80d90fa3..df4cf1608 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/PreActionActivity.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/PreActionActivity.kt
@@ -19,7 +19,7 @@
 
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -27,8 +27,8 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.PopupMenu
 import android.widget.TextView
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.snackbar.Snackbar
 import com.github.quarck.calnotify.Consts
 import com.github.quarck.calnotify.R
 import com.github.quarck.calnotify.Settings
@@ -291,7 +291,7 @@ class PreActionActivity : AppCompatActivity() {
         val intervalNames = resources.getStringArray(R.array.default_snooze_intervals)
         val intervalValues = resources.getIntArray(R.array.default_snooze_intervals_seconds_values)
         
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.for_a_custom_time)
             .setItems(intervalNames) { _, which ->
                 val intervalSeconds = intervalValues.getOrNull(which)?.toLong() ?: return@setItems
@@ -350,10 +350,10 @@ class PreActionActivity : AppCompatActivity() {
             
             runOnUiThread {
                 if (monitorSuccess && storageSuccess) {
-                    Toast.makeText(this, R.string.event_pre_snoozed, Toast.LENGTH_SHORT).show()
+                    Snackbar.make(findViewById(android.R.id.content), R.string.event_pre_snoozed, Snackbar.LENGTH_SHORT).show()
                     finish()
                 } else {
-                    Toast.makeText(this, R.string.error, Toast.LENGTH_SHORT).show()
+                    Snackbar.make(findViewById(android.R.id.content), R.string.error, Snackbar.LENGTH_SHORT).show()
                 }
             }
         }
@@ -407,9 +407,9 @@ class PreActionActivity : AppCompatActivity() {
                 if (newMutedState != null) {
                     updateMuteButton()
                     val msgRes = if (eventIsMuted) R.string.event_will_be_muted else R.string.event_unmuted
-                    Toast.makeText(this, msgRes, Toast.LENGTH_SHORT).show()
+                    Snackbar.make(findViewById(android.R.id.content), msgRes, Snackbar.LENGTH_SHORT).show()
                 } else {
-                    Toast.makeText(this, R.string.error, Toast.LENGTH_SHORT).show()
+                    Snackbar.make(findViewById(android.R.id.content), R.string.error, Snackbar.LENGTH_SHORT).show()
                 }
             }
         }
@@ -424,10 +424,10 @@ class PreActionActivity : AppCompatActivity() {
             
             runOnUiThread {
                 if (success) {
-                    Toast.makeText(this, R.string.event_pre_dismissed, Toast.LENGTH_SHORT).show()
+                    Snackbar.make(findViewById(android.R.id.content), R.string.event_pre_dismissed, Snackbar.LENGTH_SHORT).show()
                     finish()
                 } else {
-                    Toast.makeText(this, R.string.error, Toast.LENGTH_SHORT).show()
+                    Snackbar.make(findViewById(android.R.id.content), R.string.error, Snackbar.LENGTH_SHORT).show()
                 }
             }
         }
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/ReportABugActivity.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/ReportABugActivity.kt
index f4f6243b4..2d1b03cce 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/ReportABugActivity.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/ReportABugActivity.kt
@@ -26,8 +26,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.TextView
-import android.widget.Toast
 import com.github.quarck.calnotify.R
+import com.google.android.material.snackbar.Snackbar
 import com.github.quarck.calnotify.Settings
 import com.github.quarck.calnotify.logs.DevLog
 import com.github.quarck.calnotify.utils.find
@@ -137,7 +137,7 @@ class ReportABugActivity : AppCompatActivity() {
         if (++easterEggCount > 13) {
             if (clock.currentTimeMillis() - firstClick < 5000L) {
                 Settings(this).devModeEnabled = true
-                Toast.makeText(this, "Developer Mode Enabled", Toast.LENGTH_LONG).show()
+                Snackbar.make(findViewById(android.R.id.content), "Developer Mode Enabled", Snackbar.LENGTH_LONG).show()
             }
             else {
                 easterEggCount = 0;
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/SnoozeAllActivity.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/SnoozeAllActivity.kt
index 89e596f65..bc066d940 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/SnoozeAllActivity.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/SnoozeAllActivity.kt
@@ -20,7 +20,10 @@
 package com.github.quarck.calnotify.ui
 
 import android.annotation.SuppressLint
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.timepicker.MaterialTimePicker
+import com.google.android.material.timepicker.TimeFormat
 import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.drawable.ColorDrawable
@@ -99,8 +102,6 @@ open class SnoozeAllActivity : AppCompatActivity() {
 
     // These dialog controls moved here so saveInstanceState could store current time selection
     var customSnooze_TimeIntervalPickerController: TimeIntervalPickerController? = null
-    var snoozeUntil_DatePicker: DatePicker? = null
-    var snoozeUntil_TimePicker: TimePicker? = null
     private var searchQuery: String? = null
     private var filterState: FilterState? = null
     private var selectedEventKeys: Set<String>? = null  // For multi-select mode
@@ -318,7 +319,7 @@ open class SnoozeAllActivity : AppCompatActivity() {
     }
 
     private fun snoozeEvent(snoozeDelay: Long) {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
                 .setMessage(getConfirmationMessage())
                 .setCancelable(false)
                 .setPositiveButton(android.R.string.yes) {
@@ -411,51 +412,27 @@ open class SnoozeAllActivity : AppCompatActivity() {
             ViewEventActivityStateCode.CustomSnoozeOpened -> {
                 state.timeAMillis = customSnooze_TimeIntervalPickerController?.intervalMilliseconds ?: 0L
             }
-            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker -> {
-
-                val datePicker = snoozeUntil_DatePicker
-                if (datePicker != null) {
-                    datePicker.clearFocus()
-
-                    val date = Calendar.getInstance()
-                    date.set(datePicker.year, datePicker.month, datePicker.dayOfMonth, 0, 0, 0)
-                    state.timeAMillis = date.timeInMillis
-                    state.timeBMillis = 0L
-                }
-            }
+            // Material pickers handle their own state via FragmentManager
+            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker,
             ViewEventActivityStateCode.SnoozeUntilOpenedTimePicker -> {
-
-                val timePicker = snoozeUntil_TimePicker
-                if (timePicker != null) {
-                    timePicker.clearFocus()
-
-                    val time = Calendar.getInstance()
-                    time.timeInMillis = state.timeAMillis
-                    time.set(Calendar.HOUR_OF_DAY, timePicker.hour)
-                    time.set(Calendar.MINUTE, timePicker.minute)
-
-                    state.timeBMillis = time.timeInMillis
-                }
+                // No-op: MaterialDatePicker/MaterialTimePicker are DialogFragments
+                // and restore themselves automatically
             }
         }
-        // val intervalMilliseconds = customSnooze_TimeIntervalPickerController?.intervalMilliseconds ?: 0L
         state.toBundle(outState)
     }
 
     private fun restoreState(state: ViewEventActivityState) {
-
         when (state.state) {
             ViewEventActivityStateCode.Normal -> {
-
             }
             ViewEventActivityStateCode.CustomSnoozeOpened -> {
                 customSnoozeShowDialog(state.timeAMillis)
             }
-            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker -> {
-                snoozeUntilShowDatePickerDialog(state.timeAMillis, state.timeBMillis)
-            }
+            // Material pickers restore themselves via FragmentManager
+            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker,
             ViewEventActivityStateCode.SnoozeUntilOpenedTimePicker -> {
-                snoozeUntilShowTimePickerDialog(state.timeAMillis, state.timeBMillis)
+                // No-op: MaterialDatePicker/MaterialTimePicker restore automatically
             }
         }
     }
@@ -470,7 +447,7 @@ open class SnoozeAllActivity : AppCompatActivity() {
         val intervalNames: Array<String> = this.resources.getStringArray(R.array.default_snooze_intervals)
         val intervalValues = this.resources.getIntArray(R.array.default_snooze_intervals_seconds_values)
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         val adapter = ArrayAdapter<String>(this, R.layout.simple_list_item_medium)
 
@@ -504,7 +481,7 @@ open class SnoozeAllActivity : AppCompatActivity() {
         state.state = ViewEventActivityStateCode.CustomSnoozeOpened
         customSnooze_TimeIntervalPickerController = timeIntervalPicker
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         builder.setView(dialogView)
 
@@ -532,106 +509,35 @@ open class SnoozeAllActivity : AppCompatActivity() {
 
     @Suppress("unused", "UNUSED_PARAMETER")
     fun OnButtonSnoozeUntilClick(v: View?) {
-        val currentlySnoozedUntil = 0L
-        snoozeUntilShowDatePickerDialog(currentlySnoozedUntil, currentlySnoozedUntil)
-    }
-
-    fun inflateDatePickerDialog() = layoutInflater?.inflate(R.layout.dialog_date_picker, null)
-
-    fun inflateTimePickerDialog() = layoutInflater?.inflate(R.layout.dialog_time_picker, null)
-
-    @SuppressLint("NewApi")
-    fun snoozeUntilShowDatePickerDialog(initialValueForDate: Long, initialValueForTime: Long) {
-
-        val dialogDate = inflateDatePickerDialog() ?: return
-
-        val datePicker = dialogDate.findOrThrow<DatePicker>(R.id.datePickerCustomSnooze)
-
-        state.state = ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker
-        snoozeUntil_DatePicker = datePicker
-
-        val firstDayOfWeek = Settings(this).firstDayOfWeek
-        if (firstDayOfWeek != -1)
-            snoozeUntil_DatePicker?.firstDayOfWeek = firstDayOfWeek
-
-        if (initialValueForDate != 0L) {
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = initialValueForDate
-
-            val year = cal.get(Calendar.YEAR)
-            val month = cal.get(Calendar.MONTH)
-            val day = cal.get(Calendar.DAY_OF_MONTH)
-
-            snoozeUntil_DatePicker?.updateDate(year, month, day)
-        }
-
-        val builder = AlertDialog.Builder(this)
-
-        builder.setView(dialogDate)
-
-        builder.setPositiveButton(R.string.next) {
-            _: DialogInterface?, _: Int ->
-
-            datePicker.clearFocus()
-
-            val date = Calendar.getInstance()
-            date.set(datePicker.year, datePicker.month, datePicker.dayOfMonth, 0, 0, 0)
-
-            snoozeUntilShowTimePickerDialog(date.timeInMillis, initialValueForTime)
-        }
-
-        builder.setNegativeButton(R.string.cancel) {
-            _: DialogInterface?, _: Int ->
+        val initialDate = clock.currentTimeMillis()
+        
+        val datePicker = MaterialDatePicker.Builder.datePicker()
+                .setTitleText(R.string.choose_date)
+                .setSelection(initialDate)
+                .build()
 
-            state.state = ViewEventActivityStateCode.Normal
-            snoozeUntil_DatePicker = null
+        datePicker.addOnPositiveButtonClickListener { dateSelection ->
+            showSnoozeUntilTimePicker(dateSelection)
         }
 
-        builder.create().show()
-
+        datePicker.show(supportFragmentManager, "snoozeUntilDatePicker")
     }
 
-    fun snoozeUntilShowTimePickerDialog(currentDateSelection: Long, initialTimeValue: Long) {
-
-        val date = Calendar.getInstance()
-        date.timeInMillis = currentDateSelection
-
-        val dialogTime = inflateTimePickerDialog() ?: return
-
-        val timePicker: TimePicker = dialogTime.findOrThrow<TimePicker>(R.id.timePickerCustomSnooze)
-        timePicker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(this))
-
-        state.state = ViewEventActivityStateCode.SnoozeUntilOpenedTimePicker
-        state.timeAMillis = currentDateSelection
-        snoozeUntil_TimePicker = timePicker
-        snoozeUntil_DatePicker = null
-
-        if (initialTimeValue != 0L) {
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = initialTimeValue
-
-            timePicker.hour = cal.get(Calendar.HOUR_OF_DAY)
-            timePicker.minute = cal.get(Calendar.MINUTE)
-        }
-
-        val title = dialogTime.findOrThrow<TextView>(R.id.textViewSnoozeUntilDate)
-        title.text =
-                String.format(
-                        resources.getString(R.string.choose_time),
-                        DateUtils.formatDateTime(this, date.timeInMillis, DateUtils.FORMAT_SHOW_DATE))
-
-        val builder = AlertDialog.Builder(this)
-        builder.setView(dialogTime)
-        builder.setPositiveButton(R.string.snooze) {
-            _: DialogInterface?, _: Int ->
-
-            state.state = ViewEventActivityStateCode.Normal
-            snoozeUntil_TimePicker = null
-
-            timePicker.clearFocus()
+    private fun showSnoozeUntilTimePicker(dateSelection: Long) {
+        val is24Hour = android.text.format.DateFormat.is24HourFormat(this)
+        val cal = Calendar.getInstance()
 
-            // grab time from timePicker + date picker
+        val timePicker = MaterialTimePicker.Builder()
+                .setTimeFormat(if (is24Hour) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H)
+                .setHour(cal.get(Calendar.HOUR_OF_DAY))
+                .setMinute(cal.get(Calendar.MINUTE))
+                .setTitleText(getString(R.string.choose_time) + " - " + 
+                        DateUtils.formatDateTime(this, dateSelection, DateUtils.FORMAT_SHOW_DATE))
+                .build()
 
+        timePicker.addOnPositiveButtonClickListener {
+            val date = Calendar.getInstance()
+            date.timeInMillis = dateSelection
             date.set(Calendar.HOUR_OF_DAY, timePicker.hour)
             date.set(Calendar.MINUTE, timePicker.minute)
 
@@ -639,28 +545,15 @@ open class SnoozeAllActivity : AppCompatActivity() {
 
             if (snoozeFor > 0L) {
                 snoozeEvent(snoozeFor)
-            }
-            else {
-                // Selected time is in the past
-                AlertDialog.Builder(this)
+            } else {
+                MaterialAlertDialogBuilder(this)
                         .setTitle(R.string.selected_time_is_in_the_past)
-                        .setNegativeButton(R.string.cancel) {
-                            _: DialogInterface?, _: Int ->
-                        }
-                        .create()
+                        .setNegativeButton(R.string.cancel, null)
                         .show()
             }
-
-        }
-
-        builder.setNegativeButton(R.string.cancel) {
-            _: DialogInterface?, _: Int ->
-
-            state.state = ViewEventActivityStateCode.Normal
-            snoozeUntil_TimePicker = null
         }
 
-        builder.create().show()
+        timePicker.show(supportFragmentManager, "snoozeUntilTimePicker")
     }
 
     @Suppress("unused", "UNUSED_PARAMETER")
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/TimeIntervalPickerController.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/TimeIntervalPickerController.kt
index 9fdd9a644..00626c14d 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/TimeIntervalPickerController.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/TimeIntervalPickerController.kt
@@ -20,11 +20,10 @@
 package com.github.quarck.calnotify.ui
 
 import android.view.View
-import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
 import android.widget.NumberPicker
-import android.widget.Spinner
 import android.widget.TextView
-import android.widget.*
 import com.github.quarck.calnotify.Consts
 import com.github.quarck.calnotify.R
 import com.github.quarck.calnotify.utils.find
@@ -35,7 +34,7 @@ class TimeIntervalPickerController(
         titleId: Int?,
         val maxIntervalMilliseconds: Long, // 0 by default
         val allowSubMinuteIntervals: Boolean // false by default
-) : AdapterView.OnItemSelectedListener {
+) {
 
     var SecondsIndex = -1
     var MinutesIndex = 0
@@ -43,34 +42,36 @@ class TimeIntervalPickerController(
     var DaysIndex = 2
 
     var numberPicker: NumberPicker
-    var timeUnitsSpinners: Spinner
+    var timeUnitsDropdown: AutoCompleteTextView
+    private var selectedPosition: Int = 0
+    private lateinit var timeUnitsArray: Array<String>
 
     init {
         numberPicker = view.findOrThrow<NumberPicker>(R.id.numberPickerTimeInterval)
-        timeUnitsSpinners = view.findOrThrow<Spinner>(R.id.spinnerTimeIntervalUnit)
+        timeUnitsDropdown = view.findOrThrow<AutoCompleteTextView>(R.id.spinnerTimeIntervalUnit)
 
         if (allowSubMinuteIntervals) {
-            timeUnitsSpinners.adapter =
-                    ArrayAdapter(
-                            view.context,
-                            android.R.layout.simple_list_item_1,
-                            view.context.resources.getStringArray(R.array.time_units_plurals_with_seconds)
-                    )
+            timeUnitsArray = view.context.resources.getStringArray(R.array.time_units_plurals_with_seconds)
             SecondsIndex += 1
             MinutesIndex += 1
             HoursIndex += 1
             DaysIndex += 1
         }
         else {
-            timeUnitsSpinners.adapter =
-                    ArrayAdapter(
-                            view.context,
-                            android.R.layout.simple_list_item_1,
-                            view.context.resources.getStringArray(R.array.time_units_plurals)
-                    )
+            timeUnitsArray = view.context.resources.getStringArray(R.array.time_units_plurals)
         }
 
-        timeUnitsSpinners.onItemSelectedListener = this
+        val adapter = ArrayAdapter(
+                view.context,
+                android.R.layout.simple_dropdown_item_1line,
+                timeUnitsArray
+        )
+        timeUnitsDropdown.setAdapter(adapter)
+
+        timeUnitsDropdown.setOnItemClickListener { _, _, position, _ ->
+            selectedPosition = position
+            onItemSelected(position)
+        }
 
         val label: TextView? = view.find<TextView>(R.id.textViewTimeIntervalTitle)
         if (titleId != null)
@@ -78,22 +79,26 @@ class TimeIntervalPickerController(
         else
             label?.visibility = View.GONE
 
-        timeUnitsSpinners.setSelection(MinutesIndex)
-
-        timeUnitsSpinners.onItemSelectedListener = this
+        setSelection(MinutesIndex)
 
         numberPicker.minValue = 1
         numberPicker.maxValue = 100
     }
 
+    private fun setSelection(position: Int) {
+        selectedPosition = position
+        if (position >= 0 && position < timeUnitsArray.size) {
+            timeUnitsDropdown.setText(timeUnitsArray[position], false)
+        }
+    }
+
     fun clearFocus() {
         numberPicker.clearFocus()
-        timeUnitsSpinners.clearFocus()
+        timeUnitsDropdown.clearFocus()
     }
 
 
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-
+    private fun onItemSelected(position: Int) {
         if (maxIntervalMilliseconds == 0L) {
             if (position == SecondsIndex) {
                 numberPicker.minValue = 15
@@ -107,7 +112,7 @@ class TimeIntervalPickerController(
 
 
         val maxValue =
-            when (timeUnitsSpinners.selectedItemPosition) {
+            when (selectedPosition) {
                 SecondsIndex ->
                     maxIntervalMilliseconds / 1000L
                 MinutesIndex ->
@@ -123,10 +128,6 @@ class TimeIntervalPickerController(
         numberPicker.maxValue = Math.min(maxValue.toInt(), 100)
     }
 
-    override fun onNothingSelected(parent: AdapterView<*>) {
-
-    }
-
     var intervalSeconds: Int
         get() {
             clearFocus()
@@ -134,7 +135,7 @@ class TimeIntervalPickerController(
             val number = numberPicker.value
 
             val multiplier =
-                    when (timeUnitsSpinners.selectedItemPosition) {
+                    when (selectedPosition) {
                         SecondsIndex ->
                             1
                         MinutesIndex ->
@@ -170,7 +171,7 @@ class TimeIntervalPickerController(
                     number /= 24 // to days
                 }
 
-                timeUnitsSpinners.setSelection(units)
+                setSelection(units)
                 numberPicker.value = number.toInt()
 
             }
@@ -188,7 +189,7 @@ class TimeIntervalPickerController(
                     number /= 24 // to days
                 }
 
-                timeUnitsSpinners.setSelection(units)
+                setSelection(units)
                 numberPicker.value = number.toInt()
             }
         }
diff --git a/android/app/src/main/java/com/github/quarck/calnotify/ui/ViewEventActivityNoRecents.kt b/android/app/src/main/java/com/github/quarck/calnotify/ui/ViewEventActivityNoRecents.kt
index e87fc94f9..2b7e08d27 100644
--- a/android/app/src/main/java/com/github/quarck/calnotify/ui/ViewEventActivityNoRecents.kt
+++ b/android/app/src/main/java/com/github/quarck/calnotify/ui/ViewEventActivityNoRecents.kt
@@ -20,7 +20,10 @@
 
 package com.github.quarck.calnotify.ui
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.timepicker.MaterialTimePicker
+import com.google.android.material.timepicker.TimeFormat
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
@@ -32,6 +35,7 @@ import androidx.appcompat.widget.Toolbar
 import android.text.format.DateUtils
 import android.view.View
 import android.widget.*
+import com.google.android.material.snackbar.Snackbar
 import com.github.quarck.calnotify.app.*
 import com.github.quarck.calnotify.calendar.*
 import com.github.quarck.calnotify.dismissedeventsstorage.EventDismissType
@@ -149,8 +153,6 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
 
     // These dialog controls moved here so saveInstanceState could store current time selection
     var customSnooze_TimeIntervalPickerController: TimeIntervalPickerController? = null
-    var snoozeUntil_DatePicker: DatePicker? = null
-    var snoozeUntil_TimePicker: TimePicker? = null
 
     lateinit var calendarNameTextView: TextView
     lateinit var calendarAccountTextView: TextView
@@ -455,7 +457,7 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
 
                 R.id.action_delete_event -> {
 
-                    AlertDialog.Builder(this)
+                    MaterialAlertDialogBuilder(this)
                             .setMessage(getString(R.string.delete_event_question))
                             .setCancelable(false)
                             .setPositiveButton(android.R.string.yes) { _, _ ->
@@ -501,7 +503,7 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
                 R.id.action_unsnooze_to_upcoming -> {
                     val success = ApplicationController.unsnoozeToUpcoming(this, event)
                     if (success) {
-                        Toast.makeText(this, R.string.event_restored_to_upcoming, Toast.LENGTH_SHORT).show()
+                        Snackbar.make(findViewById(android.R.id.content), R.string.event_restored_to_upcoming, Snackbar.LENGTH_SHORT).show()
                     }
                     finish()
                     true
@@ -572,7 +574,7 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
     private fun openEventInCalendar(event: EventAlertRecord) {
         val found = CalendarIntents.viewCalendarEventWithFallback(this, calendarProvider, event)
         if (!found) {
-            Toast.makeText(this, R.string.event_not_found_opening_calendar_at_time, Toast.LENGTH_LONG).show()
+            Snackbar.make(findViewById(android.R.id.content), R.string.event_not_found_opening_calendar_at_time, Snackbar.LENGTH_LONG).show()
         }
     }
 
@@ -608,51 +610,27 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
             ViewEventActivityStateCode.CustomSnoozeOpened -> {
                 state.timeAMillis = customSnooze_TimeIntervalPickerController?.intervalMilliseconds ?: 0L
             }
-            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker -> {
-
-                val datePicker = snoozeUntil_DatePicker
-                if (datePicker != null) {
-                    datePicker.clearFocus()
-
-                    val date = Calendar.getInstance()
-                    date.set(datePicker.year, datePicker.month, datePicker.dayOfMonth, 0, 0, 0)
-                    state.timeAMillis = date.timeInMillis
-                    state.timeBMillis = event?.snoozedUntil ?: 0L
-                }
-            }
+            // Material pickers handle their own state via FragmentManager
+            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker,
             ViewEventActivityStateCode.SnoozeUntilOpenedTimePicker -> {
-
-                val timePicker = snoozeUntil_TimePicker
-                if (timePicker != null) {
-                    timePicker.clearFocus()
-
-                    val time = Calendar.getInstance()
-                    time.timeInMillis = state.timeAMillis
-                    time.set(Calendar.HOUR_OF_DAY, timePicker.hourCompat)
-                    time.set(Calendar.MINUTE, timePicker.minuteCompat)
-
-                    state.timeBMillis = time.timeInMillis
-                }
+                // No-op: MaterialDatePicker/MaterialTimePicker are DialogFragments
+                // and restore themselves automatically
             }
         }
-        // val intervalMilliseconds = customSnooze_TimeIntervalPickerController?.intervalMilliseconds ?: 0L
         state.toBundle(outState)
     }
 
     private fun restoreState(state: ViewEventActivityState) {
-
         when (state.state) {
             ViewEventActivityStateCode.Normal -> {
-
             }
             ViewEventActivityStateCode.CustomSnoozeOpened -> {
                 customSnoozeShowDialog(state.timeAMillis)
             }
-            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker -> {
-                snoozeUntilShowDatePickerDialog(state.timeAMillis, state.timeBMillis)
-            }
+            // Material pickers restore themselves via FragmentManager
+            ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker,
             ViewEventActivityStateCode.SnoozeUntilOpenedTimePicker -> {
-                snoozeUntilShowTimePickerDialog(state.timeAMillis, state.timeBMillis)
+                // No-op: MaterialDatePicker/MaterialTimePicker restore automatically
             }
         }
     }
@@ -667,7 +645,7 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
         val intervalNames: Array<String> = this.resources.getStringArray(R.array.default_snooze_intervals)
         val intervalValues = this.resources.getIntArray(R.array.default_snooze_intervals_seconds_values)
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         val adapter = ArrayAdapter<String>(this, R.layout.simple_list_item_medium)
 
@@ -701,7 +679,7 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
         state.state = ViewEventActivityStateCode.CustomSnoozeOpened
         customSnooze_TimeIntervalPickerController = timeIntervalPicker
 
-        val builder = AlertDialog.Builder(this)
+        val builder = MaterialAlertDialogBuilder(this)
 
         builder.setView(dialogView)
 
@@ -729,134 +707,55 @@ open class ViewEventActivityNoRecents : AppCompatActivity() {
 
     @Suppress("unused", "UNUSED_PARAMETER")
     fun OnButtonSnoozeUntilClick(v: View?) {
-        snoozeUntilShowDatePickerDialog(event.snoozedUntil, event.snoozedUntil)
-    }
-
-    fun inflateDatePickerDialog() = layoutInflater?.inflate(R.layout.dialog_date_picker, null)
-
-    fun inflateTimePickerDialog() = layoutInflater?.inflate(R.layout.dialog_time_picker, null)
-
-    fun snoozeUntilShowDatePickerDialog(initialValueForDate: Long, initialValueForTime: Long) {
-
-        val dialogDate = inflateDatePickerDialog() ?: return
-
-        val datePicker = dialogDate.findOrThrow<DatePicker>(R.id.datePickerCustomSnooze)
-
-        state.state = ViewEventActivityStateCode.SnoozeUntilOpenedDatePicker
-        snoozeUntil_DatePicker = datePicker
-
-        val firstDayOfWeek = Settings(this).firstDayOfWeek
-        if (firstDayOfWeek != -1) {
-            snoozeUntil_DatePicker?.firstDayOfWeek = firstDayOfWeek
-        }
-
-        if (initialValueForDate != 0L) {
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = initialValueForDate
-
-            val year = cal.get(Calendar.YEAR)
-            val month = cal.get(Calendar.MONTH)
-            val day = cal.get(Calendar.DAY_OF_MONTH)
-
-            snoozeUntil_DatePicker?.updateDate(year, month, day)
-        }
-
-        val builder = AlertDialog.Builder(this)
-
-        builder.setView(dialogDate)
-
-        builder.setPositiveButton(R.string.next) {
-            _: DialogInterface?, _: Int ->
-
-            datePicker.clearFocus()
-
-            val date = Calendar.getInstance()
-            date.set(datePicker.year, datePicker.month, datePicker.dayOfMonth, 0, 0, 0)
-
-            snoozeUntilShowTimePickerDialog(date.timeInMillis, initialValueForTime)
-        }
-
-        builder.setNegativeButton(R.string.cancel) {
-            _: DialogInterface?, _: Int ->
+        val initialDate = if (event.snoozedUntil != 0L) event.snoozedUntil else clock.currentTimeMillis()
+        
+        val datePicker = MaterialDatePicker.Builder.datePicker()
+                .setTitleText(R.string.choose_date)
+                .setSelection(initialDate)
+                .build()
 
-            state.state = ViewEventActivityStateCode.Normal
-            snoozeUntil_DatePicker = null
+        datePicker.addOnPositiveButtonClickListener { dateSelection ->
+            showSnoozeUntilTimePicker(dateSelection, initialDate)
         }
 
-        builder.create().show()
-
+        datePicker.show(supportFragmentManager, "snoozeUntilDatePicker")
     }
 
-    fun snoozeUntilShowTimePickerDialog(currentDateSelection: Long, initialTimeValue: Long) {
-
-        val date = Calendar.getInstance()
-        date.timeInMillis = currentDateSelection
-
-        val dialogTime = inflateTimePickerDialog() ?: return
-
-        val timePicker: TimePicker = dialogTime.findOrThrow<TimePicker>(R.id.timePickerCustomSnooze)
-        timePicker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(this))
-
-        state.state = ViewEventActivityStateCode.SnoozeUntilOpenedTimePicker
-        state.timeAMillis = currentDateSelection
-        snoozeUntil_TimePicker = timePicker
-        snoozeUntil_DatePicker = null
-
+    private fun showSnoozeUntilTimePicker(dateSelection: Long, initialTimeValue: Long) {
+        val is24Hour = android.text.format.DateFormat.is24HourFormat(this)
+        
+        val cal = Calendar.getInstance()
         if (initialTimeValue != 0L) {
-            val cal = Calendar.getInstance()
             cal.timeInMillis = initialTimeValue
-
-            timePicker.hourCompat = cal.get(Calendar.HOUR_OF_DAY)
-            timePicker.minuteCompat = cal.get(Calendar.MINUTE)
         }
 
-        val title = dialogTime.findOrThrow<TextView>(R.id.textViewSnoozeUntilDate)
-        title.text =
-                String.format(
-                        resources.getString(R.string.choose_time),
-                        DateUtils.formatDateTime(this, date.timeInMillis, DateUtils.FORMAT_SHOW_DATE))
-
-        val builder = AlertDialog.Builder(this)
-        builder.setView(dialogTime)
-        builder.setPositiveButton(R.string.snooze) {
-            _: DialogInterface?, _: Int ->
+        val timePicker = MaterialTimePicker.Builder()
+                .setTimeFormat(if (is24Hour) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H)
+                .setHour(cal.get(Calendar.HOUR_OF_DAY))
+                .setMinute(cal.get(Calendar.MINUTE))
+                .setTitleText(getString(R.string.choose_time) + " - " + 
+                        DateUtils.formatDateTime(this, dateSelection, DateUtils.FORMAT_SHOW_DATE))
+                .build()
 
-            state.state = ViewEventActivityStateCode.Normal
-            snoozeUntil_TimePicker = null
-
-            timePicker.clearFocus()
-
-            // grab time from timePicker + date picker
-
-            date.set(Calendar.HOUR_OF_DAY, timePicker.hourCompat)
-            date.set(Calendar.MINUTE, timePicker.minuteCompat)
+        timePicker.addOnPositiveButtonClickListener {
+            val date = Calendar.getInstance()
+            date.timeInMillis = dateSelection
+            date.set(Calendar.HOUR_OF_DAY, timePicker.hour)
+            date.set(Calendar.MINUTE, timePicker.minute)
 
             val snoozeFor = date.timeInMillis - clock.currentTimeMillis() + Consts.ALARM_THRESHOLD
 
             if (snoozeFor > 0L) {
                 snoozeEvent(snoozeFor)
-            }
-            else {
-                // Selected time is in the past
-                AlertDialog.Builder(this)
+            } else {
+                MaterialAlertDialogBuilder(this)
                         .setTitle(R.string.selected_time_is_in_the_past)
-                        .setNegativeButton(R.string.cancel) {
-                            _: DialogInterface?, _: Int ->
-                        }
-                        .create()
+                        .setNegativeButton(R.string.cancel, null)
                         .show()
             }
-
-        }
-
-        builder.setNegativeButton(R.string.cancel) {
-            _: DialogInterface?, _: Int ->
-
-            state.state = ViewEventActivityStateCode.Normal
-            snoozeUntil_TimePicker = null
         }
 
-        builder.create().show()
+        timePicker.show(supportFragmentManager, "snoozeUntilTimePicker")
     }
 
     fun reschedule(addTime: Long) {
diff --git a/android/app/src/main/res/drawable/calendar_color_indicator.xml b/android/app/src/main/res/drawable/calendar_color_indicator.xml
new file mode 100644
index 000000000..e48396367
--- /dev/null
+++ b/android/app/src/main/res/drawable/calendar_color_indicator.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/cal_sample_primary" />
+    <corners android:radius="2dp" />
+</shape>
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index c1569dcd7..783ac0070 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -17,34 +17,28 @@
         android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:background="@color/app_bar_background"
+        android:fitsSystemWindows="true"
+        app:elevation="0dp"
+        app:liftOnScroll="true">
 
-        <!-- Status bar spacer - pinned, doesn't scroll, height set programmatically -->
-        <View
-            android:id="@+id/status_bar_spacer"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="?attr/colorPrimary" />
-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|enterAlways"
+            app:layout_scrollFlags="scroll|enterAlways|snap"
             app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:titleTextAppearance="@style/ToolbarTitle"
-            android:elevation="@dimen/toolbar_elevation"
-            tools:targetApi="m" />
+            app:titleTextAppearance="?attr/textAppearanceTitleLarge"
+            app:titleTextColor="@color/app_bar_on_background"
+            app:navigationIconTint="@color/app_bar_on_background" />
 
-        <!-- Filter chips row - horizontally scrollable, collapses on scroll -->
+        <!-- Filter chips row - horizontally scrollable -->
         <HorizontalScrollView
             android:id="@+id/filter_chips_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scrollbars="none"
-            android:background="?attr/colorPrimary"
+            android:background="@color/app_bar_background"
             app:layout_scrollFlags="scroll|enterAlways|snap">
 
             <com.google.android.material.chip.ChipGroup
@@ -54,7 +48,7 @@
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
                 android:paddingTop="4dp"
-                android:paddingBottom="8dp"
+                android:paddingBottom="12dp"
                 app:singleLine="true"
                 app:chipSpacingHorizontal="8dp" />
 
@@ -76,21 +70,21 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="64dp"
-        android:src="@drawable/ic_add_white_24dp"
-        android:elevation="@dimen/toolbar_elevation"
-        app:backgroundTint="@color/fab_background"
+        android:layout_marginBottom="72dp"
+        android:contentDescription="@string/add_event"
+        app:srcCompat="@drawable/ic_add_white_24dp"
+        app:tint="?attr/colorOnPrimaryContainer"
+        app:backgroundTint="?attr/colorPrimaryContainer"
         app:fabSize="normal"
         app:layout_anchor="@id/bottom_navigation"
-        app:layout_anchorGravity="top|end"
-        tools:targetApi="m" />
+        app:layout_anchorGravity="top|end" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="?android:attr/colorBackground"
+        style="@style/Widget.Material3.BottomNavigationView"
         app:labelVisibilityMode="unlabeled"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:menu="@menu/bottom_nav_menu" />
diff --git a/android/app/src/main/res/layout/activity_main_legacy.xml b/android/app/src/main/res/layout/activity_main_legacy.xml
index f9a27262f..bdb2cb614 100644
--- a/android/app/src/main/res/layout/activity_main_legacy.xml
+++ b/android/app/src/main/res/layout/activity_main_legacy.xml
@@ -17,43 +17,34 @@
         android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:background="@color/app_bar_background"
+        android:fitsSystemWindows="true"
+        app:elevation="0dp"
+        app:liftOnScroll="true">
 
-        <!-- Status bar spacer - height set programmatically -->
-        <View
-            android:id="@+id/status_bar_spacer"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="?attr/colorPrimary" />
-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:titleTextAppearance="@style/ToolbarTitle"
-            android:elevation="@dimen/toolbar_elevation"
-            tools:targetApi="m"
-            />
+            app:titleTextAppearance="?attr/textAppearanceTitleLarge"
+            app:titleTextColor="@color/app_bar_on_background"
+            app:navigationIconTint="@color/app_bar_on_background" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:src="@drawable/ic_add_white_24dp"
         android:id="@+id/action_btn_add_event"
-        app:fabSize="normal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|right|end"
         android:layout_margin="16dp"
-        android:visibility="visible"
-        android:elevation="@dimen/toolbar_elevation"
-        app:backgroundTint="@color/fab_background"
-        tools:targetApi="m"
-        />
+        android:contentDescription="@string/add_event"
+        app:srcCompat="@drawable/ic_add_white_24dp"
+        app:tint="?attr/colorOnPrimaryContainer"
+        app:backgroundTint="?attr/colorPrimaryContainer"
+        app:fabSize="normal" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/android/app/src/main/res/layout/activity_pre_action.xml b/android/app/src/main/res/layout/activity_pre_action.xml
index 7bde41afc..e14dbc131 100644
--- a/android/app/src/main/res/layout/activity_pre_action.xml
+++ b/android/app/src/main/res/layout/activity_pre_action.xml
@@ -143,10 +143,9 @@
 
             </RelativeLayout>
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/divider" />
+                android:layout_height="wrap_content" />
 
             <!-- Snooze Section -->
             <LinearLayout
@@ -210,10 +209,9 @@
 
             </LinearLayout>
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/divider" />
+                android:layout_height="wrap_content" />
 
             <!-- Actions Section -->
             <LinearLayout
diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 92afc5f22..27ecef11e 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -135,12 +135,9 @@
                 android:textColor="@color/primary_text"
                 android:focusable="true" />
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:background="@color/divider_light"
-                android:padding="0dp"
-                />
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/activity_view.xml b/android/app/src/main/res/layout/activity_view.xml
index 6b8f0794f..6621eb164 100644
--- a/android/app/src/main/res/layout/activity_view.xml
+++ b/android/app/src/main/res/layout/activity_view.xml
@@ -332,11 +332,9 @@
 
 
 
-                <View
+                <com.google.android.material.divider.MaterialDivider
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/divider"
-                    android:padding="0dp" />
+                    android:layout_height="wrap_content" />
 
                 <TextView
                     android:layout_width="match_parent"
@@ -764,13 +762,10 @@
                         android:textColor="@color/primary_text" />
                 </RelativeLayout>
 
-                <View
+                <com.google.android.material.divider.MaterialDivider
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/divider"
-                    android:id="@+id/snooze_view_inter_view_divider"
-                    android:padding="0dp"
-                    />
+                    android:layout_height="wrap_content"
+                    android:id="@+id/snooze_view_inter_view_divider" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/bluetooth_device_view.xml b/android/app/src/main/res/layout/bluetooth_device_view.xml
index c355816f9..80da69a56 100644
--- a/android/app/src/main/res/layout/bluetooth_device_view.xml
+++ b/android/app/src/main/res/layout/bluetooth_device_view.xml
@@ -8,7 +8,7 @@
     android:id="@+id/linearLayoutBluetoothDeviceListEntry"
     >
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/android/app/src/main/res/layout/bottom_sheet_calendar_filter.xml b/android/app/src/main/res/layout/bottom_sheet_calendar_filter.xml
index a113cb0c8..69dd2bf9a 100644
--- a/android/app/src/main/res/layout/bottom_sheet_calendar_filter.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_calendar_filter.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -13,18 +14,22 @@
         android:textStyle="bold"
         android:paddingBottom="8dp" />
 
-    <EditText
-        android:id="@+id/search_calendars"
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/calendar_filter_search_hint"
-        android:inputType="text"
-        android:imeOptions="actionSearch"
-        android:drawableStart="@android:drawable/ic_menu_search"
-        android:drawablePadding="8dp"
-        android:padding="12dp"
-        android:background="@android:drawable/editbox_background"
-        android:layout_marginBottom="8dp" />
+        android:layout_marginBottom="8dp"
+        app:startIconDrawable="@android:drawable/ic_menu_search">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/search_calendars"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/calendar_filter_search_hint"
+            android:inputType="text"
+            android:imeOptions="actionSearch" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
     <TextView
         android:id="@+id/showing_count"
@@ -35,7 +40,7 @@
         android:paddingBottom="8dp"
         android:visibility="gone" />
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox_all_calendars"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -43,10 +48,9 @@
         android:padding="12dp"
         android:textStyle="bold" />
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/listDivider"
+        android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp" />
 
diff --git a/android/app/src/main/res/layout/bottom_sheet_time_filter.xml b/android/app/src/main/res/layout/bottom_sheet_time_filter.xml
index cc5b346d5..e300823cd 100644
--- a/android/app/src/main/res/layout/bottom_sheet_time_filter.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_time_filter.xml
@@ -18,35 +18,35 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/radio_all"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/filter_time_all"
             android:padding="12dp" />
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/radio_started_today"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/filter_time_started_today"
             android:padding="12dp" />
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/radio_started_this_week"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/filter_time_started_this_week"
             android:padding="12dp" />
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/radio_past"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/filter_time_past"
             android:padding="12dp" />
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/radio_started_this_month"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/calendar_view.xml b/android/app/src/main/res/layout/calendar_view.xml
index 18094f5bb..b40e04282 100644
--- a/android/app/src/main/res/layout/calendar_view.xml
+++ b/android/app/src/main/res/layout/calendar_view.xml
@@ -37,7 +37,7 @@
             android:layout_marginTop="1dp"
             android:layout_marginBottom="1dp"/>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/android/app/src/main/res/layout/content_add_event.xml b/android/app/src/main/res/layout/content_add_event.xml
index ec198f43b..fcef84a6f 100644
--- a/android/app/src/main/res/layout/content_add_event.xml
+++ b/android/app/src/main/res/layout/content_add_event.xml
@@ -232,12 +232,9 @@
         </RelativeLayout>
 
         <!-- HR -->
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider"
-            android:padding="0dp"
-            />
+            android:layout_height="wrap_content" />
 
         <!-- Date / time -->
         <RelativeLayout
@@ -261,7 +258,7 @@
                 android:importantForAccessibility="no"
                 />
 
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/switch_all_day"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -346,12 +343,9 @@
         </RelativeLayout>
 
         <!-- HR -->
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider"
-            android:padding="0dp"
-            />
+            android:layout_height="wrap_content" />
 
 
         <!-- Location -->
@@ -398,12 +392,9 @@
         </RelativeLayout>
 
         <!-- HR -->
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider"
-            android:padding="0dp"
-            />
+            android:layout_height="wrap_content" />
 
         <!-- notification -->
 
@@ -482,12 +473,9 @@
         </RelativeLayout>
 
         <!-- HR -->
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider"
-            android:padding="0dp"
-            />
+            android:layout_height="wrap_content" />
 
 
         <!-- Note -->
diff --git a/android/app/src/main/res/layout/content_main.xml b/android/app/src/main/res/layout/content_main.xml
index 8a9f9ff20..318f0ccda 100644
--- a/android/app/src/main/res/layout/content_main.xml
+++ b/android/app/src/main/res/layout/content_main.xml
@@ -18,9 +18,7 @@
         android:visibility="visible"
         android:orientation="vertical">
 
-        <androidx.cardview.widget.CardView
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/activity_main_new_style_message_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -28,9 +26,9 @@
             android:layout_marginRight="2dp"
             android:layout_marginTop="0dp"
             android:layout_marginBottom="2dp"
-            card_view:cardCornerRadius="4dp"
-            card_view:cardElevation="4dp"
-            card_view:cardBackgroundColor="@color/ultra_light_divider"
+            app:cardCornerRadius="12dp"
+            app:cardElevation="4dp"
+            app:cardBackgroundColor="@color/ultra_light_divider"
             android:visibility="gone"
             >
 
@@ -138,7 +136,7 @@
 
             </LinearLayout>
 
-        </androidx.cardview.widget.CardView>
+        </com.google.android.material.card.MaterialCardView>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -150,11 +148,9 @@
             tools:targetApi="m"
             >
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/divider"
-                />
+                android:layout_height="wrap_content" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -181,11 +177,9 @@
             tools:targetApi="m"
             >
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/divider"
-                />
+                android:layout_height="wrap_content" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -214,11 +208,9 @@
             tools:targetApi="m"
             >
 
-            <View
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/divider"
-                />
+                android:layout_height="wrap_content" />
 
             <Button
                 android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/dialog_add_event_allday_notification.xml b/android/app/src/main/res/layout/dialog_add_event_allday_notification.xml
index a48dd4448..50f922945 100644
--- a/android/app/src/main/res/layout/dialog_add_event_allday_notification.xml
+++ b/android/app/src/main/res/layout/dialog_add_event_allday_notification.xml
@@ -69,7 +69,7 @@
         />
 
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox_as_email"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/dialog_add_event_notification.xml b/android/app/src/main/res/layout/dialog_add_event_notification.xml
index c53fa1c1b..36ad8de56 100644
--- a/android/app/src/main/res/layout/dialog_add_event_notification.xml
+++ b/android/app/src/main/res/layout/dialog_add_event_notification.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -30,6 +31,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:layout_gravity="center_horizontal">
 
         <NumberPicker
@@ -40,19 +42,26 @@
             android:layout_gravity="center"
             />
 
-        <Spinner
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/spinnerTimeIntervalUnit"
             android:layout_gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:entries="@array/time_units_plurals"
-            />
+            android:layout_marginStart="8dp">
+
+            <AutoCompleteTextView
+                android:id="@+id/spinnerTimeIntervalUnit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="none"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox_as_email"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/dialog_color_picker.xml b/android/app/src/main/res/layout/dialog_color_picker.xml
index 2a9e8d7f6..5603bd8ec 100644
--- a/android/app/src/main/res/layout/dialog_color_picker.xml
+++ b/android/app/src/main/res/layout/dialog_color_picker.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|center_vertical"
@@ -14,10 +14,9 @@
         android:padding="16dp"
         >
 
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider" />
+            android:layout_height="wrap_content" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -90,10 +89,9 @@
 
         </LinearLayout>
 
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider" />
+            android:layout_height="wrap_content" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -170,10 +168,9 @@
 
         </LinearLayout>
 
-        <View
+        <com.google.android.material.divider.MaterialDivider
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider" />
+            android:layout_height="wrap_content" />
 
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/dialog_date_picker.xml b/android/app/src/main/res/layout/dialog_date_picker.xml
deleted file mode 100644
index 17699b2bb..000000000
--- a/android/app/src/main/res/layout/dialog_date_picker.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/choose_date"
-            android:id="@+id/textViewSnoozeUntilDate"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:paddingLeft="30dp"
-            android:paddingStart="30dp"
-            android:paddingRight="10dp"
-            android:paddingEnd="10dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textStyle="bold"
-            android:textColor="@color/secondary_text"
-            />
-
-
-        <DatePicker
-            android:id="@+id/datePickerCustomSnooze"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:calendarViewShown="false"
-            android:spinnersShown="true"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:padding="@dimen/date_time_picker_padding"
-            />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/dialog_date_picker_halo_light.xml b/android/app/src/main/res/layout/dialog_date_picker_halo_light.xml
deleted file mode 100644
index d87270565..000000000
--- a/android/app/src/main/res/layout/dialog_date_picker_halo_light.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/choose_date"
-            android:id="@+id/textViewSnoozeUntilDate"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:paddingLeft="30dp"
-            android:paddingStart="30dp"
-            android:paddingRight="10dp"
-            android:paddingEnd="10dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textStyle="bold"
-            android:textColor="@color/secondary_text"
-            />
-
-        <DatePicker
-            android:id="@+id/datePickerCustomSnooze"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:calendarViewShown="false"
-            android:spinnersShown="true"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:padding="@dimen/date_time_picker_padding"
-            android:theme="@android:style/Theme.Holo.Light"
-            />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/dialog_date_time_picker.xml b/android/app/src/main/res/layout/dialog_date_time_picker.xml
deleted file mode 100644
index 29a01fafe..000000000
--- a/android/app/src/main/res/layout/dialog_date_time_picker.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/snooze_until_string"
-            android:id="@+id/textViewSnoozeUntilDate"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:padding="@dimen/date_time_picker_padding"
-            />
-
-
-        <DatePicker
-            android:id="@+id/datePickerCustomSnooze"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:calendarViewShown="false"
-            android:spinnersShown="true"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:padding="@dimen/date_time_picker_padding"
-            />
-
-        <TimePicker
-            android:id="@+id/timePickerCustomSnooze"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:padding="@dimen/date_time_picker_padding"
-            />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/dialog_default_manual_all_day_notification.xml b/android/app/src/main/res/layout/dialog_default_manual_all_day_notification.xml
index 916e0d012..3a6327874 100644
--- a/android/app/src/main/res/layout/dialog_default_manual_all_day_notification.xml
+++ b/android/app/src/main/res/layout/dialog_default_manual_all_day_notification.xml
@@ -30,7 +30,7 @@
             android:paddingBottom="5dp"
             >
 
-            <RadioButton
+            <com.google.android.material.radiobutton.MaterialRadioButton
                 android:id="@+id/radio_button_day_before"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="wrap_content"
@@ -41,7 +41,7 @@
                 android:paddingBottom="15dp"
                 />
 
-            <RadioButton
+            <com.google.android.material.radiobutton.MaterialRadioButton
                 android:id="@+id/radio_button_day_of_event"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/dialog_default_manual_notification.xml b/android/app/src/main/res/layout/dialog_default_manual_notification.xml
index 0c4d2065f..a2bd50997 100644
--- a/android/app/src/main/res/layout/dialog_default_manual_notification.xml
+++ b/android/app/src/main/res/layout/dialog_default_manual_notification.xml
@@ -2,6 +2,7 @@
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:theme="@style/AppTheme.NoActionBar"
@@ -21,6 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:gravity="center_vertical"
             android:layout_gravity="center_horizontal">
 
             <NumberPicker
@@ -31,14 +33,21 @@
                 android:layout_gravity="center"
                 />
 
-            <Spinner
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/spinnerTimeIntervalUnit"
                 android:layout_gravity="center"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:entries="@array/time_units_plurals"
-                />
+                android:layout_marginStart="8dp">
+
+                <AutoCompleteTextView
+                    android:id="@+id/spinnerTimeIntervalUnit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:inputType="none"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/dialog_interval_picker.xml b/android/app/src/main/res/layout/dialog_interval_picker.xml
index f6e43a120..bf0fbcf12 100644
--- a/android/app/src/main/res/layout/dialog_interval_picker.xml
+++ b/android/app/src/main/res/layout/dialog_interval_picker.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -32,6 +33,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:layout_gravity="center_horizontal">
 
         <NumberPicker
@@ -42,15 +44,21 @@
             android:layout_gravity="center"
             />
 
-        <Spinner
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/spinnerTimeIntervalUnit"
             android:layout_gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_marginStart="8dp">
 
-            />
-        <!-- android:entries="@array/time_units_plurals" -->
+            <AutoCompleteTextView
+                android:id="@+id/spinnerTimeIntervalUnit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="none"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/dialog_reminder_interval_configuration.xml b/android/app/src/main/res/layout/dialog_reminder_interval_configuration.xml
index e1013a28c..4f0ce2c82 100644
--- a/android/app/src/main/res/layout/dialog_reminder_interval_configuration.xml
+++ b/android/app/src/main/res/layout/dialog_reminder_interval_configuration.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,7 +10,7 @@
     android:theme="@style/PickerDialogTheme"
     >
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox_custom_reminder_pattern"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -27,6 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:layout_gravity="center_horizontal"
         >
 
@@ -38,16 +40,21 @@
             android:layout_gravity="center"
             />
 
-        <Spinner
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/spinnerTimeIntervalUnit"
             android:layout_gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_marginStart="8dp">
 
-            />
+            <AutoCompleteTextView
+                android:id="@+id/spinnerTimeIntervalUnit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="none"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <!-- android:entries="@array/time_units_plurals" -->
+        </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/dialog_time_picker.xml b/android/app/src/main/res/layout/dialog_time_picker.xml
deleted file mode 100644
index 6829e17b6..000000000
--- a/android/app/src/main/res/layout/dialog_time_picker.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/choose_time"
-            android:id="@+id/textViewSnoozeUntilDate"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:paddingLeft="30dp"
-            android:paddingStart="30dp"
-            android:paddingRight="10dp"
-            android:paddingEnd="10dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textStyle="bold"
-            android:textColor="@color/secondary_text"
-            />
-
-        <TimePicker
-            android:id="@+id/timePickerCustomSnooze"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:padding="@dimen/date_time_picker_padding"
-            />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/dialog_time_picker_halo_light.xml b/android/app/src/main/res/layout/dialog_time_picker_halo_light.xml
deleted file mode 100644
index f0e507a46..000000000
--- a/android/app/src/main/res/layout/dialog_time_picker_halo_light.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/choose_time"
-            android:id="@+id/textViewSnoozeUntilDate"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:paddingLeft="30dp"
-            android:paddingStart="30dp"
-            android:paddingRight="10dp"
-            android:paddingEnd="10dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textStyle="bold"
-            android:textColor="@color/secondary_text"
-            />
-
-        <TimePicker
-            android:id="@+id/timePickerCustomSnooze"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/date_time_picker_margin"
-            android:padding="@dimen/date_time_picker_padding"
-            android:theme="@android:style/Theme.Holo.Light"
-            />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/event_card_compact.xml b/android/app/src/main/res/layout/event_card_compact.xml
index 918bb64ee..04d2b59af 100644
--- a/android/app/src/main/res/layout/event_card_compact.xml
+++ b/android/app/src/main/res/layout/event_card_compact.xml
@@ -1,244 +1,216 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
+<com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_view_main_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="@dimen/compact_view_layout_height"
-    android:background="@color/cardview_light_background"
+    android:layout_marginHorizontal="8dp"
+    android:layout_marginTop="2dp"
+    android:layout_marginBottom="2dp"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="0dp"
+    app:strokeWidth="0dp"
+    style="@style/Widget.Material3.CardView.Filled"
     >
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/compact_view_layout_height"
-        android:id="@+id/compact_view_content_layout"
-        >
-        
-        <CheckBox
-            android:id="@+id/selection_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="4dp"
-            android:layout_marginLeft="4dp"
-            android:visibility="gone"
-            android:clickable="false"
-            android:focusable="false"/>
+        android:layout_height="wrap_content">
 
-        <View
-            android:id="@+id/compact_view_calendar_color"
-            android:layout_width="10dp"
-            android:layout_height="match_parent"
-            android:background="@color/cal_sample_primary"
-            android:layout_toEndOf="@id/selection_checkbox"
-            android:layout_toRightOf="@id/selection_checkbox"
-            android:layout_marginLeft="2dp"
-            android:layout_marginStart="2dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginTop="1.5dp"
-            android:layout_marginBottom="0.5dp"/>
-
-        <TextView
-            android:id="@+id/card_view_event_name"
+        <!-- Main content -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/compact_view_content_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="left"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/primary_text"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:layout_marginLeft="@dimen/compact_view_left_margin"
-            android:layout_marginStart="@dimen/compact_view_left_margin"
-            android:layout_marginRight="@dimen/compact_view_right_margin"
-            android:layout_marginEnd="@dimen/compact_view_right_margin"
-
-            android:layout_marginTop="7dp"
-            android:layout_marginBottom="2dp"
-
-            android:text="@string/event_title_example"
-
-            android:layout_toEndOf="@id/compact_view_calendar_color"
-            android:layout_toRightOf="@id/compact_view_calendar_color"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/card_view_event_date"
-            android:text="@string/event_time_example"
-            android:textAppearance="?android:textAppearanceSmall"
-            android:textColor="@color/secondary_text"
-            android:layout_below="@id/card_view_event_name"
-
-            android:layout_marginLeft="@dimen/compact_view_left_margin"
-            android:layout_marginStart="@dimen/compact_view_left_margin"
-            android:layout_marginRight="@dimen/compact_view_right_margin"
-            android:layout_marginEnd="@dimen/compact_view_right_margin"
-            android:layout_marginTop="1dp"
-            android:layout_marginBottom="3dp"
-
-            android:layout_toEndOf="@id/compact_view_calendar_color"
-            android:layout_toRightOf="@id/compact_view_calendar_color"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/card_view_event_time"
-            android:text=""
-            android:textAppearance="?android:textAppearanceSmall"
-            android:textColor="@color/secondary_text"
-
-            android:layout_marginLeft="@dimen/compact_view_left_margin"
-            android:layout_marginStart="@dimen/compact_view_left_margin"
-            android:layout_marginRight="@dimen/compact_view_right_margin"
-            android:layout_marginEnd="@dimen/compact_view_right_margin"
-            android:layout_marginTop="1dp"
-            android:layout_marginBottom="1dp"
-
-            android:layout_below="@id/card_view_event_date"
-            android:layout_toEndOf="@id/compact_view_calendar_color"
-            android:layout_toRightOf="@id/compact_view_calendar_color"
-            />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/card_view_snoozed_until"
-            android:text="@string/snoozed_until_example"
-            android:textAppearance="?android:textAppearanceSmall"
-            android:textColor="@color/snoozed_until_text"
-
-            android:layout_below="@id/card_view_event_date"
-            android:layout_toEndOf="@id/compact_view_calendar_color"
-
-            android:layout_marginStart="@dimen/compact_view_left_margin"
-            android:layout_marginEnd="@dimen/compact_view_right_margin"
-            android:layout_marginTop="1dp"
-            android:layout_marginBottom="1dp"
-
-            />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/card_view_event_date"
-            android:layout_alignParentEnd="true"
-            android:orientation="horizontal"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="4dp"
+            android:minHeight="56dp"
+            android:paddingVertical="8dp"
+            android:paddingEnd="16dp"
+            android:paddingStart="4dp"
+            android:background="?attr/selectableItemBackground"
             >
 
-            <ImageView
-                android:id="@+id/imageview_is_muted_indicator"
+            <!-- Selection checkbox (hidden by default) -->
+            <com.google.android.material.checkbox.MaterialCheckBox
+                android:id="@+id/selection_checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                card_view:srcCompat="@drawable/ic_volume_off_black_24dp"
-                card_view:tint="@color/primary_text"
-                android:contentDescription="@string/notification_is_muted"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="0dp"
-                android:padding="0dp"
                 android:visibility="gone"
-                android:scaleX="0.75"
-                android:scaleY="0.75"
+                android:clickable="false"
+                android:focusable="false"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 />
 
-            <ImageView
-                android:id="@+id/imageview_is_task_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                card_view:srcCompat="@drawable/ic_event_available_black_24dp"
-                card_view:tint="@color/primary_text"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="0dp"
-                android:padding="0dp"
-                android:visibility="gone"
-                android:importantForAccessibility="no"
-                android:scaleX="0.75"
-                android:scaleY="0.75"
+            <!-- Calendar color indicator - rounded pill -->
+            <View
+                android:id="@+id/compact_view_calendar_color"
+                android:layout_width="4dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginVertical="2dp"
+                android:background="@drawable/calendar_color_indicator"
+                app:layout_constraintStart_toEndOf="@id/selection_checkbox"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 />
 
-            <ImageView
-                android:id="@+id/imageview_is_alarm_indicator"
-                android:layout_width="wrap_content"
+            <!-- Event title -->
+            <TextView
+                android:id="@+id/card_view_event_name"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="0dp"
-                android:layout_marginTop="0dp"
-                android:importantForAccessibility="no"
-                android:padding="0dp"
-                android:scaleX="0.75"
-                android:scaleY="0.75"
-                android:visibility="gone"
-                card_view:srcCompat="@drawable/ic_alarm_black_24dp"
-                card_view:tint="@color/primary_text"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="8dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="@string/event_title_example"
+                android:textAppearance="?attr/textAppearanceBodyLarge"
+                android:textColor="?attr/colorOnSurface"
+                app:layout_constraintEnd_toStartOf="@id/indicators_container"
+                app:layout_constraintStart_toEndOf="@id/compact_view_calendar_color"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/card_view_event_date"
+                app:layout_constraintVertical_chainStyle="packed"
                 />
 
+            <!-- Event date/time -->
+            <TextView
+                android:id="@+id/card_view_event_date"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginTop="2dp"
+                android:text="@string/event_time_example"
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                app:layout_constraintEnd_toStartOf="@id/indicators_container"
+                app:layout_constraintStart_toEndOf="@id/compact_view_calendar_color"
+                app:layout_constraintTop_toBottomOf="@id/card_view_event_name"
+                app:layout_constraintBottom_toTopOf="@id/card_view_event_time"
+                />
 
-        </LinearLayout>
-
-
-    </RelativeLayout>
+            <!-- Secondary time info (optional) -->
+            <TextView
+                android:id="@+id/card_view_event_time"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="8dp"
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:visibility="gone"
+                app:layout_constraintEnd_toStartOf="@id/indicators_container"
+                app:layout_constraintStart_toEndOf="@id/compact_view_calendar_color"
+                app:layout_constraintTop_toBottomOf="@id/card_view_event_date"
+                app:layout_constraintBottom_toTopOf="@id/card_view_snoozed_until"
+                tools:visibility="gone"
+                />
 
-    <RelativeLayout
-        android:id="@+id/event_card_undo_layout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/compact_view_layout_height"
-        android:background="@color/material_red"
-        android:visibility="gone"
-        >
+            <!-- Snoozed until info -->
+            <TextView
+                android:id="@+id/card_view_snoozed_until"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginTop="2dp"
+                android:text="@string/snoozed_until_example"
+                android:textAppearance="?attr/textAppearanceLabelSmall"
+                android:textColor="@color/snoozed_until_text"
+                android:visibility="gone"
+                app:layout_constraintEnd_toStartOf="@id/indicators_container"
+                app:layout_constraintStart_toEndOf="@id/compact_view_calendar_color"
+                app:layout_constraintTop_toBottomOf="@id/card_view_event_time"
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:visibility="visible"
+                />
 
-        <TextView
+            <!-- Indicator icons container -->
+            <LinearLayout
+                android:id="@+id/indicators_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                >
+
+                <ImageView
+                    android:id="@+id/imageview_is_muted_indicator"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginEnd="4dp"
+                    android:contentDescription="@string/notification_is_muted"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_volume_off_black_24dp"
+                    app:tint="?attr/colorOnSurfaceVariant"
+                    />
+
+                <ImageView
+                    android:id="@+id/imageview_is_task_indicator"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginEnd="4dp"
+                    android:importantForAccessibility="no"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_event_available_black_24dp"
+                    app:tint="?attr/colorOnSurfaceVariant"
+                    />
+
+                <ImageView
+                    android:id="@+id/imageview_is_alarm_indicator"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:importantForAccessibility="no"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_alarm_black_24dp"
+                    app:tint="?attr/colorOnSurfaceVariant"
+                    />
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <!-- Undo overlay (shown after dismiss) -->
+        <LinearLayout
+            android:id="@+id/event_card_undo_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/dismissed"
-            android:textAppearance="?android:textAppearanceMedium"
-            android:textColor="@color/icons"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="25dp"
-            android:layout_marginStart="25dp"
-            />
-
-        <Button
-            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="@string/undo"
-            android:id="@+id/card_view_button_undo"
-            android:visibility="visible"
-            android:textColor="@color/icons"
-            android:textAppearance="?android:textAppearanceMedium"
-            android:background="?android:attr/selectableItemBackground"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:textStyle="bold"
-
-            android:paddingStart="18dp"
-            android:paddingLeft="18dp"
-            android:paddingEnd="16dp"
-            android:paddingRight="16dp"
-            />
-
-    </RelativeLayout>
+            android:minHeight="56dp"
+            android:background="@color/material_red"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="16dp"
+            android:visibility="gone"
+            >
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.25dp"
-        android:background="@color/light_divider"
-        android:layout_alignParentBottom="true"/>
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/dismissed"
+                android:textAppearance="?attr/textAppearanceTitleMedium"
+                android:textColor="@android:color/white"
+                />
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/card_view_button_undo"
+                style="@style/Widget.Material3.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/undo"
+                android:textColor="@android:color/white"
+                app:rippleColor="@color/white_alpha_50"
+                />
 
-</RelativeLayout>
+        </LinearLayout>
 
+    </FrameLayout>
 
+</com.google.android.material.card.MaterialCardView>
diff --git a/android/app/src/main/res/layout/fragment_event_list.xml b/android/app/src/main/res/layout/fragment_event_list.xml
index 008ed4b66..d13abc977 100644
--- a/android/app/src/main/res/layout/fragment_event_list.xml
+++ b/android/app/src/main/res/layout/fragment_event_list.xml
@@ -23,14 +23,14 @@
         android:elevation="4dp"
         tools:visibility="visible">
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_close_selection"
+            style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:src="@drawable/ic_clear_white_24dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/cancel_selection"
-            app:tint="@android:color/white" />
+            app:icon="@drawable/ic_clear_white_24dp"
+            app:iconTint="@android:color/white"
+            android:contentDescription="@string/cancel_selection" />
 
         <TextView
             android:id="@+id/selection_count_text"
@@ -76,14 +76,14 @@
             android:textColor="@android:color/white"
             android:textSize="14sp" />
 
-        <ImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/new_ui_banner_dismiss"
+            style="@style/Widget.Material3.Button.IconButton"
             android:layout_width="32dp"
             android:layout_height="32dp"
-            android:src="@drawable/ic_clear_white_24dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/dismiss"
-            app:tint="@android:color/white" />
+            app:icon="@drawable/ic_clear_white_24dp"
+            app:iconTint="@android:color/white"
+            android:contentDescription="@string/dismiss" />
 
     </LinearLayout>
 
@@ -126,24 +126,21 @@
         android:id="@+id/selection_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/cardview_light_background"
+        android:background="?attr/colorSurface"
         android:elevation="8dp"
         android:visibility="gone"
         android:gravity="center"
         android:padding="16dp"
         tools:visibility="visible">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_snooze_selected"
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@string/snooze_selected"
-            android:textSize="16sp"
-            android:textAllCaps="true"
-            android:backgroundTint="@color/primary"
-            android:textColor="@android:color/white" />
+            android:textSize="16sp" />
 
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/item_calendar_filter.xml b/android/app/src/main/res/layout/item_calendar_filter.xml
index 8e361cb72..e8ed33c52 100644
--- a/android/app/src/main/res/layout/item_calendar_filter.xml
+++ b/android/app/src/main/res/layout/item_calendar_filter.xml
@@ -12,7 +12,7 @@
         android:layout_height="16dp"
         android:layout_marginEnd="12dp" />
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox_calendar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/pref_header.xml b/android/app/src/main/res/layout/pref_header.xml
index 27929ac68..ed058ec79 100644
--- a/android/app/src/main/res/layout/pref_header.xml
+++ b/android/app/src/main/res/layout/pref_header.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/divider_light"
-        android:padding="0dp"
-        />
+        android:layout_height="wrap_content" />
 
     <TextView
         android:id="@+id/pref_header_generic_text"
@@ -25,11 +23,8 @@
         android:textStyle="bold"
         tools:ignore="HardcodedText" />
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/divider_light"
-        android:padding="0dp"
-        />
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/pref_notification_behavior.xml b/android/app/src/main/res/layout/pref_notification_behavior.xml
index 1953d55a8..81d40d198 100644
--- a/android/app/src/main/res/layout/pref_notification_behavior.xml
+++ b/android/app/src/main/res/layout/pref_notification_behavior.xml
@@ -31,19 +31,19 @@
         android:paddingTop="0dp"
         >
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/pref_notification_swipe_dismiss"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/notificaiton_swipe_dismisses_the_event" />
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/pref_notification_swipe_snoozes"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/notificaiton_swipe_snoozes_the_event" />
 
-        <RadioButton
+        <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/pref_notification_swipe_disallowed"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/pref_separator.xml b/android/app/src/main/res/layout/pref_separator.xml
index bdbea119b..80fe0c585 100644
--- a/android/app/src/main/res/layout/pref_separator.xml
+++ b/android/app/src/main/res/layout/pref_separator.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <View
-    android:layout_width="match_parent"
-    android:layout_height="0.5dp"
-    android:background="@color/divider_light"
-    android:padding="0dp"
-    />
+    <com.google.android.material.divider.MaterialDivider
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/pref_switch_with_text.xml b/android/app/src/main/res/layout/pref_switch_with_text.xml
index fec9f70b7..ccc4267e1 100644
--- a/android/app/src/main/res/layout/pref_switch_with_text.xml
+++ b/android/app/src/main/res/layout/pref_switch_with_text.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <Switch
+    <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/pref_switch_generic"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/red_notice.xml b/android/app/src/main/res/layout/red_notice.xml
index cc4553f69..ff22844c4 100644
--- a/android/app/src/main/res/layout/red_notice.xml
+++ b/android/app/src/main/res/layout/red_notice.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/divider_light"
-        android:padding="0dp"
-        />
+        android:layout_height="wrap_content" />
 
     <TextView
         android:id="@+id/red_notice_text"
@@ -25,11 +23,8 @@
         android:textStyle="bold"
         tools:ignore="HardcodedText" />
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/divider_light"
-        android:padding="0dp"
-        />
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index a176e6356..a67065d9c 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -47,6 +47,10 @@
 
     <!-- FAB color (lighter for dark mode) -->
     <color name="fab_background">#5C6BC0</color>
+    
+    <!-- App bar colors (use surface color in dark mode for M3 look) -->
+    <color name="app_bar_background">#1E1E1E</color>
+    <color name="app_bar_on_background">#E1E1E1</color>
 
 </resources>
 
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 15e33162a..5861586f3 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -2,10 +2,10 @@
     <!-- Dark mode specific style overrides -->
     
     <!-- Use dark popup overlay in dark mode -->
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark"></style>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.Material3.Dark"></style>
     
-    <!-- Bottom sheet dark mode - uses dark cardview background (#1E1E1E) -->
-    <style name="AppTheme.BottomSheet" parent="Widget.MaterialComponents.BottomSheet.Modal">
+    <!-- Bottom sheet dark mode - uses dark surface color (#1E1E1E) -->
+    <style name="AppTheme.BottomSheet" parent="Widget.Material3.BottomSheet.Modal">
         <item name="backgroundTint">@color/cardview_light_background</item>
     </style>
     
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index d40b7f082..cca3fb546 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -49,10 +49,17 @@
 
     <color name="material_red">#c3362b</color>
     <color name="material_blue">#3f51b8</color>
+    
+    <!-- Alpha colors for ripples -->
+    <color name="white_alpha_50">#80FFFFFF</color>
 
     <color name="cal_sample_primary">#03A9F4</color>
 
     <color name="fab_background">#134093</color>
+    
+    <!-- App bar colors (keep original teal in day mode) -->
+    <color name="app_bar_background">@color/primary</color>
+    <color name="app_bar_on_background">@color/icons</color>
 
     <color name="quiet_hours_active_text">#FFC107</color>
     <color name="quiet_hours_active_background">#212121</color>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index b890deb87..ae678ebd5 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -293,6 +293,7 @@
     <string name="add_location">Add location</string>
     <string name="add_note">Add note</string>
     <string name="add_notification">Add notification</string>
+    <string name="add_event">Add event</string>
     <string name="all_day">All day</string>
     <string name="end_time_before_start_time">End time before start time!</string>
     <string name="notification_as_email">As Email</string>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cf252e278..079ba5be8 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,20 +1,35 @@
 <resources>
 
-    <!-- Base application theme with DayNight support for system theme following -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <!-- Customize your theme here. -->
+    <!-- Base application theme with Material 3 DayNight for automatic dark mode -->
+    <style name="AppTheme" parent="Theme.Material3.DayNight">
+        <!-- Primary brand colors -->
         <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="android:windowBackground">@color/background</item>
+        <item name="colorOnPrimary">@color/icons</item>
+        <item name="colorPrimaryContainer">@color/primary_light</item>
+        <item name="colorOnPrimaryContainer">@color/primary_dark</item>
+        
+        <!-- Secondary/accent colors -->
+        <item name="colorSecondary">@color/accent</item>
+        <item name="colorOnSecondary">@color/icons</item>
+        
+        <!-- Surface colors -->
+        <item name="colorSurface">@color/cardview_light_background</item>
+        <item name="colorOnSurface">@color/primary_text</item>
+        <item name="colorSurfaceVariant">@color/background</item>
+        <item name="colorOnSurfaceVariant">@color/secondary_text</item>
+        
+        <!-- Background -->
         <item name="android:colorBackground">@color/background</item>
+        <item name="android:windowBackground">@color/background</item>
+        
         <!-- Preference list styling -->
         <item name="android:listViewStyle">@style/AppListView</item>
+        
         <!-- Bottom sheet dialog theme for proper theming -->
         <item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog</item>
     </style>
     
-    <style name="AppListView" parent="Widget.AppCompat.ListView">
+    <style name="AppListView" parent="android:Widget.ListView">
         <item name="android:background">@color/background</item>
     </style>
 
@@ -23,16 +38,16 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"></style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.Material3.Dark.ActionBar"></style>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"></style>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.Material3.Light"></style>
 
-    <!-- Bottom sheet dialog theme - uses cardview background for consistency -->
-    <style name="AppTheme.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+    <!-- Bottom sheet dialog theme - uses surface color for consistency -->
+    <style name="AppTheme.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/AppTheme.BottomSheet</item>
     </style>
 
-    <style name="AppTheme.BottomSheet" parent="Widget.MaterialComponents.BottomSheet.Modal">
+    <style name="AppTheme.BottomSheet" parent="Widget.Material3.BottomSheet.Modal">
         <item name="backgroundTint">@color/cardview_light_background</item>
     </style>
 
@@ -41,7 +56,7 @@
         <item name="android:labelTextSize">20dp</item>
     </style>
 
-    <style name="ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
+    <style name="ToolbarTitle" parent="@style/TextAppearance.Material3.TitleLarge">
         <item name="android:textSize">20sp</item>
     </style>
 
diff --git a/docs/README.md b/docs/README.md
index 85847f633..f37aa4420 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -60,6 +60,7 @@ Features and changes under consideration:
 - [Events View Lookahead](dev_todo/events_view_lookahead.md) - Upcoming events tab, pre-actions, filter pills ⭐ *Active*
   - [Milestone 2: Pre-Actions](dev_todo/event_lookahead_milestone2_pre_actions.md) - Pre-mute, pre-snooze, pre-dismiss ✅
   - [Milestone 3: Filter Pills](dev_todo/event_lookahead_milestone3_filter_pills.md) - Status, Time, Calendar filters 🚧
+- [Material 3 Theme Migration](dev_todo/material_components_theme_migration.md) - Full Material 3 upgrade with dynamic colors ([#15](https://github.com/williscool/CalendarNotification/issues/15), [#225](https://github.com/williscool/CalendarNotification/issues/225))
 - [Deprecated Features Removal](dev_todo/deprecated_features.md) - QuietHours, CalendarEditor
 - [Android Modernization](dev_todo/android_modernization.md) - Coroutines, Hilt DI opportunities
 - [Raise Min SDK](dev_todo/raise_min_sdk.md) - API 24 → 26+ considerations
diff --git a/docs/dev_todo/deprecated_features.md b/docs/dev_todo/deprecated_features.md
index e5248705b..38c6386b5 100644
--- a/docs/dev_todo/deprecated_features.md
+++ b/docs/dev_todo/deprecated_features.md
@@ -117,6 +117,54 @@ Before removing these features:
 
 ---
 
+## Custom Date/Time Picker Layouts
+
+**Status:** REMOVED ✅
+
+**Reason:** These custom layouts existed only to work around limitations of the old callback-based `DatePickerDialog`/`TimePickerDialog` (state loss on rotation, manual flow management). Modern `MaterialDatePicker`/`MaterialTimePicker` are fragment-based and handle all of this automatically.
+
+### Files Removed
+
+**Layouts (DELETED):**
+- [x] `dialog_date_picker.xml` 
+- [x] `dialog_time_picker.xml`
+- [x] `dialog_date_time_picker.xml` (orphaned, never used)
+- [x] `dialog_date_picker_halo_light.xml` (orphaned, never used)
+- [x] `dialog_time_picker_halo_light.xml` (orphaned, never used)
+
+**Code simplified:**
+- [x] `ViewEventActivityNoRecents.kt` - Replaced ~100 lines of state tracking with ~30 lines using MaterialPickers
+- [x] `SnoozeAllActivity.kt` - Same simplification
+- [x] `EditEventActivity.kt` - Migrated to MaterialDatePicker/MaterialTimePicker
+
+**Benefits achieved:**
+- Automatic state restoration on rotation (DialogFragments handle their own state)
+- Beautiful Material 3 UI with clock face time picker and calendar date picker
+- ~200+ lines of manual state management code removed
+- Built-in accessibility support
+
+---
+
+## LED Notification Pattern
+
+**Status:** DEPRECATED
+
+**Reason:** LED notification lights have been removed from virtually all modern phones since ~2018. Replaced by Always-On Display, edge lighting, and screen-based notification effects.
+
+### Files to Remove
+
+**UI:**
+- [ ] `dialog_led_pattern.xml` - LED on/off time SeekBars
+- [ ] `dialog_color_picker.xml` - LED color picker
+
+**Code:**
+- [ ] LED color/pattern handling in notification builders
+- [ ] Settings preferences for LED customization
+
+**Note:** Android still has the `Notification.Builder.setLights()` API but it's effectively a no-op on modern devices.
+
+---
+
 ## Removal Timeline
 
 | Phase | Action | Status |
@@ -125,6 +173,8 @@ Before removing these features:
 | 2 | Complete core feature test suite | In Progress |
 | 3 | Remove Quiet Hours feature | Pending |
 | 4 | Remove Calendar Editor feature | Pending |
-| 5 | Remove Legacy Storage & `.use {}` pattern | Pending |
-| 6 | Clean up dependencies and update docs | Pending |
+| 5 | Remove LED notification settings | Pending |
+| 6 | Remove custom picker layouts (use MaterialDatePicker/MaterialTimePicker) | ✅ DONE |
+| 7 | Remove Legacy Storage & `.use {}` pattern | Pending |
+| 8 | Clean up dependencies and update docs | Pending |
 
diff --git a/docs/dev_todo/material_components_theme_migration.md b/docs/dev_todo/material_components_theme_migration.md
new file mode 100644
index 000000000..3931351db
--- /dev/null
+++ b/docs/dev_todo/material_components_theme_migration.md
@@ -0,0 +1,698 @@
+# Material 3 Theme Migration
+
+## Status: In Progress (Phase 4 - Cleanup)
+
+## Post-Migration Cleanup Notes
+
+Items to address after core migration is complete:
+
+- [ ] **FAB styling** - Edit FAB on main screen and pencil on activity view look slightly off with M3. Consider using `ExtendedFloatingActionButton` or adjusting `app:fabSize` and icon tint.
+- [ ] **Button audit** - Review buttons throughout app for consistent M3 styling (filled vs tonal vs outlined)
+## Related: [#15 - Upgrade the UI](https://github.com/williscool/CalendarNotification/issues/15), [#225 - Filter pills bottom sheet dark theme](https://github.com/williscool/CalendarNotification/issues/225)
+
+## Overview
+
+The app currently uses `Theme.AppCompat.DayNight` as its base theme. This document outlines the migration path to **Material 3** (`Theme.Material3.*`) for the latest Material Design language with:
+- Automatic dark mode for all components
+- Dynamic color support (Android 12+ wallpaper-based colors)
+- Modern, rounded aesthetic
+- Updated component styles
+
+## Background
+
+### Material Design Evolution
+
+| Version | Theme | Android Library | Key Features |
+|---------|-------|-----------------|--------------|
+| Material 2 | `Theme.MaterialComponents.*` | material:1.x | Components, dark mode |
+| **Material 3** | `Theme.Material3.*` | material:1.5+ | Dynamic color, updated design, M3 components |
+
+The app uses `com.google.android.material:material:1.12.0` which includes full Material 3 support.
+
+### Current State
+- Base theme: `Theme.AppCompat.DayNight.DarkActionBar`
+- Material library: `1.12.0` (supports Material 3)
+- Problem: Material components don't inherit AppCompat dark mode
+
+### Already Using Material Components ✅
+The Modern UI already uses several Material components:
+- `BottomNavigationView` - Tab navigation
+- `FloatingActionButton` - Add event button
+- `ChipGroup` - Filter pills
+- `AppBarLayout` + `CoordinatorLayout` - Collapsing toolbar
+- `SwipeRefreshLayout` - Pull to refresh
+
+---
+
+# Phase 1: Core Theme Migration
+
+## 1.1 Theme Parent Change
+
+**`values/styles.xml`:**
+```xml
+<!-- Before -->
+<style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+
+<!-- After - Material 3 -->
+<style name="AppTheme" parent="Theme.Material3.DayNight">
+    <!-- Primary brand colors -->
+    <item name="colorPrimary">@color/primary</item>
+    <item name="colorOnPrimary">@color/icons</item>
+    <item name="colorPrimaryContainer">@color/primary_light</item>
+    <item name="colorOnPrimaryContainer">@color/primary_dark</item>
+    
+    <!-- Secondary/accent colors -->
+    <item name="colorSecondary">@color/accent</item>
+    <item name="colorOnSecondary">@color/icons</item>
+    
+    <!-- Surface colors -->
+    <item name="colorSurface">@color/cardview_light_background</item>
+    <item name="colorOnSurface">@color/primary_text</item>
+    <item name="colorSurfaceVariant">@color/background</item>
+    <item name="colorOnSurfaceVariant">@color/secondary_text</item>
+    
+    <!-- Background -->
+    <item name="android:colorBackground">@color/background</item>
+    
+    <!-- Optional: Enable dynamic colors on Android 12+ -->
+    <!-- <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.DayNight</item> -->
+</style>
+```
+
+**`values-night/styles.xml`:**
+```xml
+<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.Material3.Dark"></style>
+```
+
+**Effort:** 30 minutes  
+**Impact:** High - enables all Material 3 component styling
+
+---
+
+## 1.2 AlertDialog → MaterialAlertDialogBuilder
+
+**Impact:** 52 usages across 14 files  
+**Effort:** 2-3 hours  
+**Visual Impact:** High (M3 dialogs have full-width buttons, more padding)
+
+**Files to update:**
+| File | Count |
+|------|-------|
+| `EditEventActivity.kt` | 9 |
+| `ViewEventActivityNoRecents.kt` | 7 |
+| `SnoozeAllActivity.kt` | 7 |
+| `MainActivityLegacy.kt` | 4 |
+| `MainActivityBase.kt` | 4 |
+| `MainActivityModern.kt` | 3 |
+| `NavigationSettingsFragmentX.kt` | 3 |
+| `MiscSettingsFragmentX.kt` | 3 |
+| `PreActionActivity.kt` | 2 |
+| `DismissedEventsActivity.kt` | 2 |
+| `CalendarsActivity.kt` | 2 |
+| `DismissedEventsFragment.kt` | 2 |
+| `SnoozePresetPreferenceX.kt` | 2 |
+| `ListPreference.kt` | 2 |
+
+**Change pattern:**
+```kotlin
+// Before
+import androidx.appcompat.app.AlertDialog
+
+AlertDialog.Builder(context)
+    .setTitle("Title")
+    .setMessage("Message")
+    .setPositiveButton("OK") { _, _ -> }
+    .show()
+
+// After
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+MaterialAlertDialogBuilder(context)
+    .setTitle("Title")
+    .setMessage("Message")
+    .setPositiveButton("OK") { _, _ -> }
+    .show()
+```
+
+---
+
+## 1.3 Fix EditText Styling
+
+**File:** `bottom_sheet_calendar_filter.xml`  
+**Effort:** 15 minutes
+
+```xml
+<!-- Before -->
+<EditText
+    android:background="@android:drawable/editbox_background"
+    ... />
+
+<!-- After - Material 3 outlined text field -->
+<com.google.android.material.textfield.TextInputLayout
+    style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/calendar_filter_search_hint"
+    app:startIconDrawable="@android:drawable/ic_menu_search">
+    
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/search_calendars"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:imeOptions="actionSearch" />
+        
+</com.google.android.material.textfield.TextInputLayout>
+```
+
+---
+
+## 1.4 CardView → MaterialCardView
+
+**File:** `content_main.xml`  
+**Effort:** 15 minutes
+
+```xml
+<!-- Before -->
+<androidx.cardview.widget.CardView
+    app:cardCornerRadius="8dp"
+    ... >
+
+<!-- After - Material 3 card with automatic shape -->
+<com.google.android.material.card.MaterialCardView
+    style="@style/Widget.Material3.CardView.Elevated"
+    ... >
+```
+
+---
+
+## 1.5 Button Styling
+
+Material 3 buttons have different default styles:
+
+```xml
+<!-- Filled button (default, high emphasis) -->
+<Button
+    style="@style/Widget.Material3.Button"
+    ... />
+
+<!-- Tonal button (medium emphasis) -->
+<Button
+    style="@style/Widget.Material3.Button.TonalButton"
+    ... />
+
+<!-- Outlined button (medium emphasis) -->
+<Button
+    style="@style/Widget.Material3.Button.OutlinedButton"
+    ... />
+
+<!-- Text button (low emphasis) -->
+<Button
+    style="@style/Widget.Material3.Button.TextButton"
+    ... />
+```
+
+---
+
+## Phase 1 Summary
+
+| Task | Effort | Visual Impact |
+|------|--------|---------------|
+| Theme parent change to Material 3 | 30 min | High |
+| AlertDialog → MaterialAlertDialogBuilder | 2-3 hours | High |
+| Fix EditText in bottom sheet | 15 min | Medium |
+| CardView → MaterialCardView | 15 min | Low |
+| Button style audit | 1 hour | Medium |
+
+**Phase 1 Total:** ~4-5 hours
+
+---
+
+# Phase 2: Quick Component Upgrades
+
+Simple drop-in replacements with minimal code changes.
+
+## 2.1 Switch → MaterialSwitch ✅ COMPLETE
+
+**Files updated:**
+- `pref_switch_with_text.xml`
+- `content_add_event.xml`
+
+## 2.2 Dividers → MaterialDivider (OPTIONAL)
+
+~15 dividers across 6 files. Low visual impact, can be done incrementally.
+
+**Pattern:**
+```xml
+<!-- Before -->
+<View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="@color/divider" />
+
+<!-- After -->
+<com.google.android.material.divider.MaterialDivider
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" />
+```
+
+**Files:** `content_add_event.xml` (4), `content_main.xml` (3), `activity_view.xml` (2), `activity_pre_action.xml` (2), `dialog_color_picker.xml` (3), `bottom_sheet_calendar_filter.xml` (1)
+
+**Note:** One divider has ID `snooze_view_inter_view_divider` used in code - preserve the ID.
+
+---
+
+# Phase 3: Snackbar Migration (SELECTIVE)
+
+Requires View anchor - only practical in Activities/Fragments, not services.
+
+## 3.1 Toast → Snackbar
+
+**Impact:** 32 usages across 11 files  
+**Effort:** 2-3 hours  
+**Benefit:** Actionable messages (undo), better UX, Material styling
+
+**Files to update:**
+| File | Count |
+|------|-------|
+| `EditEventActivity.kt` | 10 |
+| `PreActionActivity.kt` | 6 |
+| `ApplicationController.kt` | 5 |
+| `ViewEventActivityNoRecents.kt` | 2 |
+| `ReminderPatternPreferenceX.kt` | 2 |
+| `NavigationSettingsFragmentX.kt` | 2 |
+| Others | 5 |
+
+**Change pattern:**
+```kotlin
+// Before
+Toast.makeText(context, "Event dismissed", Toast.LENGTH_SHORT).show()
+
+// After - with optional undo action!
+Snackbar.make(rootView, "Event dismissed", Snackbar.LENGTH_LONG)
+    .setAction("Undo") { restoreEvent(event) }
+    .show()
+```
+
+**Note:** Snackbar requires a View anchor. Activities need to pass a root view.
+
+---
+
+# Phase 4: Picker Upgrades
+
+Requires API changes from callback-based to fragment-based pickers.
+
+## 4.1 TimePickerDialog → MaterialTimePicker
+
+**Impact:** ~4 actual picker instantiations + 2 deprecated custom layouts  
+**Effort:** 2-3 hours  
+**Benefit:** Modern clock-style picker, Material 3 styling, DELETE legacy code
+
+**Files to update:**
+- `EditEventActivity.kt` - 2 `TimePickerDialog` instantiations (start/end time)
+- `ViewEventActivityNoRecents.kt` - Custom picker → MaterialTimePicker (deletes ~50 lines)
+- `SnoozeAllActivity.kt` - Same custom picker → MaterialTimePicker (deletes ~50 lines)
+
+**Legacy files to DELETE:**
+- `dialog_time_picker.xml` - No longer needed with MaterialTimePicker
+
+**Change pattern:**
+```kotlin
+// Before
+TimePickerDialog(context, { _, hour, minute ->
+    onTimeSelected(hour, minute)
+}, currentHour, currentMinute, true).show()
+
+// After
+val picker = MaterialTimePicker.Builder()
+    .setTimeFormat(TimeFormat.CLOCK_24H)
+    .setHour(currentHour)
+    .setMinute(currentMinute)
+    .setTitleText("Select time")
+    .build()
+    
+picker.addOnPositiveButtonClickListener {
+    onTimeSelected(picker.hour, picker.minute)
+}
+picker.show(supportFragmentManager, "timePicker")
+```
+
+---
+
+## 4.2 DatePickerDialog → MaterialDatePicker
+
+**Impact:** ~4 actual picker instantiations + 2 deprecated custom layouts  
+**Effort:** Bundled with time picker work  
+**Benefit:** Modern calendar picker, DELETE legacy code
+
+**Files to update:**
+- `EditEventActivity.kt` - 2 `DatePickerDialog` instantiations (start/end date)
+- `ViewEventActivityNoRecents.kt` - Custom picker → MaterialDatePicker
+- `SnoozeAllActivity.kt` - Same custom picker → MaterialDatePicker
+
+**Legacy files to DELETE:**
+- `dialog_date_picker.xml` - No longer needed with MaterialDatePicker
+
+**Change pattern:**
+```kotlin
+// Before
+DatePickerDialog(context, { _, year, month, day ->
+    onDateSelected(year, month, day)
+}, currentYear, currentMonth, currentDay).show()
+
+// After
+val picker = MaterialDatePicker.Builder.datePicker()
+    .setTitleText("Select date")
+    .setSelection(MaterialDatePicker.todayInUtcMilliseconds())
+    .build()
+    
+picker.addOnPositiveButtonClickListener { selection ->
+    val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
+    calendar.timeInMillis = selection
+    onDateSelected(calendar.get(Calendar.YEAR), 
+                   calendar.get(Calendar.MONTH), 
+                   calendar.get(Calendar.DAY_OF_MONTH))
+}
+picker.show(supportFragmentManager, "datePicker")
+```
+
+---
+
+## 2.4 SwitchCompat → MaterialSwitch
+
+**Impact:** 2 files  
+**Effort:** 30 minutes  
+**Benefit:** Material 3 switch with thumb/track styling
+
+**Files:**
+- `content_add_event.xml`
+- `pref_switch_with_text.xml`
+
+```xml
+<!-- Before -->
+<androidx.appcompat.widget.SwitchCompat
+    ... />
+
+<!-- After -->
+<com.google.android.material.materialswitch.MaterialSwitch
+    ... />
+```
+
+---
+
+## 2.5 Manual Dividers → MaterialDivider
+
+**Impact:** ~28 manual dividers across 15 layout files  
+**Effort:** 1-2 hours  
+**Benefit:** Consistent divider styling, proper insets
+
+```xml
+<!-- Before -->
+<View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="?android:attr/listDivider" />
+
+<!-- After -->
+<com.google.android.material.divider.MaterialDivider
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:dividerInsetStart="16dp"
+    app:dividerInsetEnd="16dp" />
+```
+
+---
+
+## 2.6 Toolbar → MaterialToolbar (Optional)
+
+**Impact:** 13 layout files  
+**Effort:** 1 hour  
+**Benefit:** Menu handling improvements, Material 3 styling
+
+```xml
+<!-- Before -->
+<androidx.appcompat.widget.Toolbar ... />
+
+<!-- After -->
+<com.google.android.material.appbar.MaterialToolbar ... />
+```
+
+---
+
+## Phase 2 Summary
+
+| Task | Effort | Visual Impact | UX Benefit |
+|------|--------|---------------|------------|
+| Toast → Snackbar | 2-3 hours | Medium | **High** (undo actions!) |
+| MaterialTimePicker | 1 hour | High | ✅ Done |
+| MaterialDatePicker | 1 hour | High | ✅ Done |
+| MaterialSwitch | 30 min | Medium | M3 styling |
+| MaterialDivider | 1-2 hours | Low | Consistency |
+| MaterialToolbar | 1 hour | Low | Minor |
+
+**Phase 2 Total:** ~10-13 hours
+
+---
+
+# Phase 3: Advanced Component Upgrades
+
+Lower priority upgrades for complete Material 3 consistency.
+
+## 3.1 Spinner → ExposedDropdownMenu
+
+**Impact:** 4 files  
+**Effort:** 2-3 hours  
+**Benefit:** Modern dropdown with Material 3 styling, search support
+
+**Files to update:**
+- `dialog_interval_picker.xml`
+- `dialog_add_event_notification.xml`
+- `dialog_default_manual_notification.xml`
+- `dialog_reminder_interval_configuration.xml`
+
+**Change pattern:**
+```xml
+<!-- Before -->
+<Spinner
+    android:id="@+id/spinner_unit"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
+
+<!-- After - Material 3 Exposed Dropdown Menu -->
+<com.google.android.material.textfield.TextInputLayout
+    style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:hint="Unit">
+    
+    <AutoCompleteTextView
+        android:id="@+id/dropdown_unit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="none" />
+        
+</com.google.android.material.textfield.TextInputLayout>
+```
+
+**Kotlin changes required:**
+```kotlin
+// Before (Spinner)
+spinner.adapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, items)
+spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { ... }
+
+// After (ExposedDropdownMenu)
+val adapter = ArrayAdapter(context, R.layout.list_item, items)
+(textInputLayout.editText as? AutoCompleteTextView)?.setAdapter(adapter)
+autoCompleteTextView.setOnItemClickListener { _, _, position, _ -> ... }
+```
+
+---
+
+## 3.2 SeekBar → Slider
+
+**Status:** SKIPPED - LED notification feature deprecated (see `deprecated_features.md`)
+
+LED notification lights have been removed from modern phones since ~2018. No point upgrading UI for a feature scheduled for removal.
+
+---
+
+## 3.3 ImageButton → MaterialButton (Icon style)
+
+**Impact:** 2 usages in `fragment_event_list.xml`  
+**Effort:** 30 minutes  
+**Benefit:** Consistent ripple, better accessibility
+
+```xml
+<!-- Before -->
+<ImageButton
+    android:id="@+id/btn_close_selection"
+    android:src="@drawable/ic_clear_white_24dp"
+    android:background="?attr/selectableItemBackgroundBorderless" />
+
+<!-- After -->
+<com.google.android.material.button.MaterialButton
+    android:id="@+id/btn_close_selection"
+    style="@style/Widget.Material3.Button.IconButton"
+    app:icon="@drawable/ic_clear_white_24dp"
+    app:iconTint="@android:color/white" />
+```
+
+---
+
+## Phase 3 Summary
+
+| Task | Effort | Visual Impact | Status |
+|------|--------|---------------|--------|
+| Spinner → ExposedDropdownMenu | 2-3 hours | Medium | ✅ Done |
+| ~~SeekBar → Slider~~ | - | - | SKIPPED (LED deprecated) |
+| ImageButton → MaterialButton | 30 min | Low | ✅ Done |
+
+**Phase 3 Total:** ✅ Complete!
+
+---
+
+# Optional: Dynamic Colors (Android 12+)
+
+Material 3 supports **Dynamic Colors** - extracting colors from the user's wallpaper. This is opt-in.
+
+**To enable:**
+```xml
+<style name="AppTheme" parent="Theme.Material3.DayNight">
+    <!-- Enable dynamic colors -->
+    <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.DayNight</item>
+</style>
+```
+
+Or programmatically (recommended for gradual rollout):
+```kotlin
+// In Application.onCreate() or Activity.onCreate()
+DynamicColors.applyToActivitiesIfAvailable(this)
+```
+
+**Considerations:**
+- Only works on Android 12+ (falls back to defined colors on older versions)
+- App brand colors may be overridden
+- Can be disabled per-activity if needed
+
+---
+
+# Visual Comparison
+
+| Component | AppCompat | Material 3 |
+|-----------|-----------|------------|
+| Dialogs | Sharp corners | Large rounded corners, full-width buttons |
+| Bottom sheets | Manual theming | Auto dark mode, rounded top corners |
+| Buttons | Borderless default | Filled default, tonal variants |
+| Cards | Standard elevation | Tinted surfaces, larger radius |
+| Switches | Small toggle | Large thumb/track, ripple |
+| Text fields | Underline | Outlined/Filled with labels |
+| Time picker | Spinner style | Clock face, Material 3 |
+| Date picker | Calendar grid | Modern calendar, range support |
+| Chips | Flat | Tonal, elevated variants |
+
+---
+
+# Testing Checklist
+
+## Phase 1
+- [ ] Main activity (Modern UI) - light & dark
+- [ ] Main activity (Legacy UI) - light & dark
+- [ ] All AlertDialog confirmations
+- [ ] Filter bottom sheets (Time, Calendar)
+- [ ] Settings screens
+- [ ] Handled Calendars page
+- [ ] View Event screen
+- [ ] Edit Event screen
+- [ ] About screen
+
+## Phase 1: Core Theme ✅ COMPLETE
+- [x] Theme parent → Material3.DayNight
+- [x] AlertDialog → MaterialAlertDialogBuilder (18 files)
+- [x] TextInputLayout for bottom sheet search
+- [x] CardView → MaterialCardView
+
+## Phase 2: Quick Components ✅ COMPLETE  
+- [x] MaterialSwitch (2 files)
+- [x] MaterialDivider (~15 locations across 10 files)
+
+## Phase 3: Snackbar ✅ COMPLETE
+- [x] Toast → Snackbar in Activities (selective)
+  - MainActivityModern, ViewEventActivityNoRecents, PreActionActivity
+  - EditEventActivity, ReportABugActivity, MiscSettingsFragmentX
+  - ReminderPatternPreferenceX
+- [x] Keep Toast in services (ApplicationController, SnoozeResult, NotificationActionSnoozeService)
+- [x] Keep Toast in NavigationSettingsFragmentX (app restart scenario)
+
+## Phase 4: Advanced Components ✅ COMPLETE
+- [x] ImageButton → MaterialButton (2 usages in fragment_event_list.xml)
+- [x] Spinner → ExposedDropdownMenu (4 layouts + 2 Kotlin files)
+- [x] ~~SeekBar → Slider~~ - SKIPPED (LED feature deprecated, see deprecated_features.md)
+
+## Phase 5: Pickers - ✅ Complete!
+- [x] MaterialTimePicker (2 in EditEventActivity + 2 custom picker dialogs)
+- [x] MaterialDatePicker (2 in EditEventActivity + 2 custom picker dialogs)
+- [x] DELETED `dialog_date_picker.xml` (legacy custom layout)
+- [x] DELETED `dialog_time_picker.xml` (legacy custom layout)
+
+**Benefits achieved:**
+- Removed ~200 lines of manual state restoration code
+- Material pickers are DialogFragments and handle their own state
+- Modern M3 styling with clock face time picker and calendar date picker
+- Simplified ViewEventActivityNoRecents and SnoozeAllActivity significantly
+
+---
+
+## Phase 6: Event Card & List Redesign - ✅ Complete!
+- [x] Event card → MaterialCardView with ConstraintLayout
+- [x] M3 typography and spacing
+- [x] MaterialCheckBox and MaterialRadioButton across app
+- [x] Tighter list spacing per M3 guidelines
+
+## Phase 7: App Bar Modernization - PARTIAL
+- [x] Main activity → MaterialToolbar with M3 styling
+- [x] Main activity legacy → Same
+- [x] Day mode keeps original `colorPrimary` (teal/gray)
+- [x] Night mode uses surface color for M3 dark theme look
+
+### Remaining Toolbar Updates (Polish Pass)
+The following activities still use old `androidx.appcompat.widget.Toolbar`:
+- [ ] `activity_view.xml` - Event view screen
+- [ ] `activity_add_event.xml` - Add/Edit event
+- [ ] `activity_settings.xml` / `activity_settings_x.xml` - Settings
+- [ ] `activity_about.xml` - About screen
+- [ ] `activity_calendars.xml` - Calendar selection
+- [ ] `activity_dismissed_events.xml` - Dismissed events
+- [ ] `activity_snooze_all.xml` - Snooze all
+- [ ] `activity_privacy_policy.xml` - Privacy policy
+- [ ] `activity_report_a_bug.xml` - Bug report
+- [ ] `activity_car_mode.xml` - Car mode
+
+**Pattern to apply:**
+```xml
+<com.google.android.material.appbar.MaterialToolbar
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    app:titleTextAppearance="?attr/textAppearanceTitleLarge"
+    app:titleTextColor="@color/app_bar_on_background"
+    app:navigationIconTint="@color/app_bar_on_background" />
+```
+
+---
+
+## Phase 8: Event View Modernization - TODO
+The event view screen (`activity_view.xml`) needs a full redesign:
+- [ ] Replace colored header with MaterialCardView or surface treatment
+- [ ] Update FAB styling
+- [ ] Modernize action items/buttons
+- [ ] Consider using M3 list items for snooze options
+
+---
+
+# References
+
+- [Material 3 for Android](https://m3.material.io/develop/android/mdc-android)
+- [Migrate to Material 3](https://github.com/material-components/material-components-android/blob/master/docs/theming/Migration.md)
+- [Material 3 Color System](https://m3.material.io/styles/color/overview)
+- [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview)
+- [Material 3 Components Catalog](https://github.com/material-components/material-components-android/tree/master/catalog)