diff --git a/app/build.gradle b/app/build.gradle
index e95b4d8b7..b10ca4bdc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.15.23'
+    implementation 'com.simplemobiletools:commons:5.16.7'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index 9b6baf9df..004c9aea7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -95,7 +95,7 @@ class EventActivity : SimpleActivity() {
             return
         }
 
-        supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
+        supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross_vector)
         val intent = intent ?: return
         mDialogTheme = getDialogTheme()
         mWasContactsPermissionChecked = hasPermission(PERMISSION_READ_CONTACTS)
@@ -716,7 +716,7 @@ class EventActivity : SimpleActivity() {
 
     private fun updateReminderTypeImage(view: ImageView, reminder: Reminder) {
         view.beVisibleIf(reminder.minutes != REMINDER_OFF && mEventCalendarId != STORED_LOCALLY_ONLY)
-        val drawable = if (reminder.type == REMINDER_NOTIFICATION) R.drawable.ic_bell else R.drawable.ic_email
+        val drawable = if (reminder.type == REMINDER_NOTIFICATION) R.drawable.ic_bell_vector else R.drawable.ic_email_vector
         val icon = resources.getColoredDrawableWithColor(drawable, config.textColor)
         view.setImageDrawable(icon)
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
index f73c05670..c48ce8fa0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
@@ -257,7 +257,7 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
             .setAutoCancel(true)
             .setSound(Uri.parse(soundUri), config.reminderAudioStream)
             .setChannelId(channelId)
-            .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(this, event))
+            .addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(this, event))
 
     if (config.vibrateOnReminder) {
         val vibrateArray = LongArray(2) { 500 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt
index d117eba31..5f03fd6b8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt
@@ -44,7 +44,7 @@ class MyWidgetListProvider : AppWidgetProvider() {
             val todayText = Formatter.getLongestDate(getNowSeconds())
             views.setText(R.id.widget_event_list_today, todayText)
 
-            views.setImageViewBitmap(R.id.widget_event_new_event, context.resources.getColoredBitmap(R.drawable.ic_plus, textColor))
+            views.setImageViewBitmap(R.id.widget_event_new_event, context.resources.getColoredBitmap(R.drawable.ic_plus_vector, textColor))
             setupIntent(context, views, NEW_EVENT, R.id.widget_event_new_event)
             setupIntent(context, views, LAUNCH_CAL, R.id.widget_event_list_today)
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt
index 474eafded..0e0aeeb63 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt
@@ -181,7 +181,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
                 bmp = resources.getColoredBitmap(R.drawable.ic_today, textColor)
                 views.setImageViewBitmap(R.id.top_go_to_today, bmp)
 
-                bmp = resources.getColoredBitmap(R.drawable.ic_plus, textColor)
+                bmp = resources.getColoredBitmap(R.drawable.ic_plus_vector, textColor)
                 views.setImageViewBitmap(R.id.top_new_event, bmp)
 
                 val shouldGoToTodayBeVisible = currTargetDate.withTime(0, 0, 0, 0) != DateTime.now().withDayOfMonth(1).withTime(0, 0, 0, 0)
diff --git a/app/src/main/res/drawable/attendee_circular_background.xml b/app/src/main/res/drawable/attendee_circular_background.xml
index 4b622c6eb..8101204b6 100644
--- a/app/src/main/res/drawable/attendee_circular_background.xml
+++ b/app/src/main/res/drawable/attendee_circular_background.xml
@@ -8,7 +8,7 @@
 
     <item
         android:bottom="@dimen/medium_margin"
-        android:drawable="@drawable/ic_person"
+        android:drawable="@drawable/ic_person_vector"
         android:left="@dimen/medium_margin"
         android:right="@dimen/medium_margin"
         android:top="@dimen/medium_margin"/>
diff --git a/app/src/main/res/layout/activity_day.xml b/app/src/main/res/layout/activity_day.xml
index 84de6d093..8f6045c82 100644
--- a/app/src/main/res/layout/activity_day.xml
+++ b/app/src/main/res/layout/activity_day.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_margin"
-        android:src="@drawable/ic_plus"
+        android:src="@drawable/ic_plus_vector"
         app:backgroundTint="@color/color_primary"
         app:rippleColor="@color/pressed_item_foreground"/>
 
diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index f1d3cf14c..cf4d2385f 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -54,7 +54,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:paddingStart="@dimen/small_margin"
             android:paddingEnd="@dimen/small_margin"
-            android:src="@drawable/ic_place"/>
+            android:src="@drawable/ic_place_vector"/>
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/event_description"
@@ -92,7 +92,7 @@
             android:layout_alignBottom="@+id/event_all_day"
             android:layout_marginStart="@dimen/normal_margin"
             android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_clock"/>
+            android:src="@drawable/ic_clock_vector"/>
 
         <com.simplemobiletools.commons.views.MySwitchCompat
             android:id="@+id/event_all_day"
@@ -176,7 +176,7 @@
             android:layout_alignBottom="@+id/event_reminder_1"
             android:layout_marginStart="@dimen/normal_margin"
             android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_bell"/>
+            android:src="@drawable/ic_bell_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/event_reminder_1"
@@ -204,7 +204,7 @@
             android:layout_marginStart="@dimen/small_margin"
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin"
-            android:src="@drawable/ic_bell"/>
+            android:src="@drawable/ic_bell_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/event_reminder_2"
@@ -234,7 +234,7 @@
             android:layout_marginStart="@dimen/small_margin"
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin"
-            android:src="@drawable/ic_bell"/>
+            android:src="@drawable/ic_bell_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/event_reminder_3"
@@ -264,7 +264,7 @@
             android:layout_marginStart="@dimen/small_margin"
             android:background="?attr/selectableItemBackground"
             android:padding="@dimen/activity_margin"
-            android:src="@drawable/ic_bell"/>
+            android:src="@drawable/ic_bell_vector"/>
 
         <ImageView
             android:id="@+id/event_reminder_divider"
@@ -285,7 +285,7 @@
             android:layout_alignBottom="@+id/event_repetition"
             android:layout_marginStart="@dimen/normal_margin"
             android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_repeat"/>
+            android:src="@drawable/ic_repeat_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/event_repetition"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a2b177cd6..258eec084 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,7 +25,7 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_margin"
         android:contentDescription="@string/new_event"
-        android:src="@drawable/ic_plus"
+        android:src="@drawable/ic_plus_vector"
         app:backgroundTint="@color/color_primary"
         app:rippleColor="@color/pressed_item_foreground"/>
 
diff --git a/app/src/main/res/layout/dialog_set_reminders.xml b/app/src/main/res/layout/dialog_set_reminders.xml
index 09b8597af..83295b799 100644
--- a/app/src/main/res/layout/dialog_set_reminders.xml
+++ b/app/src/main/res/layout/dialog_set_reminders.xml
@@ -17,7 +17,7 @@
         android:layout_marginStart="@dimen/normal_margin"
         android:alpha="0.8"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_bell"/>
+        android:src="@drawable/ic_bell_vector"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/set_reminders_1"
diff --git a/app/src/main/res/layout/fragment_month_widget.xml b/app/src/main/res/layout/fragment_month_widget.xml
index cad7ee0f0..38cacb572 100644
--- a/app/src/main/res/layout/fragment_month_widget.xml
+++ b/app/src/main/res/layout/fragment_month_widget.xml
@@ -66,7 +66,7 @@
         android:layout_alignParentEnd="true"
         android:paddingStart="@dimen/medium_margin"
         android:paddingEnd="@dimen/medium_margin"
-        android:src="@drawable/ic_plus"/>
+        android:src="@drawable/ic_plus_vector"/>
 
     <include
         android:id="@+id/first_row_widget"
diff --git a/app/src/main/res/layout/item_attendee.xml b/app/src/main/res/layout/item_attendee.xml
index b178606b2..99850f6e1 100644
--- a/app/src/main/res/layout/item_attendee.xml
+++ b/app/src/main/res/layout/item_attendee.xml
@@ -73,7 +73,7 @@
             android:alpha="0.8"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="@dimen/small_margin"
-            android:src="@drawable/ic_cross_big"/>
+            android:src="@drawable/ic_cross_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/event_contact_me_status"
diff --git a/app/src/main/res/layout/week_grid_item.xml b/app/src/main/res/layout/week_grid_item.xml
index 5c7925168..6abb0697c 100644
--- a/app/src/main/res/layout/week_grid_item.xml
+++ b/app/src/main/res/layout/week_grid_item.xml
@@ -5,4 +5,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scaleType="centerInside"
-    android:src="@drawable/ic_plus"/>
+    android:src="@drawable/ic_plus_vector"/>
diff --git a/app/src/main/res/layout/widget_event_list.xml b/app/src/main/res/layout/widget_event_list.xml
index d1f62d1c7..9994ff342 100644
--- a/app/src/main/res/layout/widget_event_list.xml
+++ b/app/src/main/res/layout/widget_event_list.xml
@@ -47,7 +47,7 @@
         android:paddingEnd="@dimen/medium_margin"
         android:paddingBottom="@dimen/small_margin"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_plus"/>
+        android:src="@drawable/ic_plus_vector"/>
 
     <ListView
         android:id="@+id/widget_event_list"
diff --git a/app/src/main/res/menu/cab_day.xml b/app/src/main/res/menu/cab_day.xml
index 6da3de415..096697b44 100644
--- a/app/src/main/res/menu/cab_day.xml
+++ b/app/src/main/res/menu/cab_day.xml
@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/cab_event_list.xml b/app/src/main/res/menu/cab_event_list.xml
index 6da3de415..096697b44 100644
--- a/app/src/main/res/menu/cab_event_list.xml
+++ b/app/src/main/res/menu/cab_event_list.xml
@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/cab_event_type.xml b/app/src/main/res/menu/cab_event_type.xml
index af34568ba..642b5e421 100644
--- a/app/src/main/res/menu/cab_event_type.xml
+++ b/app/src/main/res/menu/cab_event_type.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_event.xml b/app/src/main/res/menu/menu_event.xml
index 801cf45bc..550370dc3 100644
--- a/app/src/main/res/menu/menu_event.xml
+++ b/app/src/main/res/menu/menu_event.xml
@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save"
-        android:icon="@drawable/ic_check"
+        android:icon="@drawable/ic_check_vector"
         android:title="@string/save"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
@@ -18,7 +18,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_event_types.xml b/app/src/main/res/menu/menu_event_types.xml
index 22289485b..035fbcacd 100644
--- a/app/src/main/res/menu/menu_event_types.xml
+++ b/app/src/main/res/menu/menu_event_types.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/add_event_type"
-        android:icon="@drawable/ic_plus"
+        android:icon="@drawable/ic_plus_vector"
         android:title="@string/add_new_type"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 2adc71e60..004babae7 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_search_vector"
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="collapseActionView|ifRoom"/>
@@ -19,12 +19,12 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/filter"
-        android:icon="@drawable/ic_filter"
+        android:icon="@drawable/ic_filter_vector"
         android:title="@string/filter_events_by_type"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/refresh_caldav_calendars"
-        android:icon="@drawable/ic_repeat"
+        android:icon="@drawable/ic_repeat_vector"
         android:title="@string/refresh_caldav_calendars"
         app:showAsAction="ifRoom"/>
     <item