diff --git a/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
index 970ef3e80..a4eabade8 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
@@ -90,7 +90,7 @@ public class BeastModePreferences extends ThemedInjectingAppCompatActivity
     setContentView(R.layout.beast_mode_pref_activity);
     ButterKnife.bind(this);
 
-    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_arrow_back_24dp));
+    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px));
     toolbar.setNavigationOnClickListener(v -> finish());
     toolbar.inflateMenu(R.menu.beast_mode);
     toolbar.setOnMenuItemClickListener(this);
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 1a0bc0361..5ff812f95 100755
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -112,7 +112,7 @@ public final class TaskEditFragment extends InjectingFragment
     final boolean backButtonSavesTask = preferences.backButtonSavesTask();
     toolbar.setNavigationIcon(
         ContextCompat.getDrawable(
-            context, backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
+            context, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
     toolbar.setNavigationOnClickListener(
         v -> {
           if (backButtonSavesTask) {
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index ed1582ce6..576330de5 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -213,7 +213,7 @@ public class TaskListFragment extends InjectingFragment
     setupRefresh(emptyRefreshLayout);
 
     toolbar.setTitle(filter.listingTitle);
-    toolbar.setNavigationIcon(R.drawable.ic_menu_24dp);
+    toolbar.setNavigationIcon(R.drawable.ic_outline_menu_24px);
     toolbar.setNavigationOnClickListener(v -> callbacks.onNavigationIconClicked());
     inflateMenu(toolbar);
     setupMenu(toolbar.getMenu());
diff --git a/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index e86c247da..704087a4b 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -151,7 +151,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
                           activity.getResources(), android.R.color.transparent, null),
                       theme.getThemeAccent().getAccentColor()
                     });
-            Drawable original = ContextCompat.getDrawable(activity, R.drawable.ic_check_black_24dp);
+            Drawable original = ContextCompat.getDrawable(activity, R.drawable.ic_outline_done_24px);
             Drawable wrapped = DrawableCompat.wrap(original.mutate());
             DrawableCompat.setTintList(wrapped, tintList);
             viewHolder.name.setCheckMarkDrawable(wrapped);
@@ -262,7 +262,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
     clear();
 
     Filter item = new Filter(activity.getString(R.string.dont_sync), null);
-    item.icon = R.drawable.ic_cloud_off_black_24dp;
+    item.icon = R.drawable.ic_outline_cloud_off_24px;
     add(item);
 
     for (Pair<GoogleTaskAccount, List<Filter>> filters : filterProvider.getGoogleTaskFilters()) {
@@ -289,7 +289,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
       add(
           new NavigationDrawerAction(
               activity.getResources().getString(R.string.FLA_new_filter),
-              R.drawable.ic_add_24dp,
+              R.drawable.ic_outline_add_24px,
               new Intent(activity, CustomFilterActivity.class),
               NavigationDrawerFragment.ACTIVITY_REQUEST_NEW_FILTER));
     }
@@ -300,7 +300,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
       add(
           new NavigationDrawerAction(
               activity.getResources().getString(R.string.new_tag),
-              R.drawable.ic_add_24dp,
+              R.drawable.ic_outline_add_24px,
               new Intent(activity, TagSettingsActivity.class),
               NavigationDrawerFragment.REQUEST_NEW_LIST));
     }
@@ -317,7 +317,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
         add(
             new NavigationDrawerAction(
                 activity.getResources().getString(R.string.new_list),
-                R.drawable.ic_add_24dp,
+                R.drawable.ic_outline_add_24px,
                 new Intent(activity, GoogleTaskListSettingsActivity.class)
                     .putExtra(GoogleTaskListSettingsActivity.EXTRA_ACCOUNT, account),
                 NavigationDrawerFragment.REQUEST_NEW_GTASK_LIST));
@@ -333,7 +333,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
         add(
             new NavigationDrawerAction(
                 activity.getString(R.string.new_list),
-                R.drawable.ic_add_24dp,
+                R.drawable.ic_outline_add_24px,
                 new Intent(activity, CaldavCalendarSettingsActivity.class)
                     .putExtra(EXTRA_CALDAV_ACCOUNT, account),
                 NavigationDrawerFragment.REQUEST_NEW_CALDAV_COLLECTION));
@@ -348,14 +348,14 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
         add(
             new NavigationDrawerAction(
                 activity.getResources().getString(R.string.TLA_menu_donate),
-                R.drawable.ic_attach_money_black_24dp,
+                R.drawable.ic_outline_attach_money_24px,
                 new Intent(Intent.ACTION_VIEW, Uri.parse("http://tasks.org/donate")),
                 REQUEST_PURCHASE));
       } else if (!inventory.hasPro()) {
         add(
             new NavigationDrawerAction(
                 activity.getResources().getString(R.string.upgrade_to_pro),
-                R.drawable.ic_attach_money_black_24dp,
+                R.drawable.ic_outline_attach_money_24px,
                 new Intent(activity, PurchaseActivity.class),
                 REQUEST_PURCHASE));
       }
@@ -363,7 +363,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
       add(
           new NavigationDrawerAction(
               activity.getResources().getString(R.string.TLA_menu_settings),
-              R.drawable.ic_settings_24dp,
+              R.drawable.ic_outline_settings_24px,
               new Intent(activity, BasicPreferences.class),
               REQUEST_SETTINGS));
     }
diff --git a/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java b/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java
index c6a42ab62..17f150238 100644
--- a/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.java
@@ -34,7 +34,7 @@ public class CaldavFilter extends Filter {
         }
       };
 
-  private static final int TAG = R.drawable.ic_cloud_black_24dp;
+  private static final int TAG = R.drawable.ic_outline_cloud_24px;
   private CaldavCalendar calendar;
 
   private CaldavFilter() {
diff --git a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
index 4c7729c0b..0b20fa7eb 100644
--- a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
@@ -35,7 +35,7 @@ public class GtasksFilter extends Filter {
         }
       };
 
-  private static final int CLOUD = R.drawable.ic_cloud_black_24dp;
+  private static final int CLOUD = R.drawable.ic_outline_cloud_24px;
   private GoogleTaskList list;
 
   private GtasksFilter() {
diff --git a/app/src/main/java/com/todoroo/astrid/api/TagFilter.java b/app/src/main/java/com/todoroo/astrid/api/TagFilter.java
index 15e376bab..28d821807 100644
--- a/app/src/main/java/com/todoroo/astrid/api/TagFilter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/TagFilter.java
@@ -35,7 +35,7 @@ public class TagFilter extends Filter {
         }
       };
 
-  private static final int TAG = R.drawable.ic_label_24dp;
+  private static final int TAG = R.drawable.ic_outline_label_24px;
   private String uuid;
 
   private TagFilter() {
diff --git a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
index d07dd01a9..21c2a8059 100644
--- a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
@@ -104,7 +104,7 @@ public final class BuiltInFilterExposer {
 
   public Filter getMyTasksFilter() {
     Filter myTasksFilter = getMyTasksFilter(context.getResources());
-    myTasksFilter.icon = R.drawable.ic_inbox_24dp;
+    myTasksFilter.icon = R.drawable.ic_outline_all_inbox_24px;
     return myTasksFilter;
   }
 
@@ -115,17 +115,17 @@ public final class BuiltInFilterExposer {
 
     if (preferences.getBoolean(R.string.p_show_today_filter, true)) {
       Filter todayFilter = getTodayFilter(r);
-      todayFilter.icon = R.drawable.ic_today_24dp;
+      todayFilter.icon = R.drawable.ic_outline_today_24px;
       filters.add(todayFilter);
     }
     if (preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) {
       Filter recentlyModifiedFilter = getRecentlyModifiedFilter(r);
-      recentlyModifiedFilter.icon = R.drawable.ic_history_24dp;
+      recentlyModifiedFilter.icon = R.drawable.ic_outline_history_24px;
       filters.add(recentlyModifiedFilter);
     }
     if (preferences.getBoolean(R.string.p_show_not_in_list_filter, true)) {
       Filter uncategorizedFilter = getUncategorizedFilter(r);
-      uncategorizedFilter.icon = R.drawable.ic_label_outline_24dp;
+      uncategorizedFilter.icon = R.drawable.ic_outline_label_off_24px;
       filters.add(uncategorizedFilter);
     }
     // transmit filter list
diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 10d2363ee..610ae98e6 100644
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -121,7 +121,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity
     setContentView(R.layout.custom_filter_activity);
     ButterKnife.bind(this);
 
-    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_close_24dp));
+    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_clear_24px));
     toolbar.setTitle(R.string.FLA_new_filter);
     toolbar.inflateMenu(R.menu.menu_custom_filter_activity);
     toolbar.setOnMenuItemClickListener(this);
diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
index 7725b5900..058aa9ebd 100644
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -20,7 +20,7 @@ import org.tasks.data.FilterDao;
 
 public final class CustomFilterExposer {
 
-  private static final int filter = R.drawable.ic_filter_list_24dp;
+  private static final int filter = R.drawable.ic_outline_filter_list_24px;
   private final FilterDao filterDao;
 
   @Inject
diff --git a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
index 9c0fbde42..bcc4d5364 100644
--- a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
@@ -118,7 +118,7 @@ public class FilesControlSet extends TaskEditControlFragment {
 
   @Override
   public int getIcon() {
-    return R.drawable.ic_attachment_24dp;
+    return R.drawable.ic_outline_attachment_24px;
   }
 
   @Override
diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index a8a3d6d01..890bc2594 100644
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -204,7 +204,7 @@ public class RepeatControlSet extends TaskEditControlFragment {
 
   @Override
   public int getIcon() {
-    return R.drawable.ic_repeat_24dp;
+    return R.drawable.ic_outline_repeat_24px;
   }
 
   @Override
diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
index 57fc5199c..8b21e3ede 100644
--- a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
@@ -137,7 +137,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
             ThemeColor themeColor =
                 themeCache.getThemeColor(tagData.getColor() >= 0 ? tagData.getColor() : 19);
             view.setText(tagData.getName());
-            Drawable original = ContextCompat.getDrawable(getContext(), R.drawable.ic_label_24dp);
+            Drawable original = ContextCompat.getDrawable(getContext(), R.drawable.ic_outline_label_24px);
             Drawable wrapped = DrawableCompat.wrap(original.mutate());
             DrawableCompat.setTint(wrapped, themeColor.getPrimaryColor());
             if (atLeastJellybeanMR1()) {
@@ -333,7 +333,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
 
   @Override
   public int getIcon() {
-    return R.drawable.ic_label_24dp;
+    return R.drawable.ic_outline_label_24px;
   }
 
   @Override
diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
index d57a4c06c..7f74de03a 100644
--- a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
@@ -151,7 +151,7 @@ public class TimerControlSet extends TaskEditControlFragment {
 
   @Override
   public int getIcon() {
-    return R.drawable.ic_timer_24dp;
+    return R.drawable.ic_outline_timer_24px;
   }
 
   @Override
@@ -205,7 +205,7 @@ public class TimerControlSet extends TaskEditControlFragment {
 
   private void updateChronometer() {
     timerButton.setImageResource(
-        timerActive() ? R.drawable.ic_pause_24dp : R.drawable.ic_play_arrow_24dp);
+        timerActive() ? R.drawable.ic_outline_pause_24px: R.drawable.ic_outline_play_arrow_24px);
 
     long elapsed = this.elapsed.getTimeDurationInSeconds() * 1000L;
     if (timerActive()) {
diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java
index 8cc43b1ae..9326b14da 100644
--- a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java
@@ -43,7 +43,7 @@ public final class TimerFilterExposer {
             r.getString(R.string.TFE_workingOn),
             new QueryTemplate()
                 .where(Criterion.and(Task.TIMER_START.gt(0), Task.DELETION_DATE.eq(0))));
-    filter.icon = R.drawable.ic_timer_24dp;
+    filter.icon = R.drawable.ic_outline_timer_24px;
     return filter;
   }
 
diff --git a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
index 5a2e0fde1..1c910e3ae 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
@@ -182,7 +182,7 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt
 
   @Override
   protected int getIcon() {
-    return R.drawable.ic_visibility_off_24dp;
+    return R.drawable.ic_outline_visibility_off_24px;
   }
 
   @Override
diff --git a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
index aa07cc8da..85356b727 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -185,7 +185,7 @@ public class ReminderControlSet extends TaskEditControlFragment {
 
   @Override
   public int getIcon() {
-    return R.drawable.ic_notifications_24dp;
+    return R.drawable.ic_outline_notifications_24px;
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java b/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
index ca0c46132..cd3d02c11 100644
--- a/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
+++ b/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
@@ -58,7 +58,7 @@ public class CalendarSelectionDialog extends InjectingDialogFragment {
         new SingleCheckedArrayAdapter(getActivity(), calendarNames, theme.getThemeAccent()) {
           @Override
           protected int getDrawable(int position) {
-            return R.drawable.ic_event_24dp;
+            return R.drawable.ic_outline_event_24px;
           }
 
           @Override
diff --git a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
index 1168d919c..9b7aab7f5 100644
--- a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
@@ -63,7 +63,7 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity
     final boolean backButtonSavesTask = preferences.backButtonSavesTask();
     toolbar.setNavigationIcon(
         ContextCompat.getDrawable(
-            this, backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
+            this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
     toolbar.setTitle(filter.listingTitle);
     toolbar.setNavigationOnClickListener(
         v -> {
diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
index e5c17927f..58ecc47ec 100644
--- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
@@ -105,7 +105,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
     toolbar.setTitle(isNewList ? getString(R.string.new_list) : gtasksList.getTitle());
     toolbar.setNavigationIcon(
         ContextCompat.getDrawable(
-            this, backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
+            this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
     toolbar.setNavigationOnClickListener(
         v -> {
           if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
index 2c70fbe76..1f2dd22a9 100644
--- a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
@@ -98,7 +98,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity
     toolbar.setTitle(isNewTag ? getString(R.string.new_tag) : tagData.getName());
     toolbar.setNavigationIcon(
         ContextCompat.getDrawable(
-            this, backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
+            this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
     toolbar.setNavigationOnClickListener(
         v -> {
           if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.java b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
index e2e177224..a5bbf089d 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseActivity.java
+++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
@@ -85,7 +85,7 @@ public class PurchaseActivity extends ThemedInjectingAppCompatActivity
     ButterKnife.bind(this);
 
     toolbar.setTitle(R.string.upgrade);
-    toolbar.setNavigationIcon(R.drawable.ic_arrow_back_24dp);
+    toolbar.setNavigationIcon(R.drawable.ic_outline_arrow_back_24px);
     toolbar.setNavigationOnClickListener(v -> onBackPressed());
     toolbar.inflateMenu(R.menu.menu_purchase_activity);
     toolbar.setOnMenuItemClickListener(this);
diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
index c59ae7ec9..bf29b3f6e 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
@@ -113,7 +113,7 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
         caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName());
     toolbar.setNavigationIcon(
         ContextCompat.getDrawable(
-            this, backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
+            this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
     toolbar.setNavigationOnClickListener(
         v -> {
           if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
index 91e9e19db..12fa8cd89 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
@@ -121,7 +121,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
         caldavCalendar == null ? getString(R.string.new_list) : caldavCalendar.getName());
     toolbar.setNavigationIcon(
         ContextCompat.getDrawable(
-            this, backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
+            this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
     toolbar.setNavigationOnClickListener(
         v -> {
           if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java b/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java
index ac91f6bde..96715880d 100644
--- a/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java
@@ -62,8 +62,8 @@ public class ColorPickerDialog extends InjectingDialogFragment {
           @Override
           protected int getDrawable(int position) {
             return inventory.purchasedThemes() || items.get(position).isFree()
-                ? R.drawable.ic_lens_black_24dp
-                : R.drawable.ic_vpn_key_black_24dp;
+                ? R.drawable.ic_outline_lens_24px
+                : R.drawable.ic_outline_vpn_key_24px;
           }
 
           @Override
diff --git a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
index 4db893bd1..093897d6e 100644
--- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
+++ b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
@@ -241,7 +241,7 @@ public class CommentBarFragment extends TaskEditControlFragment {
     getActivity().getTheme().resolveAttribute(R.attr.actionBarPrimaryText, typedValue, true);
     Drawable drawable =
         DrawableCompat.wrap(
-            ContextCompat.getDrawable(getContext(), R.drawable.ic_camera_alt_black_24dp));
+            ContextCompat.getDrawable(getContext(), R.drawable.ic_outline_photo_camera_24px));
     drawable.mutate();
     DrawableCompat.setTint(drawable, typedValue.data);
     pictureButton.setImageDrawable(drawable);
diff --git a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
index 7f5095d3a..14717c136 100644
--- a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
+++ b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
@@ -70,7 +70,7 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
       Timber.e(e);
       toolbar.setTitle(getTitle());
     }
-    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_arrow_back_24dp));
+    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px));
     toolbar.setNavigationOnClickListener(v -> finish());
     toolbar.inflateMenu(R.menu.menu_preferences);
     toolbar.setOnMenuItemClickListener(this);
diff --git a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java
index 8d18c5285..b9630cdb1 100755
--- a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java
+++ b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java
@@ -63,7 +63,7 @@ public final class TaskerCreateTaskActivity extends AbstractFragmentPluginAppCom
     final boolean backButtonSavesTask = preferences.backButtonSavesTask();
     toolbar.setNavigationIcon(
         ContextCompat.getDrawable(
-            this, backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp));
+            this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
     toolbar.setNavigationOnClickListener(
         v -> {
           if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/ui/CalendarControlSet.java b/app/src/main/java/org/tasks/ui/CalendarControlSet.java
index 8c67c99e8..e42a557d4 100644
--- a/app/src/main/java/org/tasks/ui/CalendarControlSet.java
+++ b/app/src/main/java/org/tasks/ui/CalendarControlSet.java
@@ -112,7 +112,7 @@ public class CalendarControlSet extends TaskEditControlFragment {
 
   @Override
   protected int getIcon() {
-    return R.drawable.ic_event_24dp;
+    return R.drawable.ic_outline_event_24px;
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/ui/CheckBoxes.java b/app/src/main/java/org/tasks/ui/CheckBoxes.java
index 6f1bc761b..659bdaad2 100644
--- a/app/src/main/java/org/tasks/ui/CheckBoxes.java
+++ b/app/src/main/java/org/tasks/ui/CheckBoxes.java
@@ -27,9 +27,9 @@ public class CheckBoxes {
 
   @Inject
   public CheckBoxes(@ForApplication Context context) {
-    checkboxes = wrapDrawable(context, R.drawable.ic_check_box_outline_blank_24dp);
-    repeatingCheckboxes = wrapDrawable(context, R.drawable.ic_repeat_24dp);
-    completedCheckboxes = wrapDrawable(context, R.drawable.ic_check_box_24dp);
+    checkboxes = wrapDrawable(context, R.drawable.ic_outline_check_box_outline_blank_24px);
+    repeatingCheckboxes = wrapDrawable(context, R.drawable.ic_outline_repeat_24px);
+    completedCheckboxes = wrapDrawable(context, R.drawable.ic_outline_check_box_24px);
     priorityColors =
         ImmutableList.of(
             getColor(context, R.color.priority_1),
diff --git a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
index 4115fc9ba..02863ec1b 100644
--- a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -279,7 +279,7 @@ public class DeadlineControlSet extends TaskEditControlFragment {
 
   @Override
   protected int getIcon() {
-    return R.drawable.ic_schedule_24dp;
+    return R.drawable.ic_outline_schedule_24px;
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/ui/DescriptionControlSet.java b/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
index aa7a0555c..bab9cdcfc 100644
--- a/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
+++ b/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
@@ -61,7 +61,7 @@ public class DescriptionControlSet extends TaskEditControlFragment {
 
   @Override
   protected int getIcon() {
-    return R.drawable.ic_event_note_24dp;
+    return R.drawable.ic_outline_event_note_24px;
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/ui/PriorityControlSet.java b/app/src/main/java/org/tasks/ui/PriorityControlSet.java
index de57627b9..64db7bc59 100644
--- a/app/src/main/java/org/tasks/ui/PriorityControlSet.java
+++ b/app/src/main/java/org/tasks/ui/PriorityControlSet.java
@@ -101,7 +101,7 @@ public class PriorityControlSet extends TaskEditControlFragment {
 
   @Override
   protected int getIcon() {
-    return R.drawable.ic_flag_24dp;
+    return R.drawable.ic_outline_flag_24px;
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/ui/RemoteListFragment.java b/app/src/main/java/org/tasks/ui/RemoteListFragment.java
index 072d14f66..feb6382ee 100644
--- a/app/src/main/java/org/tasks/ui/RemoteListFragment.java
+++ b/app/src/main/java/org/tasks/ui/RemoteListFragment.java
@@ -129,7 +129,7 @@ public class RemoteListFragment extends TaskEditControlFragment {
 
   @Override
   protected int getIcon() {
-    return R.drawable.ic_cloud_black_24dp;
+    return R.drawable.ic_outline_cloud_24px;
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java
index f34412eff..b2a0ae398 100644
--- a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java
+++ b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java
@@ -51,7 +51,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter<String> {
                 ResourcesCompat.getColor(context.getResources(), android.R.color.transparent, null),
                 accent.getAccentColor()
               });
-      Drawable original = ContextCompat.getDrawable(context, R.drawable.ic_check_black_24dp);
+      Drawable original = ContextCompat.getDrawable(context, R.drawable.ic_outline_done_24px);
       Drawable wrapped = DrawableCompat.wrap(original.mutate());
       DrawableCompat.setTintList(wrapped, tintList);
       view.setCheckMarkDrawable(wrapped);
diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java
index faec3d8d7..34ef19241 100644
--- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java
+++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.java
@@ -68,7 +68,7 @@ public class ShortcutConfigActivity extends InjectingAppCompatActivity {
     ButterKnife.bind(this);
 
     toolbar.setTitle(R.string.FSA_label);
-    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_save_24dp));
+    toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px));
     toolbar.setNavigationOnClickListener(v -> save());
     MenuColorizer.colorToolbar(this, toolbar);
 
diff --git a/app/src/main/res/drawable/checkmark.xml b/app/src/main/res/drawable/checkmark.xml
index ccd8b89af..4d72e98da 100644
--- a/app/src/main/res/drawable/checkmark.xml
+++ b/app/src/main/res/drawable/checkmark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_check_black_24dp" android:state_checked="true"/>
+  <item android:drawable="@drawable/ic_outline_done_24px" android:state_checked="true"/>
   <item android:state_checked="false">
     <shape/>
   </item>
diff --git a/app/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml
deleted file mode 100644
index 363cebc63..000000000
--- a/app/src/main/res/drawable/ic_add_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
deleted file mode 100644
index a3e79e7b6..000000000
--- a/app/src/main/res/drawable/ic_arrow_back_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_attachment_24dp.xml b/app/src/main/res/drawable/ic_attachment_24dp.xml
deleted file mode 100644
index d9bc3d511..000000000
--- a/app/src/main/res/drawable/ic_attachment_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M7.5,18C4.46,18 2,15.54 2,12.5S4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v1.5H9.5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1H18c1.38,0 2.5,-1.12 2.5,-2.5S19.38,8.5 18,8.5H7.5c-2.21,0 -4,1.79 -4,4s1.79,4 4,4H17V18H7.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml
deleted file mode 100644
index 0b35f9479..000000000
--- a/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_cancel_24dp.xml b/app/src/main/res/drawable/ic_cancel_24dp.xml
deleted file mode 100644
index 5e9b5b27e..000000000
--- a/app/src/main/res/drawable/ic_cancel_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zm5,13.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_check_black_24dp.xml b/app/src/main/res/drawable/ic_check_black_24dp.xml
deleted file mode 100644
index e8eb34d3a..000000000
--- a/app/src/main/res/drawable/ic_check_black_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_check_box_24dp.xml b/app/src/main/res/drawable/ic_check_box_24dp.xml
deleted file mode 100644
index 413d3583f..000000000
--- a/app/src/main/res/drawable/ic_check_box_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zm-9,14l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml
deleted file mode 100644
index c29ca58ff..000000000
--- a/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml
deleted file mode 100644
index c5a77c119..000000000
--- a/app/src/main/res/drawable/ic_close_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_cloud_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_black_24dp.xml
deleted file mode 100644
index 884b2aaf0..000000000
--- a/app/src/main/res/drawable/ic_cloud_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_cloud_off_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_off_black_24dp.xml
deleted file mode 100644
index 022df57e8..000000000
--- a/app/src/main/res/drawable/ic_cloud_off_black_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml
deleted file mode 100644
index 9ea11bf4a..000000000
--- a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml
deleted file mode 100644
index 3f7ef7a93..000000000
--- a/app/src/main/res/drawable/ic_delete_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
deleted file mode 100644
index e2029f4e7..000000000
--- a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_event_24dp.xml b/app/src/main/res/drawable/ic_event_24dp.xml
deleted file mode 100644
index a77ae741f..000000000
--- a/app/src/main/res/drawable/ic_event_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M17,12h-5v5h5v-5zM16,1v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-1V1h-2zm3,18H5V8h14v11z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_event_note_24dp.xml b/app/src/main/res/drawable/ic_event_note_24dp.xml
deleted file mode 100644
index 12c5b6566..000000000
--- a/app/src/main/res/drawable/ic_event_note_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M17,10H7v2h10v-2zm2,-7h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zm-5,-5H7v2h7v-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_filter_list_24dp.xml b/app/src/main/res/drawable/ic_filter_list_24dp.xml
deleted file mode 100644
index e7b23ed2d..000000000
--- a/app/src/main/res/drawable/ic_filter_list_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M10,18h4v-2h-4v2zM3,6v2h18V6H3zm3,7h12v-2H6v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_flag_24dp.xml b/app/src/main/res/drawable/ic_flag_24dp.xml
deleted file mode 100644
index 59fd1fbb7..000000000
--- a/app/src/main/res/drawable/ic_flag_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_help_24dp.xml b/app/src/main/res/drawable/ic_help_24dp.xml
deleted file mode 100644
index a7370fa1f..000000000
--- a/app/src/main/res/drawable/ic_help_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,17h-2v-2h2v2zm2.07,-7.75l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2H8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_24dp.xml
deleted file mode 100644
index 42ea5d8da..000000000
--- a/app/src/main/res/drawable/ic_history_24dp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillAlpha=".9"
-    android:fillColor="#FF000000"
-    android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm-1,5v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_inbox_168px.xml b/app/src/main/res/drawable/ic_inbox_168px.xml
deleted file mode 100644
index 1f8aeed80..000000000
--- a/app/src/main/res/drawable/ic_inbox_168px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="168dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="168dp">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_inbox_24dp.xml b/app/src/main/res/drawable/ic_inbox_24dp.xml
deleted file mode 100644
index 6ee0a023a..000000000
--- a/app/src/main/res/drawable/ic_inbox_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_label_24dp.xml b/app/src/main/res/drawable/ic_label_24dp.xml
deleted file mode 100644
index 0d98c5205..000000000
--- a/app/src/main/res/drawable/ic_label_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_label_outline_24dp.xml b/app/src/main/res/drawable/ic_label_outline_24dp.xml
deleted file mode 100644
index 0201881c0..000000000
--- a/app/src/main/res/drawable/ic_label_outline_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16zM16,17H5V7h11l3.55,5L16,17z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_lens_black_24dp.xml b/app/src/main/res/drawable/ic_lens_black_24dp.xml
deleted file mode 100644
index 46278c79a..000000000
--- a/app/src/main/res/drawable/ic_lens_black_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_24dp.xml b/app/src/main/res/drawable/ic_menu_24dp.xml
deleted file mode 100644
index 2eac24f73..000000000
--- a/app/src/main/res/drawable/ic_menu_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_mic_24dp.xml b/app/src/main/res/drawable/ic_mic_24dp.xml
deleted file mode 100644
index 31c2601e6..000000000
--- a/app/src/main/res/drawable/ic_mic_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zm5.3,-3c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11H5c0,3.41 2.72,6.23 6,6.72V21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_24dp.xml b/app/src/main/res/drawable/ic_notifications_24dp.xml
deleted file mode 100644
index f4992d708..000000000
--- a/app/src/main/res/drawable/ic_notifications_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_outline_add_24px.xml b/app/src/main/res/drawable/ic_outline_add_24px.xml
new file mode 100644
index 000000000..0aacf0595
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_add_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_all_inbox_24px.xml b/app/src/main/res/drawable/ic_outline_all_inbox_24px.xml
new file mode 100644
index 000000000..127e6a61e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_all_inbox_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM5,10h3.13c0.21,0.78 0.67,1.47 1.27,2L5,12v-2zM19,12h-4.4c0.6,-0.53 1.06,-1.22 1.27,-2L19,10v2zM19,8h-5v1c0,1.07 -0.93,2 -2,2s-2,-0.93 -2,-2L10,8L5,8L5,5h14v3zM17,15h-3v1c0,0.47 -0.19,0.9 -0.48,1.25 -0.37,0.45 -0.92,0.75 -1.52,0.75s-1.15,-0.3 -1.52,-0.75c-0.29,-0.35 -0.48,-0.78 -0.48,-1.25v-1L3,15v4c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-4h-4zM5,17h3.13c0.02,0.09 0.06,0.17 0.09,0.25 0.24,0.68 0.65,1.28 1.18,1.75L5,19v-2zM19,19h-4.4c0.54,-0.47 0.95,-1.07 1.18,-1.75 0.03,-0.08 0.07,-0.16 0.09,-0.25L19,17v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_arrow_back_24px.xml b/app/src/main/res/drawable/ic_outline_arrow_back_24px.xml
new file mode 100644
index 000000000..e726ae270
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_arrow_back_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_attach_money_black_24dp.xml b/app/src/main/res/drawable/ic_outline_attach_money_24px.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_attach_money_black_24dp.xml
rename to app/src/main/res/drawable/ic_outline_attach_money_24px.xml
index 4c88aeeb5..720f9d0b0 100644
--- a/app/src/main/res/drawable/ic_attach_money_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_outline_attach_money_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_attachment_24px.xml b/app/src/main/res/drawable/ic_outline_attachment_24px.xml
new file mode 100644
index 000000000..8bbf3289a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_attachment_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18.5,16H7c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h12.5c1.38,0 2.5,1.12 2.5,2.5S20.88,13 19.5,13H9c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h9.5V9.5H9c-1.38,0 -2.5,1.12 -2.5,2.5s1.12,2.5 2.5,2.5h10.5c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4H7c-3.04,0 -5.5,2.46 -5.5,5.5s2.46,5.5 5.5,5.5h11.5V16z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_check_box_24px.xml b/app/src/main/res/drawable/ic_outline_check_box_24px.xml
new file mode 100644
index 000000000..000fc8ac4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_check_box_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM17.99,9l-1.41,-1.42 -6.59,6.59 -2.58,-2.57 -1.42,1.41 4,3.99z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_check_box_outline_blank_24px.xml b/app/src/main/res/drawable/ic_outline_check_box_outline_blank_24px.xml
new file mode 100644
index 000000000..b49409d92
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_check_box_outline_blank_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_clear_24px.xml b/app/src/main/res/drawable/ic_outline_clear_24px.xml
new file mode 100644
index 000000000..2e49e6b20
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_clear_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_cloud_24px.xml b/app/src/main/res/drawable/ic_outline_cloud_24px.xml
new file mode 100644
index 000000000..22dba34be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_cloud_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5 1.53,0.11c1.56,0.1 2.78,1.41 2.78,2.96 0,1.65 -1.35,3 -3,3H6c-2.21,0 -4,-1.79 -4,-4 0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11 0.5,-0.95C8.08,7.14 9.94,6 12,6m0,-2C9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96C18.67,6.59 15.64,4 12,4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_cloud_off_24px.xml b/app/src/main/res/drawable/ic_outline_cloud_off_24px.xml
new file mode 100644
index 000000000..11b661208
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_cloud_off_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96C18.67,6.59 15.64,4 12,4c-1.33,0 -2.57,0.36 -3.65,0.97l1.49,1.49C10.51,6.17 11.23,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,0.99 -0.48,1.85 -1.21,2.4l1.41,1.41c1.09,-0.92 1.8,-2.27 1.8,-3.81zM4.41,3.86L3,5.27l2.77,2.77h-0.42C2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h11.73l2,2 1.41,-1.41L4.41,3.86zM6,18c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73l8,8H6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_delete_24px.xml b/app/src/main/res/drawable/ic_outline_delete_24px.xml
new file mode 100644
index 000000000..2f7ab5275
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_delete_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_done_24px.xml b/app/src/main/res/drawable/ic_outline_done_24px.xml
new file mode 100644
index 000000000..7615580ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_done_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_drag_handle_24px.xml b/app/src/main/res/drawable/ic_outline_drag_handle_24px.xml
new file mode 100644
index 000000000..896d028cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_drag_handle_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_event_24px.xml b/app/src/main/res/drawable/ic_outline_event_24px.xml
new file mode 100644
index 000000000..57c00d1b7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_event_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,10h14v10zM19,8L5,8L5,6h14v2zM12,13h5v5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_event_note_24px.xml b/app/src/main/res/drawable/ic_outline_event_note_24px.xml
new file mode 100644
index 000000000..7448071f7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_event_note_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,9h14v10zM5,7L5,5h14v2L5,7zM7,11h10v2L7,13zM7,15h7v2L7,17z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_file_copy_24px.xml b/app/src/main/res/drawable/ic_outline_file_copy_24px.xml
new file mode 100644
index 000000000..a09a39607
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_file_copy_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_filter_list_24px.xml b/app/src/main/res/drawable/ic_outline_filter_list_24px.xml
new file mode 100644
index 000000000..a8ff6e96f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_filter_list_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_flag_24px.xml b/app/src/main/res/drawable/ic_outline_flag_24px.xml
new file mode 100644
index 000000000..b970cd9a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_flag_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12.36,6l0.4,2H18v6h-3.36l-0.4,-2H7V6h5.36M14,4H5v17h2v-7h5.6l0.4,2h7V6h-5.6L14,4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_help_outline_24px.xml b/app/src/main/res/drawable/ic_outline_help_outline_24px.xml
new file mode 100644
index 000000000..9decd6ae2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_help_outline_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_history_24px.xml b/app/src/main/res/drawable/ic_outline_history_24px.xml
new file mode 100644
index 000000000..f4f2d8533
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_history_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_inbox_168px.xml b/app/src/main/res/drawable/ic_outline_inbox_168px.xml
new file mode 100644
index 000000000..a4c077a0b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_inbox_168px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="168dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="168dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19v-3h3.56c0.69,1.19 1.97,2 3.45,2s2.75,-0.81 3.45,-2L19,16v3zM19,14h-4.99c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2L5,14L5,5h14v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_label_24px.xml b/app/src/main/res/drawable/ic_outline_label_24px.xml
new file mode 100644
index 000000000..d9120ff39
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_label_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16zM16,17H5V7h11l3.55,5L16,17z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_label_off_24px.xml b/app/src/main/res/drawable/ic_outline_label_off_24px.xml
new file mode 100644
index 000000000..9ab352318
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_label_off_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M16,7l3.55,5 -1.63,2.29 1.43,1.43L22,12l-4.37,-6.16C17.27,5.33 16.67,5 16,5l-7.37,0.01 2,1.99H16zM2,4.03l1.58,1.58C3.22,5.96 3,6.46 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.28,0 0.55,-0.07 0.79,-0.18L18.97,21l1.41,-1.41L3.41,2.62 2,4.03zM14.97,17H5V7.03L14.97,17z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_lens_24px.xml b/app/src/main/res/drawable/ic_outline_lens_24px.xml
new file mode 100644
index 000000000..b1e489055
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_lens_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,4c4.41,0 8,3.59 8,8s-3.59,8 -8,8 -8,-3.59 -8,-8 3.59,-8 8,-8m0,-2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_menu_24px.xml b/app/src/main/res/drawable/ic_outline_menu_24px.xml
new file mode 100644
index 000000000..3b8f46de4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_menu_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_mic_none_24px.xml b/app/src/main/res/drawable/ic_outline_mic_none_24px.xml
new file mode 100644
index 000000000..9bee8c19b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_mic_none_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,14c1.66,0 3,-1.34 3,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,5zM17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5L5,11c0,3.53 2.61,6.43 6,6.92L11,21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_notifications_24px.xml b/app/src/main/res/drawable/ic_outline_notifications_24px.xml
new file mode 100644
index 000000000..08b4b8e3a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_notifications_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_pause_24px.xml b/app/src/main/res/drawable/ic_outline_pause_24px.xml
new file mode 100644
index 000000000..c6f22f10d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_pause_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_photo_camera_24px.xml b/app/src/main/res/drawable/ic_outline_photo_camera_24px.xml
new file mode 100644
index 000000000..4c1b9b249
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_photo_camera_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M14.12,4l1.83,2L20,6v12L4,18L4,6h4.05l1.83,-2h4.24M15,2L9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2zM12,9c1.65,0 3,1.35 3,3s-1.35,3 -3,3 -3,-1.35 -3,-3 1.35,-3 3,-3m0,-2c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_play_arrow_24px.xml b/app/src/main/res/drawable/ic_outline_play_arrow_24px.xml
new file mode 100644
index 000000000..83d071d75
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_play_arrow_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,8.64L15.27,12 10,15.36V8.64M8,5v14l11,-7L8,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_repeat_24px.xml b/app/src/main/res/drawable/ic_outline_repeat_24px.xml
new file mode 100644
index 000000000..b97a31444
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_repeat_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_save_24px.xml b/app/src/main/res/drawable/ic_outline_save_24px.xml
new file mode 100644
index 000000000..17ded6e63
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_save_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM19,19L5,19L5,5h11.17L19,7.83L19,19zM12,12c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3zM6,6h9v4L6,10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_schedule_24px.xml b/app/src/main/res/drawable/ic_outline_schedule_24px.xml
new file mode 100644
index 000000000..bae093b8d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_schedule_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7L11,7v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_search_24px.xml b/app/src/main/res/drawable/ic_outline_search_24px.xml
new file mode 100644
index 000000000..3d2510add
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_search_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_settings_24px.xml b/app/src/main/res/drawable/ic_outline_settings_24px.xml
new file mode 100644
index 000000000..546a6c3f3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_settings_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_sort_24px.xml b/app/src/main/res/drawable/ic_outline_sort_24px.xml
new file mode 100644
index 000000000..1bee3be4d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_sort_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sync_problem_black_24dp.xml b/app/src/main/res/drawable/ic_outline_sync_problem_24px.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_sync_problem_black_24dp.xml
rename to app/src/main/res/drawable/ic_outline_sync_problem_24px.xml
index 5d2720bc8..8392c5029 100644
--- a/app/src/main/res/drawable/ic_sync_problem_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_outline_sync_problem_24px.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3,12c0,2.21 0.91,4.2 2.36,5.64L3,20h6v-6l-2.24,2.24C5.68,15.15 5,13.66 5,12c0,-2.61 1.67,-4.83 4,-5.65L9,4.26C5.55,5.15 3,8.27 3,12zM11,17h2v-2h-2v2zM21,4h-6v6l2.24,-2.24C18.32,8.85 19,10.34 19,12c0,2.61 -1.67,4.83 -4,5.65v2.09c3.45,-0.89 6,-4.01 6,-7.74 0,-2.21 -0.91,-4.2 -2.36,-5.64L21,4zM11,13h2L13,7h-2v6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_timer_24px.xml b/app/src/main/res/drawable/ic_outline_timer_24px.xml
new file mode 100644
index 000000000..22e679415
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_timer_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.07,1.01h-6v2h6v-2zM11.07,14.01h2v-6h-2v6zM19.1,7.39l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.14,4.74 14.19,4 12.07,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.11 -0.74,-4.06 -1.97,-5.61zM12.07,20.01c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_today_24px.xml b/app/src/main/res/drawable/ic_outline_today_24px.xml
new file mode 100644
index 000000000..8c36ff11a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_today_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,9h14v10zM19,7L5,7L5,5h14v2zM7,11h5v5L7,16z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_visibility_off_24px.xml b/app/src/main/res/drawable/ic_outline_visibility_off_24px.xml
new file mode 100644
index 000000000..b8bee090b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_visibility_off_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_vpn_key_24px.xml b/app/src/main/res/drawable/ic_outline_vpn_key_24px.xml
new file mode 100644
index 000000000..8501c7579
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_vpn_key_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M22,19h-6v-4h-2.68c-1.14,2.42 -3.6,4 -6.32,4 -3.86,0 -7,-3.14 -7,-7s3.14,-7 7,-7c2.72,0 5.17,1.58 6.32,4L24,9v6h-2v4zM18,17h2v-4h2v-2L11.94,11l-0.23,-0.67C11.01,8.34 9.11,7 7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5c2.11,0 4.01,-1.34 4.71,-3.33l0.23,-0.67L18,13v4zM7,15c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3 3,1.35 3,3 -1.35,3 -3,3zM7,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml
deleted file mode 100644
index 1786cf2ef..000000000
--- a/app/src/main/res/drawable/ic_pause_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M6,19h4V5H6v14zm8,-14v14h4V5h-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml
deleted file mode 100644
index 112579a1f..000000000
--- a/app/src/main/res/drawable/ic_play_arrow_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M8,5v14l11,-7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_24dp.xml b/app/src/main/res/drawable/ic_repeat_24dp.xml
deleted file mode 100644
index 7468118a4..000000000
--- a/app/src/main/res/drawable/ic_repeat_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M7,7h10v3l4,-4 -4,-4v3H5v6h2V7zm10,10H7v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml
deleted file mode 100644
index 4f8bdc8ca..000000000
--- a/app/src/main/res/drawable/ic_save_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M17,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V7l-4,-4zm-5,16c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zm3,-10H5V5h10v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_schedule_24dp.xml b/app/src/main/res/drawable/ic_schedule_24dp.xml
deleted file mode 100644
index 473579d3c..000000000
--- a/app/src/main/res/drawable/ic_schedule_24dp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillAlpha=".9"
-    android:fillColor="#FF000000"
-    android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml
deleted file mode 100644
index bf9bd3f73..000000000
--- a/app/src/main/res/drawable/ic_search_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml
deleted file mode 100644
index d135e523b..000000000
--- a/app/src/main/res/drawable/ic_settings_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_sort_24dp.xml b/app/src/main/res/drawable/ic_sort_24dp.xml
deleted file mode 100644
index d872e01a6..000000000
--- a/app/src/main/res/drawable/ic_sort_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M3,18h6v-2H3v2zM3,6v2h18V6H3zm0,7h12v-2H3v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_timer_24dp.xml b/app/src/main/res/drawable/ic_timer_24dp.xml
deleted file mode 100644
index 894bdcf20..000000000
--- a/app/src/main/res/drawable/ic_timer_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M15,1H9v2h6V1zm-4,13h2V8h-2v6zm8.03,-6.61l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_today_24dp.xml b/app/src/main/res/drawable/ic_today_24dp.xml
deleted file mode 100644
index 0cc4a1ef2..000000000
--- a/app/src/main/res/drawable/ic_today_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M19,3h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zM7,10h5v5H7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_visibility_off_24dp.xml b/app/src/main/res/drawable/ic_visibility_off_24dp.xml
deleted file mode 100644
index aabe5d142..000000000
--- a/app/src/main/res/drawable/ic_visibility_off_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zm4.31,-0.78l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
deleted file mode 100644
index 810e5061d..000000000
--- a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:autoMirrored="true"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp"
-  tools:ignore="UnusedAttribute,VectorRaster">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
-</vector>
diff --git a/app/src/main/res/layout/astrid_calendar_reminder_view.xml b/app/src/main/res/layout/astrid_calendar_reminder_view.xml
index 9205041f7..ce1246c8d 100644
--- a/app/src/main/res/layout/astrid_calendar_reminder_view.xml
+++ b/app/src/main/res/layout/astrid_calendar_reminder_view.xml
@@ -37,7 +37,7 @@
       android:layout_width="25dip"
       android:layout_height="25dip"
       android:scaleType="fitCenter"
-      android:src="@drawable/ic_close_24dp"
+      android:src="@drawable/ic_outline_clear_24px"
       android:tint="@android:color/white"/>
 
   </LinearLayout>
@@ -134,7 +134,7 @@
       android:padding="4dip"
       android:background="@android:color/transparent"
       android:scaleType="fitCenter"
-      android:src="@drawable/ic_settings_24dp"
+      android:src="@drawable/ic_outline_settings_24px"
       android:tint="@android:color/white"/>
   </RelativeLayout>
 
diff --git a/app/src/main/res/layout/control_set_clear_button.xml b/app/src/main/res/layout/control_set_clear_button.xml
index f3562af8e..685a05084 100644
--- a/app/src/main/res/layout/control_set_clear_button.xml
+++ b/app/src/main/res/layout/control_set_clear_button.xml
@@ -10,5 +10,5 @@
   android:alpha="?attr/alpha_secondary"
   android:background="?attr/selectableItemBackgroundBorderless"
   android:clickable="true"
-  android:src="@drawable/ic_cancel_24dp"
+  android:src="@drawable/ic_outline_clear_24px"
   android:tint="?attr/icon_tint"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/filter_adapter_subheader.xml b/app/src/main/res/layout/filter_adapter_subheader.xml
index aca22fff9..11af41a33 100644
--- a/app/src/main/res/layout/filter_adapter_subheader.xml
+++ b/app/src/main/res/layout/filter_adapter_subheader.xml
@@ -27,7 +27,7 @@
     android:focusable="true"
     android:clickable="true"
     android:scaleType="center"
-    android:src="@drawable/ic_sync_problem_black_24dp"
+    android:src="@drawable/ic_outline_sync_problem_24px"
     android:tint="?attr/icon_tint"
     android:visibility="visible"/>
 
diff --git a/app/src/main/res/layout/fragment_comment_bar.xml b/app/src/main/res/layout/fragment_comment_bar.xml
index 1f0ce6664..bf31ed5fa 100644
--- a/app/src/main/res/layout/fragment_comment_bar.xml
+++ b/app/src/main/res/layout/fragment_comment_bar.xml
@@ -55,7 +55,7 @@
     android:layout_marginStart="3dp"
     android:layout_marginLeft="3dip"
     android:scaleType="center"
-    android:src="@drawable/ic_add_24dp"
+    android:src="@drawable/ic_outline_add_24px"
     android:tint="?attr/actionBarPrimaryText"
     android:visibility="gone"/>
 
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index ef0055ecb..b3cc6a923 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -51,7 +51,7 @@
     android:layout_margin="@dimen/task_list_fab_margin"
     android:layout_gravity="end|bottom"
     android:padding="0dp"
-    android:src="@drawable/ic_add_24dp"
+    android:src="@drawable/ic_outline_add_24px"
     android:tint="?attr/fab_text"
     app:borderWidth="0dp"/>
 
diff --git a/app/src/main/res/layout/preference_draggable_row.xml b/app/src/main/res/layout/preference_draggable_row.xml
index bc3a62abd..71ac47b80 100644
--- a/app/src/main/res/layout/preference_draggable_row.xml
+++ b/app/src/main/res/layout/preference_draggable_row.xml
@@ -27,6 +27,6 @@
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical|end"
     android:scaleType="center"
-    android:src="@drawable/ic_drag_handle_black_24dp"
+    android:src="@drawable/ic_outline_drag_handle_24px"
     android:tint="?attr/icon_tint"/>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/scrollable_widget.xml b/app/src/main/res/layout/scrollable_widget.xml
index 5a24e4625..b98e13fd1 100644
--- a/app/src/main/res/layout/scrollable_widget.xml
+++ b/app/src/main/res/layout/scrollable_widget.xml
@@ -34,7 +34,7 @@
       android:paddingRight="@dimen/widget_padding"
       android:background="@android:color/transparent"
       android:scaleType="fitCenter"
-      android:src="@drawable/ic_add_24dp"
+      android:src="@drawable/ic_outline_add_24px"
       android:tint="@android:color/white"/>
 
     <ImageButton
@@ -50,7 +50,7 @@
       android:paddingRight="0dp"
       android:background="@android:color/transparent"
       android:scaleType="fitCenter"
-      android:src="@drawable/ic_settings_24dp"
+      android:src="@drawable/ic_outline_settings_24px"
       android:tint="@android:color/white"/>
 
     <TextView
diff --git a/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml b/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
index d08376c1a..e00b4a174 100644
--- a/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
+++ b/app/src/main/res/layout/simple_list_item_multiple_choice_themed.xml
@@ -12,8 +12,8 @@
   android:paddingLeft="@dimen/keyline_first"
   android:paddingRight="@dimen/keyline_first"
   android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-  android:drawableLeft="@drawable/ic_label_24dp"
+  android:drawableLeft="@drawable/ic_outline_label_24px"
   android:drawablePadding="@dimen/keyline_second"
-  android:drawableStart="@drawable/ic_label_24dp"
+  android:drawableStart="@drawable/ic_outline_label_24px"
   android:gravity="center_vertical"
   android:textColor="?attr/asTextColor"/>
diff --git a/app/src/main/res/layout/tag_edit_row.xml b/app/src/main/res/layout/tag_edit_row.xml
index 3dee9a114..ad964f2d6 100644
--- a/app/src/main/res/layout/tag_edit_row.xml
+++ b/app/src/main/res/layout/tag_edit_row.xml
@@ -35,6 +35,6 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:contentDescription="@string/remove"
-    android:src="@drawable/ic_close_24dp"
+    android:src="@drawable/ic_outline_clear_24px"
     android:tint="?attr/icon_tint"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml
index 2bc61b384..4cf7cd580 100644
--- a/app/src/main/res/layout/task_adapter_row_body.xml
+++ b/app/src/main/res/layout/task_adapter_row_body.xml
@@ -48,7 +48,7 @@
       android:paddingEnd="2dp"
       android:paddingRight="2dp"
       android:alpha="?attr/alpha_secondary"
-      android:src="@drawable/ic_visibility_off_24dp"
+      android:src="@drawable/ic_outline_visibility_off_24px"
       android:tint="@color/icon_tint"
       android:visibility="gone"/>
 
diff --git a/app/src/main/res/layout/task_list_body_empty.xml b/app/src/main/res/layout/task_list_body_empty.xml
index 1adc96c6a..e7c992e61 100644
--- a/app/src/main/res/layout/task_list_body_empty.xml
+++ b/app/src/main/res/layout/task_list_body_empty.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:alpha="?attr/alpha_disabled"
-        android:src="@drawable/ic_inbox_168px"
+        android:src="@drawable/ic_outline_inbox_168px"
         android:tint="?attr/icon_tint"/>
 
       <TextView
diff --git a/app/src/main/res/menu/menu_caldav_account_settings.xml b/app/src/main/res/menu/menu_caldav_account_settings.xml
index 68e8f3a77..6a2762ffa 100644
--- a/app/src/main/res/menu/menu_caldav_account_settings.xml
+++ b/app/src/main/res/menu/menu_caldav_account_settings.xml
@@ -4,13 +4,13 @@
 
   <item
     android:id="@+id/help"
-    android:icon="@drawable/ic_help_24dp"
+    android:icon="@drawable/ic_outline_help_outline_24px"
     android:title="@string/help"
     app:showAsAction="ifRoom"/>
 
   <item
     android:id="@+id/remove"
-    android:icon="@drawable/ic_delete_24dp"
+    android:icon="@drawable/ic_outline_delete_24px"
     android:title="@string/remove"
     app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_caldav_calendar_settings.xml b/app/src/main/res/menu/menu_caldav_calendar_settings.xml
index 9b4e99154..fc4fdd714 100644
--- a/app/src/main/res/menu/menu_caldav_calendar_settings.xml
+++ b/app/src/main/res/menu/menu_caldav_calendar_settings.xml
@@ -4,7 +4,7 @@
 
   <item
     android:id="@+id/delete"
-    android:icon="@drawable/ic_delete_24dp"
+    android:icon="@drawable/ic_outline_delete_24px"
     android:title="@string/delete"
     app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_custom_filter_activity.xml b/app/src/main/res/menu/menu_custom_filter_activity.xml
index 1ce6c1d48..e2fae43a0 100644
--- a/app/src/main/res/menu/menu_custom_filter_activity.xml
+++ b/app/src/main/res/menu/menu_custom_filter_activity.xml
@@ -4,7 +4,7 @@
 
   <item
     android:id="@+id/menu_save"
-    android:icon="@drawable/ic_save_24dp"
+    android:icon="@drawable/ic_outline_save_24px"
     android:title="@string/save"
     app:showAsAction="always"/>
 
diff --git a/app/src/main/res/menu/menu_multi_select.xml b/app/src/main/res/menu/menu_multi_select.xml
index 9d66b8b33..b412e1c25 100644
--- a/app/src/main/res/menu/menu_multi_select.xml
+++ b/app/src/main/res/menu/menu_multi_select.xml
@@ -4,19 +4,19 @@
 
   <item
     android:id="@+id/move_tasks"
-    android:icon="@drawable/ic_cloud_black_24dp"
+    android:icon="@drawable/ic_outline_cloud_24px"
     android:title="@string/move"
     app:showAsAction="ifRoom" />
 
   <item
     android:id="@+id/copy_tasks"
-    android:icon="@drawable/ic_content_copy_black_24dp"
+    android:icon="@drawable/ic_outline_file_copy_24px"
     android:title="@string/copy"
     app:showAsAction="ifRoom"/>
 
   <item
     android:id="@+id/delete"
-    android:icon="@drawable/ic_delete_24dp"
+    android:icon="@drawable/ic_outline_delete_24px"
     android:title="@string/delete"
     app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_preferences.xml b/app/src/main/res/menu/menu_preferences.xml
index a6ab3536b..2ef111578 100644
--- a/app/src/main/res/menu/menu_preferences.xml
+++ b/app/src/main/res/menu/menu_preferences.xml
@@ -3,7 +3,7 @@
   xmlns:tasks="http://schemas.android.com/apk/res-auto">
   <item
     android:id="@+id/menu_help"
-    android:icon="@drawable/ic_help_24dp"
+    android:icon="@drawable/ic_outline_help_outline_24px"
     android:title="@string/help"
     tasks:showAsAction="ifRoom"/>
   <item
diff --git a/app/src/main/res/menu/menu_purchase_activity.xml b/app/src/main/res/menu/menu_purchase_activity.xml
index 67ca9660a..1c46ea920 100644
--- a/app/src/main/res/menu/menu_purchase_activity.xml
+++ b/app/src/main/res/menu/menu_purchase_activity.xml
@@ -6,7 +6,7 @@
 
   <item
     android:id="@+id/menu_help"
-    android:icon="@drawable/ic_help_24dp"
+    android:icon="@drawable/ic_outline_help_outline_24px"
     android:title="@string/help"
     tasks:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_tag_settings.xml b/app/src/main/res/menu/menu_tag_settings.xml
index 9b4e99154..fc4fdd714 100644
--- a/app/src/main/res/menu/menu_tag_settings.xml
+++ b/app/src/main/res/menu/menu_tag_settings.xml
@@ -4,7 +4,7 @@
 
   <item
     android:id="@+id/delete"
-    android:icon="@drawable/ic_delete_24dp"
+    android:icon="@drawable/ic_outline_delete_24px"
     android:title="@string/delete"
     app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_task_edit_fragment.xml b/app/src/main/res/menu/menu_task_edit_fragment.xml
index 794f0422b..05f88eef4 100644
--- a/app/src/main/res/menu/menu_task_edit_fragment.xml
+++ b/app/src/main/res/menu/menu_task_edit_fragment.xml
@@ -4,7 +4,7 @@
   xmlns:tasks="http://schemas.android.com/apk/res-auto">
   <item
     android:id="@+id/menu_delete"
-    android:icon="@drawable/ic_delete_24dp"
+    android:icon="@drawable/ic_outline_delete_24px"
     android:title="@string/delete_task"
     tasks:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_task_list_fragment.xml b/app/src/main/res/menu/menu_task_list_fragment.xml
index b012fa183..a6d0ed539 100644
--- a/app/src/main/res/menu/menu_task_list_fragment.xml
+++ b/app/src/main/res/menu/menu_task_list_fragment.xml
@@ -5,18 +5,18 @@
 
   <item
     android:id="@+id/menu_voice_add"
-    android:icon="@drawable/ic_mic_24dp"
+    android:icon="@drawable/ic_outline_mic_none_24px"
     android:title="@string/EPr_voiceInputEnabled_title"
     app:showAsAction="ifRoom"/>
   <item
     android:id="@+id/menu_search"
-    android:icon="@drawable/ic_search_24dp"
+    android:icon="@drawable/ic_outline_search_24px"
     android:title="@string/TLA_menu_search"
     app:actionViewClass="androidx.appcompat.widget.SearchView"
     app:showAsAction="ifRoom|collapseActionView"/>
   <item
     android:id="@+id/menu_sort"
-    android:icon="@drawable/ic_sort_24dp"
+    android:icon="@drawable/ic_outline_sort_24px"
     android:title="@string/TLA_menu_sort"
     app:showAsAction="ifRoom"/>
   <group
diff --git a/app/src/main/res/menu/menu_tasker_create_task.xml b/app/src/main/res/menu/menu_tasker_create_task.xml
index 059e56b46..81d399458 100644
--- a/app/src/main/res/menu/menu_tasker_create_task.xml
+++ b/app/src/main/res/menu/menu_tasker_create_task.xml
@@ -4,7 +4,7 @@
   xmlns:tasks="http://schemas.android.com/apk/res-auto">
   <item
     android:id="@+id/menu_help"
-    android:icon="@drawable/ic_help_24dp"
+    android:icon="@drawable/ic_outline_help_outline_24px"
     android:title="@string/help"
     tasks:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file