diff --git a/.travis.yml b/.travis.yml
index bed6a3046..f89d7f215 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@ sudo: false
 jdk: oraclejdk7
 env:
   matrix:
-    - ANDROID_SDKS=android-23,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
+    - ANDROID_SDKS=android-22,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
 android:
   components:
-    - android-23
+    - android-22
     - platform-tools-23.0.1
     - build-tools-23.0.1
     - extra-android-m2repository
diff --git a/build.gradle b/build.gradle
index 64a710f2b..c33e532f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,10 +7,11 @@ task wrapper(type: Wrapper) {
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.4.0-beta5'
     }
 }
 
@@ -23,7 +24,7 @@ android {
         lintConfig file("lint.xml")
     }
 
-    compileSdkVersion 23
+    compileSdkVersion 22
     buildToolsVersion "23.0.1"
 
     defaultConfig {
diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
index d68a7d88f..cd2073f04 100644
--- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
+++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
@@ -8,7 +8,9 @@ package com.todoroo.astrid.actfm;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
@@ -25,6 +27,7 @@ import org.tasks.R;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.preferences.ActivityPreferences;
+import org.tasks.ui.MenuColorizer;
 
 import javax.inject.Inject;
 
@@ -59,7 +62,9 @@ public class FilterSettingsActivity extends InjectingAppCompatActivity {
         ActionBar supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {
             supportActionBar.setDisplayHomeAsUpEnabled(true);
-            supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+            Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp));
+            DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white));
+            supportActionBar.setHomeAsUpIndicator(drawable);
             supportActionBar.setTitle(filter.listingTitle);
         }
 
@@ -95,6 +100,7 @@ public class FilterSettingsActivity extends InjectingAppCompatActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.tag_settings_activity, menu);
+        MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white));
         return super.onCreateOptionsMenu(menu);
     }
 
diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
index b590c144a..e2df1cd46 100644
--- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -8,7 +8,9 @@ package com.todoroo.astrid.actfm;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
@@ -31,6 +33,7 @@ import org.tasks.R;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.preferences.ActivityPreferences;
+import org.tasks.ui.MenuColorizer;
 
 import javax.inject.Inject;
 
@@ -74,7 +77,9 @@ public class TagSettingsActivity extends InjectingAppCompatActivity {
         ActionBar supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {
             supportActionBar.setDisplayHomeAsUpEnabled(true);
-            supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+            Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp));
+            DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white));
+            supportActionBar.setHomeAsUpIndicator(drawable);
             supportActionBar.setTitle(isNewTag ? getString(R.string.new_tag) : tagData.getName());
         }
 
@@ -133,6 +138,7 @@ public class TagSettingsActivity extends InjectingAppCompatActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.tag_settings_activity, menu);
+        MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white));
         if (isNewTag) {
             menu.findItem(R.id.delete).setVisible(false);
         }
diff --git a/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java b/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java
index cbaf727b7..d05097f60 100644
--- a/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java
@@ -47,7 +47,7 @@ public class FilterShortcutActivity extends InjectingListActivity {
         setContentView(R.layout.filter_shortcut_activity);
 
         // set up ui
-        adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false, preferences);
+        adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false);
         setListAdapter(adapter);
 
         Button button = (Button)findViewById(R.id.ok);
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
index e693768ba..0688d5eae 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -5,8 +5,10 @@
  */
 package com.todoroo.astrid.activity;
 
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
@@ -18,10 +20,15 @@ import org.tasks.preferences.ActivityPreferences;
 
 import javax.inject.Inject;
 
+import butterknife.ButterKnife;
+import butterknife.InjectView;
+
 public class TaskEditActivity extends AstridActivity {
 
     @Inject ActivityPreferences preferences;
 
+    @InjectView(R.id.toolbar) Toolbar toolbar;
+
     /**
 	 * @see android.app.Activity#onCreate(Bundle)
 	 */
@@ -31,15 +38,16 @@ public class TaskEditActivity extends AstridActivity {
         preferences.applyThemeAndStatusBarColor();
 
         setContentView(R.layout.task_edit_wrapper_activity);
+        ButterKnife.inject(this);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        if (toolbar != null) {
-            setSupportActionBar(toolbar);
-
-            ActionBar actionBar = getSupportActionBar();
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setDisplayShowTitleEnabled(false);
-            toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp);
+        setSupportActionBar(toolbar);
+        ActionBar supportActionBar = getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+            supportActionBar.setDisplayShowTitleEnabled(false);
+            Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_arrow_back_24dp));
+            DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white));
+            supportActionBar.setHomeAsUpIndicator(drawable);
         }
 	}
 
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 84b1980d6..7b68afb11 100755
--- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -10,11 +10,9 @@ import android.app.Dialog;
 import android.content.ContentValues;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -87,6 +85,7 @@ import org.tasks.notifications.NotificationManager;
 import org.tasks.preferences.ActivityPreferences;
 import org.tasks.preferences.DeviceInfo;
 import org.tasks.ui.DeadlineControlSet;
+import org.tasks.ui.MenuColorizer;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -446,11 +445,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 if (controlSet != null) {
                     ImageView icon = (ImageView) controlSet.findViewById(R.id.icon);
                     if (icon != null) {
-                        Drawable drawable = getResources().getDrawable(curr.getIcon());
-                        if (preferences.isDarkTheme()) {
-                            drawable = whiteTint(drawable);
-                        }
-                        icon.setImageDrawable(drawable);
+                        icon.setImageResource(curr.getIcon());
                     }
                     basicControls.addView(controlSet);
                 }
@@ -464,12 +459,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         getActivity().getIntent().removeExtra(TOKEN_OPEN_CONTROL);
     }
 
-    private Drawable whiteTint(Drawable drawable) {
-        Drawable wrapDrawable = DrawableCompat.wrap(drawable);
-        DrawableCompat.setTint(wrapDrawable, getResources().getColor(android.R.color.white));
-        return wrapDrawable;
-    }
-
     /**
      * Initialize task edit page in the background
      *
@@ -877,6 +866,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         menu.clear();
         inflater.inflate(R.menu.task_edit_fragment, menu);
+        MenuColorizer.colorMenu(getActivity(), menu, getResources().getColor(android.R.color.white));
         if (preGingerbreadMR1()) {
             // media recorder aac support requires api level 10
             // approximately 1% of current installs are using api level 7-9
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 4452ad0c8..8fa5277b7 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -8,9 +8,11 @@ package com.todoroo.astrid.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.support.v4.widget.DrawerLayout;
@@ -53,6 +55,7 @@ import org.tasks.R;
 import org.tasks.activities.SortActivity;
 import org.tasks.preferences.ActivityPreferences;
 import org.tasks.receivers.RepeatConfirmationReceiver;
+import org.tasks.ui.MenuColorizer;
 import org.tasks.ui.NavigationDrawerFragment;
 
 import javax.inject.Inject;
@@ -99,7 +102,9 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
         ActionBar supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {
             supportActionBar.setDisplayHomeAsUpEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+            Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_menu_24dp));
+            DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white));
+            toolbar.setNavigationIcon(drawable);
         }
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
@@ -182,6 +187,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.task_list_activity, menu);
+        MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white));
         TaskListFragment tlf = getTaskListFragment();
         MenuItem hidden = menu.findItem(R.id.menu_show_hidden);
         if (preferences.getBoolean(R.string.p_show_hidden_tasks, false)) {
diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index 641b9c2b9..befe32ae4 100644
--- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -10,8 +10,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -35,7 +33,6 @@ import org.tasks.filters.FilterProvider;
 import org.tasks.filters.NavigationDrawerAction;
 import org.tasks.filters.NavigationDrawerSeparator;
 import org.tasks.filters.NavigationDrawerSubheader;
-import org.tasks.preferences.ActivityPreferences;
 import org.tasks.preferences.BasicPreferences;
 import org.tasks.preferences.HelpAndFeedbackActivity;
 import org.tasks.ui.NavigationDrawerFragment;
@@ -57,21 +54,19 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
     private final Activity activity;
     private final ListView listView;
     private boolean navigationDrawer;
-    private ActivityPreferences activityPreferences;
     private final FilterListUpdateReceiver filterListUpdateReceiver = new FilterListUpdateReceiver();
 
     /** layout inflater */
     private final LayoutInflater inflater;
 
     public FilterAdapter(FilterProvider filterProvider, FilterCounter filterCounter, Activity activity,
-                         ListView listView, boolean navigationDrawer, ActivityPreferences activityPreferences) {
+                         ListView listView, boolean navigationDrawer) {
         super(activity, 0);
         this.filterProvider = filterProvider;
         this.filterCounter = filterCounter;
         this.activity = activity;
         this.listView = listView;
         this.navigationDrawer = navigationDrawer;
-        this.activityPreferences = activityPreferences;
 
         inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
@@ -261,13 +256,13 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
 
             add(new NavigationDrawerAction(
                     activity.getResources().getString(R.string.new_tag),
-                    R.drawable.ic_add_black_24dp,
+                    R.drawable.ic_add_24dp,
                     new Intent(activity, TagSettingsActivity.class),
                     NavigationDrawerFragment.REQUEST_NEW_LIST));
 
             add(new NavigationDrawerAction(
                     activity.getResources().getString(R.string.FLA_new_filter),
-                    R.drawable.ic_add_black_24dp,
+                    R.drawable.ic_add_24dp,
                     new Intent(activity, CustomFilterActivity.class),
                     TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER));
 
@@ -275,17 +270,17 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
 
             add(new NavigationDrawerAction(
                     activity.getResources().getString(R.string.TLA_menu_settings),
-                    R.drawable.ic_settings_black_24dp,
+                    R.drawable.ic_settings_24dp,
                     new Intent(activity, BasicPreferences.class),
                     REQUEST_SETTINGS));
             add(new NavigationDrawerAction(
                     activity.getResources().getString(R.string.help_and_feedback),
-                    R.drawable.ic_help_black_24dp,
+                    R.drawable.ic_help_24dp,
                     new Intent(activity, HelpAndFeedbackActivity.class),
                     0));
             add(new NavigationDrawerAction(
                     activity.getResources().getString(R.string.TLA_menu_donate),
-                    R.drawable.ic_attach_money_black_24dp,
+                    R.drawable.ic_attach_money_24dp,
                     new Intent(activity, DonationActivity.class),
                     0));
         }
@@ -330,18 +325,8 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
 
         viewHolder.view.setBackgroundResource(0);
         int icon = filter.icon;
-        if (icon == 0) {
-            viewHolder.icon.setVisibility(View.INVISIBLE);
-        } else {
-            Drawable drawable = activity.getResources().getDrawable(icon, activity.getTheme());
-            if (activityPreferences.isDarkTheme()) {
-                Drawable wrapDrawable = DrawableCompat.wrap(drawable);
-                DrawableCompat.setTint(wrapDrawable, activity.getResources().getColor(android.R.color.white));
-                drawable = wrapDrawable;
-            }
-            viewHolder.icon.setImageDrawable(drawable);
-            viewHolder.icon.setVisibility(View.VISIBLE);
-        }
+        viewHolder.icon.setImageResource(icon);
+        viewHolder.icon.setVisibility(icon == 0 ? View.INVISIBLE : View.VISIBLE);
 
         String title = filter.listingTitle;
         if(!title.equals(viewHolder.name.getText())) {
diff --git a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
index 3cd0bea8d..a073339c1 100644
--- a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
+++ b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
@@ -51,7 +51,7 @@ public final class BuiltInFilterExposer {
 
     public Filter getMyTasksFilter() {
         Filter myTasksFilter = getMyTasksFilter(context.getResources());
-        myTasksFilter.icon = R.drawable.ic_inbox_black_24dp;
+        myTasksFilter.icon = R.drawable.ic_inbox_24dp;
         return myTasksFilter;
     }
 
@@ -62,17 +62,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_black_24dp;
+            todayFilter.icon = R.drawable.ic_today_24dp;
             filters.add(todayFilter);
         }
         if (preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) {
             Filter recentlyModifiedFilter = getRecentlyModifiedFilter(r);
-            recentlyModifiedFilter.icon = R.drawable.ic_history_black_24dp;
+            recentlyModifiedFilter.icon = R.drawable.ic_history_24dp;
             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_black_24dp;
+            uncategorizedFilter.icon = R.drawable.ic_label_outline_24dp;
             filters.add(uncategorizedFilter);
         }
         // transmit filter list
diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 4dec55faf..687a8a0a4 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -10,7 +10,9 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.ContextMenu;
@@ -45,6 +47,7 @@ import org.tasks.dialogs.DialogBuilder;
 import org.tasks.filters.FilterCriteriaProvider;
 import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.preferences.ActivityPreferences;
+import org.tasks.ui.MenuColorizer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -156,7 +159,9 @@ public class CustomFilterActivity extends InjectingAppCompatActivity {
         ActionBar supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {
             supportActionBar.setDisplayHomeAsUpEnabled(true);
-            supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
+            Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp));
+            DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white));
+            supportActionBar.setHomeAsUpIndicator(drawable);
             supportActionBar.setTitle(R.string.FLA_new_filter);
         }
 
@@ -348,6 +353,7 @@ public class CustomFilterActivity extends InjectingAppCompatActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.tag_settings_activity, menu);
+        MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white));
         menu.findItem(R.id.delete).setVisible(false);
         return super.onCreateOptionsMenu(menu);
     }
diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
index 7fbc3438d..954668c27 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -30,7 +30,7 @@ public final class CustomFilterExposer {
     public List<Filter> getFilters() {
         final List<Filter> list = new ArrayList<>();
 
-        final int filter = R.drawable.ic_filter_list_black_24dp;
+        final int filter = R.drawable.ic_filter_list_24dp;
 
         storeObjectDao.getSavedFilters(new Callback<StoreObject>() {
             @Override
diff --git a/src/main/java/com/todoroo/astrid/files/FileExplore.java b/src/main/java/com/todoroo/astrid/files/FileExplore.java
index 498276348..8b7a5e4bc 100644
--- a/src/main/java/com/todoroo/astrid/files/FileExplore.java
+++ b/src/main/java/com/todoroo/astrid/files/FileExplore.java
@@ -107,21 +107,21 @@ public class FileExplore extends InjectingAppCompatActivity {
 			String[] fList = path.list(filter);
 			fileList = new Item[fList.length];
 			for (int i = 0; i < fList.length; i++) {
-				fileList[i] = new Item(fList[i], R.drawable.ic_insert_drive_file_black_24dp);
+				fileList[i] = new Item(fList[i], R.drawable.ic_insert_drive_file_24dp);
 
 				// Convert into file path
 				File sel = new File(path, fList[i]);
 
 				// Set drawables
 				if (sel.isDirectory()) {
-					fileList[i].icon = R.drawable.ic_folder_black_24dp;
+					fileList[i].icon = R.drawable.ic_folder_24dp;
 				}
 			}
 
 			if (!firstLvl) {
 				Item temp[] = new Item[fileList.length + 1];
                 System.arraycopy(fileList, 0, temp, 1, fileList.length);
-				temp[0] = new Item(upString, R.drawable.ic_arrow_back_black_24dp);
+				temp[0] = new Item(upString, R.drawable.ic_arrow_back_24dp);
 				fileList = temp;
 			}
 		} else {
@@ -140,7 +140,7 @@ public class FileExplore extends InjectingAppCompatActivity {
 
 				// put the image on the text view
 				int icon = fileList[position].icon;
-				Drawable drawable = getResources().getDrawable(icon, getTheme());
+				Drawable drawable = getResources().getDrawable(icon);
 				if (activityPreferences.isDarkTheme()) {
 					Drawable wrapDrawable = DrawableCompat.wrap(drawable);
 					DrawableCompat.setTint(wrapDrawable, getResources().getColor(android.R.color.white));
diff --git a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
index 982c8b870..5cf70d425 100644
--- a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
+++ b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
@@ -80,7 +80,7 @@ public class FilesControlSet extends PopupControlSet {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_attachment_black_24dp;
+        return R.drawable.ic_attachment_24dp;
     }
 
     public void refreshMetadata() {
diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java
index c528f4fc0..3c781ca74 100644
--- a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java
+++ b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java
@@ -247,6 +247,6 @@ public class GCalControlSet extends TaskEditControlSetBase {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_event_black_24dp;
+        return R.drawable.ic_event_24dp;
     }
 }
diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index 0102bdfb3..3ae0dff96 100644
--- a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -62,7 +62,7 @@ public class GtasksFilterExposer {
             return emptyList();
         }
 
-        int cloud = R.drawable.ic_cloud_queue_black_24dp;
+        int cloud = R.drawable.ic_cloud_queue_24dp;
 
         List<Filter> listFilters = newArrayList();
         for (GtasksList list : gtasksListService.getLists()) {
diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index 64cd26784..68f37a564 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -201,7 +201,7 @@ public class RepeatControlSet extends PopupControlSet {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_repeat_black_24dp;
+        return R.drawable.ic_repeat_24dp;
     }
 
     @Override
diff --git a/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
index c6327ea97..f1a66a0c8 100644
--- a/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -89,7 +89,7 @@ public class TagFilterExposer {
 
         List<Filter> filters = new ArrayList<>();
 
-        int label = R.drawable.ic_label_black_24dp;
+        int label = R.drawable.ic_label_24dp;
 
         for (TagData tag : tags) {
             Filter f = constructFilter(context, tag);
diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
index 15012cf25..e55a28a92 100644
--- a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
@@ -5,16 +5,13 @@
  */
 package com.todoroo.astrid.tags;
 
-import android.app.Activity;
 import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
@@ -252,7 +249,7 @@ public final class TagsControlSet extends PopupControlSet {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_label_black_24dp;
+        return R.drawable.ic_label_24dp;
     }
 
     @Override
diff --git a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
index 89f3c1157..9a304abb3 100644
--- a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
+++ b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
@@ -67,7 +67,7 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_timer_black_24dp;
+        return R.drawable.ic_timer_24dp;
     }
 
     // --- TimeDurationTaskEditControlSet
diff --git a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java
index 857164171..7fdfd3f39 100644
--- a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java
@@ -38,6 +38,6 @@ public class DescriptionControlSet extends TaskEditControlSetBase {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_event_note_black_24dp;
+        return R.drawable.ic_event_note_24dp;
     }
 }
diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
index 9c79adf28..c9002b619 100644
--- a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
@@ -232,7 +232,7 @@ public class HideUntilControlSet extends TaskEditControlSetBase implements OnIte
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_visibility_off_black_24dp;
+        return R.drawable.ic_visibility_off_24dp;
     }
 
     @Override
diff --git a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java
index 9d4474346..d93424248 100644
--- a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java
@@ -133,7 +133,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_flag_black_24dp;
+        return R.drawable.ic_flag_24dp;
     }
 
     // Same as above because we need the setImportance listeners to fire even in
diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
index 4313c5d78..339136065 100644
--- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -394,6 +394,6 @@ public class ReminderControlSet extends TaskEditControlSetBase implements Adapte
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_notifications_black_24dp;
+        return R.drawable.ic_notifications_24dp;
     }
 }
diff --git a/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java b/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java
index d1bdad691..d86036b73 100644
--- a/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java
+++ b/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java
@@ -95,7 +95,7 @@ public class WidgetConfigActivity extends InjectingListActivity {
         }
 
         // set up ui
-        adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false, preferences);
+        adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false);
         setListAdapter(adapter);
 
         Button button = (Button) findViewById(R.id.ok);
diff --git a/src/main/java/org/tasks/Notifier.java b/src/main/java/org/tasks/Notifier.java
index cf46d778f..ed5bc05ae 100644
--- a/src/main/java/org/tasks/Notifier.java
+++ b/src/main/java/org/tasks/Notifier.java
@@ -11,7 +11,6 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.support.v4.app.NotificationCompat;
-import android.support.v4.media.MediaDescriptionCompatApi21;
 import android.text.TextUtils;
 
 import com.todoroo.andlib.data.TodorooCursor;
diff --git a/src/main/java/org/tasks/activities/FilterSelectionActivity.java b/src/main/java/org/tasks/activities/FilterSelectionActivity.java
index 885a74799..baa710a84 100644
--- a/src/main/java/org/tasks/activities/FilterSelectionActivity.java
+++ b/src/main/java/org/tasks/activities/FilterSelectionActivity.java
@@ -33,7 +33,7 @@ public class FilterSelectionActivity extends InjectingAppCompatActivity {
 
         activityPreferences.applyTheme();
 
-        final FilterAdapter filterAdapter = new FilterAdapter(filterProvider, filterCounter, this, null, false, activityPreferences);
+        final FilterAdapter filterAdapter = new FilterAdapter(filterProvider, filterCounter, this, null, false);
         filterAdapter.populateList();
 
         dialogBuilder.newDialog()
diff --git a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
index e02bd0c92..c38c61a6f 100644
--- a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
+++ b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
@@ -1,6 +1,8 @@
 package org.tasks.injection;
 
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,7 +44,9 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
 
         toolbar = (Toolbar) toolbarContainer.findViewById(R.id.toolbar);
         toolbar.setTitle(getTitle());
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp);
+        Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_arrow_back_24dp));
+        DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white));
+        toolbar.setNavigationIcon(drawable);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/src/main/java/org/tasks/preferences/ResourceResolver.java b/src/main/java/org/tasks/preferences/ResourceResolver.java
index 6d99e3adc..2f05bcc2c 100644
--- a/src/main/java/org/tasks/preferences/ResourceResolver.java
+++ b/src/main/java/org/tasks/preferences/ResourceResolver.java
@@ -7,6 +7,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 @Singleton
+@Deprecated
 public class ResourceResolver {
 
     private final Activity activity;
diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java
index 3d7ce8988..0ff23022b 100644
--- a/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -451,6 +451,6 @@ public class DeadlineControlSet extends TaskEditControlSetBase {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_schedule_black_24dp;
+        return R.drawable.ic_schedule_24dp;
     }
 }
diff --git a/src/main/java/org/tasks/ui/MenuColorizer.java b/src/main/java/org/tasks/ui/MenuColorizer.java
new file mode 100644
index 000000000..a75bd61a8
--- /dev/null
+++ b/src/main/java/org/tasks/ui/MenuColorizer.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2014 Jared Rummler <jared.rummler@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.tasks.ui;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+/**
+ * Helper class to set the color and transparency for menu icons in an ActionBar/Toolbar.</p>
+ *
+ * Example usage:
+ *
+ * <pre>
+ * <code>
+ * public boolean onCreateOptionsMenu(Menu menu) {
+ *     ...
+ *     int color = getResources().getColor(R.color.your_awesome_color);
+ *     int alpha = 204; // 80% alpha
+ *     MenuColorizer.colorMenu(this, menu, color, alpha);
+ *     ...
+ * }
+ * </code>
+ * </pre>
+ *
+ * @author Jared Rummler <jared.rummler@gmail.com>
+ * @since Dec 11, 2014
+ */
+public class MenuColorizer {
+
+    private MenuColorizer() {
+    }
+
+    /** Sets a color filter on all menu icons, including the overflow button (if it exists) */
+    public static void colorMenu(final Activity activity, final Menu menu, final int color) {
+        colorMenu(activity, menu, color, 0);
+    }
+
+    /** Sets a color filter on all menu icons, including the overflow button (if it exists) */
+    public static void colorMenu(final Activity activity, final Menu menu, final int color,
+                                 final int alpha) {
+        for (int i = 0, size = menu.size(); i < size; i++) {
+            final MenuItem menuItem = menu.getItem(i);
+            colorMenuItem(menuItem, color, alpha);
+            if (menuItem.hasSubMenu()) {
+                final SubMenu subMenu = menuItem.getSubMenu();
+                for (int j = 0; j < subMenu.size(); j++) {
+                    colorMenuItem(subMenu.getItem(j), color, alpha);
+                }
+            }
+        }
+        final View home = activity.findViewById(android.R.id.home);
+        if (home != null) {
+            home.post(new Runnable() {
+
+                @Override
+                public void run() {
+                    colorOverflow(activity, color, alpha);
+                }
+            });
+        }
+    }
+
+    /** Sets a color filter on a {@link MenuItem} */
+    public static void colorMenuItem(final MenuItem menuItem, final int color) {
+        colorMenuItem(menuItem, color, 0);
+    }
+
+    /** Sets a color filter on a {@link MenuItem} */
+    public static void colorMenuItem(final MenuItem menuItem, final int color, final int alpha) {
+        final Drawable drawable = menuItem.getIcon();
+        if (drawable != null) {
+            // If we don't mutate the drawable, then all drawable's with this id will have a color
+            // filter applied to it.
+            drawable.mutate();
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+            if (alpha > 0) {
+                drawable.setAlpha(alpha);
+            }
+        }
+    }
+
+    /** Sets a color filter on the OverflowMenuButton in an ActionBar or Toolbar */
+    public static void colorOverflow(final Activity activity, final int color) {
+        colorOverflow(activity, color, 0);
+    }
+
+    /** Sets a color filter on the OverflowMenuButton in an ActionBar or Toolbar */
+    @SuppressLint("NewApi")
+    @SuppressWarnings("deprecation")
+    public static void colorOverflow(final Activity activity, final int color, final int alpha) {
+        final ImageButton overflow = getOverflowMenu(activity);
+        if (overflow != null) {
+            overflow.setColorFilter(color);
+            if (alpha > 0) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                    overflow.setImageAlpha(alpha);
+                } else {
+                    overflow.setAlpha(alpha);
+                }
+            }
+        }
+    }
+
+    /* Find that OverflowMenuButton */
+    private static ImageButton getOverflowMenu(final Activity activity,
+                                               final ViewGroup... viewGroup) {
+        final ViewGroup group;
+        if (viewGroup == null || viewGroup.length == 0) {
+            final int resId = activity.getResources().getIdentifier("action_bar", "id", "android");
+            if (resId != 0) {
+                group = (ViewGroup) activity.findViewById(resId);
+            } else {
+                group = (ViewGroup) activity.findViewById(android.R.id.content).getRootView();
+            }
+        } else {
+            group = viewGroup[0];
+        }
+        ImageButton overflow = null;
+        for (int i = 0, l = group.getChildCount(); i < l; i++) {
+            final View v = group.getChildAt(i);
+            if (v instanceof ImageButton
+                    && v.getClass().getSimpleName().equals("OverflowMenuButton")) {
+                overflow = (ImageButton) v;
+            } else if (v instanceof ViewGroup) {
+                overflow = getOverflowMenu(activity, (ViewGroup) v);
+            }
+            if (overflow != null) {
+                break;
+            }
+        }
+        return overflow;
+    }
+
+}
diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index 080c680a7..98bc40da0 100644
--- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -33,8 +33,8 @@ import org.tasks.filters.FilterProvider;
 import org.tasks.filters.NavigationDrawerAction;
 import org.tasks.injection.InjectingFragment;
 import org.tasks.location.GeofenceService;
-import org.tasks.preferences.ActivityPreferences;
 import org.tasks.preferences.AppearancePreferences;
+import org.tasks.preferences.Preferences;
 
 import javax.inject.Inject;
 
@@ -68,7 +68,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
     @Inject FilterCounter filterCounter;
     @Inject FilterProvider filterProvider;
     @Inject GeofenceService geofenceService;
-    @Inject ActivityPreferences preferences;
+    @Inject Preferences preferences;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -151,7 +151,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
     }
 
     private void setUpList() {
-        adapter = new FilterAdapter(filterProvider, filterCounter, getActivity(), mDrawerListView, true, preferences);
+        adapter = new FilterAdapter(filterProvider, filterCounter, getActivity(), mDrawerListView, true);
         mDrawerListView.setAdapter(adapter);
         registerForContextMenu(mDrawerListView);
     }
diff --git a/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/src/main/res/drawable-hdpi/ic_add_black_24dp.png
deleted file mode 100644
index c04b523c4..000000000
Binary files a/src/main/res/drawable-hdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_arrow_back_black_24dp.png b/src/main/res/drawable-hdpi/ic_arrow_back_black_24dp.png
deleted file mode 100644
index da807e996..000000000
Binary files a/src/main/res/drawable-hdpi/ic_arrow_back_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
deleted file mode 100644
index a2051cef9..000000000
Binary files a/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png
deleted file mode 100644
index ad0f76c29..000000000
Binary files a/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png
deleted file mode 100644
index e56ddb5a5..000000000
Binary files a/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png
deleted file mode 100644
index f5a7cd219..000000000
Binary files a/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png
deleted file mode 100644
index 50dbfef93..000000000
Binary files a/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index 73f5116bd..000000000
Binary files a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_close_black_24dp.png b/src/main/res/drawable-hdpi/ic_close_black_24dp.png
deleted file mode 100644
index 1a9cd75a0..000000000
Binary files a/src/main/res/drawable-hdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/src/main/res/drawable-hdpi/ic_close_white_24dp.png
deleted file mode 100644
index ceb1a1eeb..000000000
Binary files a/src/main/res/drawable-hdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png
deleted file mode 100644
index b7ecbeb27..000000000
Binary files a/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 4a9f76947..000000000
Binary files a/src/main/res/drawable-hdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_event_black_24dp.png b/src/main/res/drawable-hdpi/ic_event_black_24dp.png
deleted file mode 100644
index 0a7167810..000000000
Binary files a/src/main/res/drawable-hdpi/ic_event_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_event_note_black_24dp.png b/src/main/res/drawable-hdpi/ic_event_note_black_24dp.png
deleted file mode 100644
index 3d068f170..000000000
Binary files a/src/main/res/drawable-hdpi/ic_event_note_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png
deleted file mode 100644
index a966cb9bd..000000000
Binary files a/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_flag_black_24dp.png b/src/main/res/drawable-hdpi/ic_flag_black_24dp.png
deleted file mode 100644
index 9e1e88a84..000000000
Binary files a/src/main/res/drawable-hdpi/ic_flag_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_folder_black_24dp.png b/src/main/res/drawable-hdpi/ic_folder_black_24dp.png
deleted file mode 100644
index 1d25a2d1f..000000000
Binary files a/src/main/res/drawable-hdpi/ic_folder_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/src/main/res/drawable-hdpi/ic_help_black_24dp.png
deleted file mode 100644
index 374fafd7f..000000000
Binary files a/src/main/res/drawable-hdpi/ic_help_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_history_black_24dp.png b/src/main/res/drawable-hdpi/ic_history_black_24dp.png
deleted file mode 100644
index b74e2899c..000000000
Binary files a/src/main/res/drawable-hdpi/ic_history_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png
deleted file mode 100644
index dfedf997a..000000000
Binary files a/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_insert_drive_file_black_24dp.png b/src/main/res/drawable-hdpi/ic_insert_drive_file_black_24dp.png
deleted file mode 100644
index 95e2e80f0..000000000
Binary files a/src/main/res/drawable-hdpi/ic_insert_drive_file_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_label_black_24dp.png b/src/main/res/drawable-hdpi/ic_label_black_24dp.png
deleted file mode 100644
index 9071a2912..000000000
Binary files a/src/main/res/drawable-hdpi/ic_label_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png b/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png
deleted file mode 100644
index 49b215123..000000000
Binary files a/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 238cfd66b..000000000
Binary files a/src/main/res/drawable-hdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_mic_white_24dp.png b/src/main/res/drawable-hdpi/ic_mic_white_24dp.png
deleted file mode 100644
index f316b84b7..000000000
Binary files a/src/main/res/drawable-hdpi/ic_mic_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index 458bf11cb..000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_phone_black_24dp.png b/src/main/res/drawable-hdpi/ic_phone_black_24dp.png
deleted file mode 100644
index d4077acf9..000000000
Binary files a/src/main/res/drawable-hdpi/ic_phone_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png b/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png
deleted file mode 100644
index d8b42bbe4..000000000
Binary files a/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_save_white_24dp.png b/src/main/res/drawable-hdpi/ic_save_white_24dp.png
deleted file mode 100644
index dd3f10664..000000000
Binary files a/src/main/res/drawable-hdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_schedule_black_24dp.png b/src/main/res/drawable-hdpi/ic_schedule_black_24dp.png
deleted file mode 100644
index 55882893d..000000000
Binary files a/src/main/res/drawable-hdpi/ic_schedule_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/src/main/res/drawable-hdpi/ic_search_white_24dp.png
deleted file mode 100644
index bbfbc96cb..000000000
Binary files a/src/main/res/drawable-hdpi/ic_search_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
deleted file mode 100644
index acf1ddf85..000000000
Binary files a/src/main/res/drawable-hdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 97ded33b5..000000000
Binary files a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_sort_white_24dp.png b/src/main/res/drawable-hdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 55a429b6f..000000000
Binary files a/src/main/res/drawable-hdpi/ic_sort_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_timer_black_24dp.png b/src/main/res/drawable-hdpi/ic_timer_black_24dp.png
deleted file mode 100644
index d9ae15089..000000000
Binary files a/src/main/res/drawable-hdpi/ic_timer_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_today_black_24dp.png b/src/main/res/drawable-hdpi/ic_today_black_24dp.png
deleted file mode 100644
index 03680a762..000000000
Binary files a/src/main/res/drawable-hdpi/ic_today_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png b/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index b21a68629..000000000
Binary files a/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_add_black_24dp.png b/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
deleted file mode 100644
index 3191d5283..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_arrow_back_black_24dp.png b/src/main/res/drawable-xhdpi/ic_arrow_back_black_24dp.png
deleted file mode 100644
index 684272536..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_arrow_back_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
deleted file mode 100644
index ce5b878b0..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png
deleted file mode 100644
index c94dc6a74..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-xhdpi/ic_attachment_black_24dp.png
deleted file mode 100644
index b16a95010..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_attachment_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png
deleted file mode 100644
index 186c6aef6..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png
deleted file mode 100644
index 6253c0d47..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index 6ebbc8316..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_close_black_24dp.png b/src/main/res/drawable-xhdpi/ic_close_black_24dp.png
deleted file mode 100644
index 6bc437298..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
deleted file mode 100644
index b7c7ffd0e..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png
deleted file mode 100644
index 4b88311a1..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 388b5b060..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_event_black_24dp.png b/src/main/res/drawable-xhdpi/ic_event_black_24dp.png
deleted file mode 100644
index 4b3cefa2b..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_event_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_event_note_black_24dp.png b/src/main/res/drawable-xhdpi/ic_event_note_black_24dp.png
deleted file mode 100644
index c7fc6e130..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_event_note_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png
deleted file mode 100644
index b64df3612..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_flag_black_24dp.png b/src/main/res/drawable-xhdpi/ic_flag_black_24dp.png
deleted file mode 100644
index c27a168cb..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_flag_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png b/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png
deleted file mode 100644
index 49272b0f9..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
deleted file mode 100644
index d3542c6bc..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_help_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_history_black_24dp.png b/src/main/res/drawable-xhdpi/ic_history_black_24dp.png
deleted file mode 100644
index 8e44d94fd..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_history_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png
deleted file mode 100644
index 078ef4d83..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_insert_drive_file_black_24dp.png b/src/main/res/drawable-xhdpi/ic_insert_drive_file_black_24dp.png
deleted file mode 100644
index ffb07138f..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_insert_drive_file_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_label_black_24dp.png b/src/main/res/drawable-xhdpi/ic_label_black_24dp.png
deleted file mode 100644
index 281364540..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_label_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png b/src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png
deleted file mode 100644
index 7c470b6a5..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 193185fd8..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png b/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png
deleted file mode 100644
index 9f44db5d2..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_mic_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index 14f216da9..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_phone_black_24dp.png b/src/main/res/drawable-xhdpi/ic_phone_black_24dp.png
deleted file mode 100644
index 99f28bbec..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_phone_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png b/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png
deleted file mode 100644
index 75ecb0462..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_save_white_24dp.png b/src/main/res/drawable-xhdpi/ic_save_white_24dp.png
deleted file mode 100644
index adda09575..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_schedule_black_24dp.png b/src/main/res/drawable-xhdpi/ic_schedule_black_24dp.png
deleted file mode 100644
index f5fd81877..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_schedule_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
deleted file mode 100644
index bfc3e3939..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_search_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index e84e188a1..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 5caedc8e5..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png b/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 6d4af1bcb..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_timer_black_24dp.png b/src/main/res/drawable-xhdpi/ic_timer_black_24dp.png
deleted file mode 100644
index a02ae51e6..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_timer_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_today_black_24dp.png b/src/main/res/drawable-xhdpi/ic_today_black_24dp.png
deleted file mode 100644
index 2d6a849cc..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_today_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png b/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index 46bf0c931..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
deleted file mode 100644
index a84106b01..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_arrow_back_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_arrow_back_black_24dp.png
deleted file mode 100644
index fa432c232..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_arrow_back_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
deleted file mode 100644
index 746d77579..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png
deleted file mode 100644
index a9478a6fd..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.png
deleted file mode 100644
index 7093eddb1..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png
deleted file mode 100644
index 33f50d0e2..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png
deleted file mode 100644
index 98c59c176..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index dc32a14f9..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png
deleted file mode 100644
index 51b4401ca..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 6b717e0dd..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png
deleted file mode 100644
index eb6122a48..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 3fcdfdb55..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png
deleted file mode 100644
index 2f5815d2d..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_event_note_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_note_black_24dp.png
deleted file mode 100644
index 78018eb3d..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_event_note_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png
deleted file mode 100644
index 2314642f9..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_flag_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_flag_black_24dp.png
deleted file mode 100644
index a0e48ec80..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_flag_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png
deleted file mode 100644
index 5c4360af8..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
deleted file mode 100644
index 645822e83..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png
deleted file mode 100644
index 18519ee5a..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png
deleted file mode 100644
index 85c1923ed..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_insert_drive_file_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_insert_drive_file_black_24dp.png
deleted file mode 100644
index f68c2bd7c..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_insert_drive_file_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png
deleted file mode 100644
index c86bf6589..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png
deleted file mode 100644
index 9a16a701c..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 9cb034823..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png
deleted file mode 100644
index b0389382e..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index a4a6f6614..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_phone_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_phone_black_24dp.png
deleted file mode 100644
index 7c9d1b09c..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_phone_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png
deleted file mode 100644
index 965a319ff..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png
deleted file mode 100644
index 3e0ce1a5f..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_schedule_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_schedule_black_24dp.png
deleted file mode 100644
index 17786d1fe..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_schedule_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
deleted file mode 100644
index abbb98951..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index 3023ff8da..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index eabb0a2ba..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png
deleted file mode 100644
index b8ef1050e..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_timer_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_timer_black_24dp.png
deleted file mode 100644
index 1513d8eb9..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_timer_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_today_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_today_black_24dp.png
deleted file mode 100644
index 229f0445b..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_today_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png
deleted file mode 100644
index 13eb65df3..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_add_24dp.xml b/src/main/res/drawable/ic_add_24dp.xml
new file mode 100644
index 000000000..51b073bd2
--- /dev/null
+++ b/src/main/res/drawable/ic_add_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    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/src/main/res/drawable/ic_add_black_24dp.png b/src/main/res/drawable/ic_add_black_24dp.png
deleted file mode 100644
index 23bf11921..000000000
Binary files a/src/main/res/drawable/ic_add_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_arrow_back_24dp.xml b/src/main/res/drawable/ic_arrow_back_24dp.xml
new file mode 100644
index 000000000..d9839b1c6
--- /dev/null
+++ b/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    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/src/main/res/drawable/ic_arrow_back_black_24dp.png b/src/main/res/drawable/ic_arrow_back_black_24dp.png
deleted file mode 100644
index ad3883098..000000000
Binary files a/src/main/res/drawable/ic_arrow_back_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_arrow_back_white_24dp.png b/src/main/res/drawable/ic_arrow_back_white_24dp.png
deleted file mode 100644
index d571552fb..000000000
Binary files a/src/main/res/drawable/ic_arrow_back_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_attach_money_24dp.xml b/src/main/res/drawable/ic_attach_money_24dp.xml
new file mode 100644
index 000000000..ae6b67749
--- /dev/null
+++ b/src/main/res/drawable/ic_attach_money_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    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/src/main/res/drawable/ic_attach_money_black_24dp.png b/src/main/res/drawable/ic_attach_money_black_24dp.png
deleted file mode 100644
index 2ae5e6d14..000000000
Binary files a/src/main/res/drawable/ic_attach_money_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_attachment_24dp.xml b/src/main/res/drawable/ic_attachment_24dp.xml
new file mode 100644
index 000000000..115de53d8
--- /dev/null
+++ b/src/main/res/drawable/ic_attachment_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_attachment_black_24dp.png b/src/main/res/drawable/ic_attachment_black_24dp.png
deleted file mode 100644
index ab5bb7489..000000000
Binary files a/src/main/res/drawable/ic_attachment_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_attachment_white_24dp.png b/src/main/res/drawable/ic_attachment_white_24dp.png
deleted file mode 100644
index de912d589..000000000
Binary files a/src/main/res/drawable/ic_attachment_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_cancel_24dp.xml b/src/main/res/drawable/ic_cancel_24dp.xml
new file mode 100644
index 000000000..1a1352f61
--- /dev/null
+++ b/src/main/res/drawable/ic_cancel_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_cancel_black_24dp.png b/src/main/res/drawable/ic_cancel_black_24dp.png
deleted file mode 100644
index f19848466..000000000
Binary files a/src/main/res/drawable/ic_cancel_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_cancel_white_24dp.png b/src/main/res/drawable/ic_cancel_white_24dp.png
deleted file mode 100644
index 787e25937..000000000
Binary files a/src/main/res/drawable/ic_cancel_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_check_24dp.xml b/src/main/res/drawable/ic_check_24dp.xml
new file mode 100644
index 000000000..ba0874016
--- /dev/null
+++ b/src/main/res/drawable/ic_check_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_close_24dp.xml b/src/main/res/drawable/ic_close_24dp.xml
new file mode 100644
index 000000000..4ee27e28a
--- /dev/null
+++ b/src/main/res/drawable/ic_close_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    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,12z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_close_black_24dp.png b/src/main/res/drawable/ic_close_black_24dp.png
deleted file mode 100644
index 40a1a84e3..000000000
Binary files a/src/main/res/drawable/ic_close_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_close_white_24dp.png b/src/main/res/drawable/ic_close_white_24dp.png
deleted file mode 100644
index af7f8288d..000000000
Binary files a/src/main/res/drawable/ic_close_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_cloud_queue_24dp.xml b/src/main/res/drawable/ic_cloud_queue_24dp.xml
new file mode 100644
index 000000000..1ee8bbe43
--- /dev/null
+++ b/src/main/res/drawable/ic_cloud_queue_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_cloud_queue_black_24dp.png b/src/main/res/drawable/ic_cloud_queue_black_24dp.png
deleted file mode 100644
index ba74612d9..000000000
Binary files a/src/main/res/drawable/ic_cloud_queue_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_delete_24dp.xml b/src/main/res/drawable/ic_delete_24dp.xml
new file mode 100644
index 000000000..7d4a324bc
--- /dev/null
+++ b/src/main/res/drawable/ic_delete_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_delete_white_24dp.png b/src/main/res/drawable/ic_delete_white_24dp.png
deleted file mode 100644
index e2f5f3555..000000000
Binary files a/src/main/res/drawable/ic_delete_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_event_24dp.xml b/src/main/res/drawable/ic_event_24dp.xml
new file mode 100644
index 000000000..e3d306ab7
--- /dev/null
+++ b/src/main/res/drawable/ic_event_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_event_black_24dp.png b/src/main/res/drawable/ic_event_black_24dp.png
deleted file mode 100644
index c47f2812d..000000000
Binary files a/src/main/res/drawable/ic_event_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_event_note_24dp.xml b/src/main/res/drawable/ic_event_note_24dp.xml
new file mode 100644
index 000000000..614f4a769
--- /dev/null
+++ b/src/main/res/drawable/ic_event_note_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_event_note_black_24dp.png b/src/main/res/drawable/ic_event_note_black_24dp.png
deleted file mode 100644
index 2566a75d6..000000000
Binary files a/src/main/res/drawable/ic_event_note_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_filter_list_24dp.xml b/src/main/res/drawable/ic_filter_list_24dp.xml
new file mode 100644
index 000000000..61dcd3a32
--- /dev/null
+++ b/src/main/res/drawable/ic_filter_list_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18V6H3zm3,7h12v-2H6v2z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_filter_list_black_24dp.png b/src/main/res/drawable/ic_filter_list_black_24dp.png
deleted file mode 100644
index d86492b42..000000000
Binary files a/src/main/res/drawable/ic_filter_list_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_flag_24dp.xml b/src/main/res/drawable/ic_flag_24dp.xml
new file mode 100644
index 000000000..4a65626f0
--- /dev/null
+++ b/src/main/res/drawable/ic_flag_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_flag_black_24dp.png b/src/main/res/drawable/ic_flag_black_24dp.png
deleted file mode 100644
index 44ad605ad..000000000
Binary files a/src/main/res/drawable/ic_flag_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_folder_24dp.xml b/src/main/res/drawable/ic_folder_24dp.xml
new file mode 100644
index 000000000..df23bc878
--- /dev/null
+++ b/src/main/res/drawable/ic_folder_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_folder_black_24dp.png b/src/main/res/drawable/ic_folder_black_24dp.png
deleted file mode 100644
index 6e6b8705e..000000000
Binary files a/src/main/res/drawable/ic_folder_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_help_24dp.xml b/src/main/res/drawable/ic_help_24dp.xml
new file mode 100644
index 000000000..f45935e6f
--- /dev/null
+++ b/src/main/res/drawable/ic_help_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_help_black_24dp.png b/src/main/res/drawable/ic_help_black_24dp.png
deleted file mode 100644
index f6e789ba1..000000000
Binary files a/src/main/res/drawable/ic_help_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_history_24dp.xml b/src/main/res/drawable/ic_history_24dp.xml
new file mode 100644
index 000000000..5751bac08
--- /dev/null
+++ b/src/main/res/drawable/ic_history_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_history_black_24dp.png b/src/main/res/drawable/ic_history_black_24dp.png
deleted file mode 100644
index e77a077ae..000000000
Binary files a/src/main/res/drawable/ic_history_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_inbox_24dp.xml b/src/main/res/drawable/ic_inbox_24dp.xml
new file mode 100644
index 000000000..155b229f0
--- /dev/null
+++ b/src/main/res/drawable/ic_inbox_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3H4.99c-1.1,0 -1.98,0.9 -1.98,2L3,19c0,1.1 0.89,2 1.99,2H19c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,12h-4c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3H4.99V5H19v10zm-3,-5h-2V7h-4v3H8l4,4 4,-4z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_inbox_black_24dp.png b/src/main/res/drawable/ic_inbox_black_24dp.png
deleted file mode 100644
index 0129706c1..000000000
Binary files a/src/main/res/drawable/ic_inbox_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_insert_drive_file_24dp.xml b/src/main/res/drawable/ic_insert_drive_file_24dp.xml
new file mode 100644
index 000000000..4f4262981
--- /dev/null
+++ b/src/main/res/drawable/ic_insert_drive_file_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8l-6,-6H6zm7,7V3.5L18.5,9H13z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_insert_drive_file_black_24dp.png b/src/main/res/drawable/ic_insert_drive_file_black_24dp.png
deleted file mode 100644
index fe876672a..000000000
Binary files a/src/main/res/drawable/ic_insert_drive_file_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_label_24dp.xml b/src/main/res/drawable/ic_label_24dp.xml
new file mode 100644
index 000000000..07164af55
--- /dev/null
+++ b/src/main/res/drawable/ic_label_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    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.16z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_label_black_24dp.png b/src/main/res/drawable/ic_label_black_24dp.png
deleted file mode 100644
index 119dc2105..000000000
Binary files a/src/main/res/drawable/ic_label_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_label_outline_24dp.xml b/src/main/res/drawable/ic_label_outline_24dp.xml
new file mode 100644
index 000000000..158076604
--- /dev/null
+++ b/src/main/res/drawable/ic_label_outline_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <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/src/main/res/drawable/ic_label_outline_black_24dp.png b/src/main/res/drawable/ic_label_outline_black_24dp.png
deleted file mode 100644
index 1d600c216..000000000
Binary files a/src/main/res/drawable/ic_label_outline_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_menu_24dp.xml b/src/main/res/drawable/ic_menu_24dp.xml
new file mode 100644
index 000000000..89198a3f9
--- /dev/null
+++ b/src/main/res/drawable/ic_menu_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_menu_white_24dp.png b/src/main/res/drawable/ic_menu_white_24dp.png
deleted file mode 100644
index d3cec0564..000000000
Binary files a/src/main/res/drawable/ic_menu_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_mic_24dp.xml b/src/main/res/drawable/ic_mic_24dp.xml
new file mode 100644
index 000000000..ac5e85609
--- /dev/null
+++ b/src/main/res/drawable/ic_mic_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_mic_white_24dp.png b/src/main/res/drawable/ic_mic_white_24dp.png
deleted file mode 100644
index 87319a6cc..000000000
Binary files a/src/main/res/drawable/ic_mic_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_notifications_24dp.xml b/src/main/res/drawable/ic_notifications_24dp.xml
new file mode 100644
index 000000000..452854311
--- /dev/null
+++ b/src/main/res/drawable/ic_notifications_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_notifications_black_24dp.png b/src/main/res/drawable/ic_notifications_black_24dp.png
deleted file mode 100644
index 8cd28c8b4..000000000
Binary files a/src/main/res/drawable/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_phone_black_24dp.png b/src/main/res/drawable/ic_phone_black_24dp.png
deleted file mode 100644
index 55ed026bc..000000000
Binary files a/src/main/res/drawable/ic_phone_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_repeat_24dp.xml b/src/main/res/drawable/ic_repeat_24dp.xml
new file mode 100644
index 000000000..4dd2efdba
--- /dev/null
+++ b/src/main/res/drawable/ic_repeat_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M7,7h10v3l4,-4 -4,-4v3H5v6h2V7zm10,10H7v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_repeat_black_24dp.png b/src/main/res/drawable/ic_repeat_black_24dp.png
deleted file mode 100644
index c00a24ebf..000000000
Binary files a/src/main/res/drawable/ic_repeat_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_save_24dp.xml b/src/main/res/drawable/ic_save_24dp.xml
new file mode 100644
index 000000000..c26fb3328
--- /dev/null
+++ b/src/main/res/drawable/ic_save_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_save_white_24dp.png b/src/main/res/drawable/ic_save_white_24dp.png
deleted file mode 100644
index 015062ed3..000000000
Binary files a/src/main/res/drawable/ic_save_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_schedule_24dp.xml b/src/main/res/drawable/ic_schedule_24dp.xml
new file mode 100644
index 000000000..ad969d6d6
--- /dev/null
+++ b/src/main/res/drawable/ic_schedule_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_schedule_black_24dp.png b/src/main/res/drawable/ic_schedule_black_24dp.png
deleted file mode 100644
index 8423cf4ce..000000000
Binary files a/src/main/res/drawable/ic_schedule_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_search_24dp.xml b/src/main/res/drawable/ic_search_24dp.xml
new file mode 100644
index 000000000..173d7cc2f
--- /dev/null
+++ b/src/main/res/drawable/ic_search_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    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,-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/src/main/res/drawable/ic_search_white_24dp.png b/src/main/res/drawable/ic_search_white_24dp.png
deleted file mode 100644
index faefc59c8..000000000
Binary files a/src/main/res/drawable/ic_search_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_settings_24dp.xml b/src/main/res/drawable/ic_settings_24dp.xml
new file mode 100644
index 000000000..f125782f0
--- /dev/null
+++ b/src/main/res/drawable/ic_settings_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    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.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/src/main/res/drawable/ic_settings_black_24dp.png b/src/main/res/drawable/ic_settings_black_24dp.png
deleted file mode 100644
index c59419c02..000000000
Binary files a/src/main/res/drawable/ic_settings_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_settings_white_24dp.png b/src/main/res/drawable/ic_settings_white_24dp.png
deleted file mode 100644
index 8909c3553..000000000
Binary files a/src/main/res/drawable/ic_settings_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_snooze_24dp.xml b/src/main/res/drawable/ic_snooze_24dp.xml
new file mode 100644
index 000000000..985c5b671
--- /dev/null
+++ b/src/main/res/drawable/ic_snooze_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm0,16c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7zm-3,-9h3.63L9,15.2V17h6v-2h-3.63L15,10.8V9H9v2z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_sort_24dp.xml b/src/main/res/drawable/ic_sort_24dp.xml
new file mode 100644
index 000000000..3735be4cb
--- /dev/null
+++ b/src/main/res/drawable/ic_sort_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,18h6v-2H3v2zM3,6v2h18V6H3zm0,7h12v-2H3v2z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_sort_white_24dp.png b/src/main/res/drawable/ic_sort_white_24dp.png
deleted file mode 100644
index 3d84a4442..000000000
Binary files a/src/main/res/drawable/ic_sort_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_timer_24dp.xml b/src/main/res/drawable/ic_timer_24dp.xml
new file mode 100644
index 000000000..fa9420593
--- /dev/null
+++ b/src/main/res/drawable/ic_timer_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_timer_black_24dp.png b/src/main/res/drawable/ic_timer_black_24dp.png
deleted file mode 100644
index 15d315114..000000000
Binary files a/src/main/res/drawable/ic_timer_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_today_24dp.xml b/src/main/res/drawable/ic_today_24dp.xml
new file mode 100644
index 000000000..b3e52fa2c
--- /dev/null
+++ b/src/main/res/drawable/ic_today_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_today_black_24dp.png b/src/main/res/drawable/ic_today_black_24dp.png
deleted file mode 100644
index 227bfca96..000000000
Binary files a/src/main/res/drawable/ic_today_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_visibility_off_24dp.xml b/src/main/res/drawable/ic_visibility_off_24dp.xml
new file mode 100644
index 000000000..59a614550
--- /dev/null
+++ b/src/main/res/drawable/ic_visibility_off_24dp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/src/main/res/drawable/ic_visibility_off_black_24dp.png b/src/main/res/drawable/ic_visibility_off_black_24dp.png
deleted file mode 100644
index 3efdf4922..000000000
Binary files a/src/main/res/drawable/ic_visibility_off_black_24dp.png and /dev/null differ
diff --git a/src/main/res/layout/alarm_edit_row.xml b/src/main/res/layout/alarm_edit_row.xml
index 42ed679c7..cbe52c594 100644
--- a/src/main/res/layout/alarm_edit_row.xml
+++ b/src/main/res/layout/alarm_edit_row.xml
@@ -29,7 +29,8 @@
 
     <ImageView
         android:id="@+id/button1"
-        android:src="?attr/ic_cancel"
+        android:src="@drawable/ic_cancel_24dp"
+        android:tint="?attr/icon_tint"
         android:layout_gravity="center"
         android:contentDescription="@android:string/cancel"
         android:layout_width="wrap_content"
diff --git a/src/main/res/layout/astrid_calendar_list_creator_view.xml b/src/main/res/layout/astrid_calendar_list_creator_view.xml
index 651b19b63..32bb34130 100644
--- a/src/main/res/layout/astrid_calendar_list_creator_view.xml
+++ b/src/main/res/layout/astrid_calendar_list_creator_view.xml
@@ -36,7 +36,8 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_close_white_24dp"/>
+            android:tint="@android:color/white"
+            android:src="@drawable/ic_close_24dp"/>
     
     </LinearLayout>
 
@@ -97,7 +98,8 @@
 	        android:padding="4dip"
 	        android:background="@android:color/transparent"
 	        android:scaleType="fitCenter"
-	        android:src="@drawable/ic_settings_white_24dp"/>
+            android:tint="@android:color/white"
+	        android:src="@drawable/ic_settings_24dp"/>
     </RelativeLayout>
 
 
diff --git a/src/main/res/layout/astrid_calendar_reminder_view.xml b/src/main/res/layout/astrid_calendar_reminder_view.xml
index 6acf35497..a3a1f52fe 100644
--- a/src/main/res/layout/astrid_calendar_reminder_view.xml
+++ b/src/main/res/layout/astrid_calendar_reminder_view.xml
@@ -36,7 +36,8 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_close_white_24dp"/>
+            android:tint="@android:color/white"
+            android:src="@drawable/ic_close_24dp"/>
     
     </LinearLayout>
 
@@ -97,7 +98,8 @@
 	        android:padding="4dip"
 	        android:background="@android:color/transparent"
 	        android:scaleType="fitCenter"
-	        android:src="@drawable/ic_settings_white_24dp"/>
+            android:tint="@android:color/white"
+	        android:src="@drawable/ic_settings_24dp"/>
     </RelativeLayout>
 
 
diff --git a/src/main/res/layout/astrid_record_audio_view.xml b/src/main/res/layout/astrid_record_audio_view.xml
index f0c08d222..d0207dbce 100644
--- a/src/main/res/layout/astrid_record_audio_view.xml
+++ b/src/main/res/layout/astrid_record_audio_view.xml
@@ -36,7 +36,8 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_close_white_24dp"/>
+            android:tint="@android:color/white"
+            android:src="@drawable/ic_close_24dp"/>
     
     </LinearLayout>
     
diff --git a/src/main/res/layout/control_set_deadline.xml b/src/main/res/layout/control_set_deadline.xml
index e506e2dfc..1fb12fc24 100644
--- a/src/main/res/layout/control_set_deadline.xml
+++ b/src/main/res/layout/control_set_deadline.xml
@@ -41,7 +41,8 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:paddingStart="10dp"
-        android:src="?attr/ic_cancel"
+        android:src="@drawable/ic_cancel_24dp"
+        android:tint="?attr/icon_tint"
         android:visibility="gone" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/control_set_template.xml b/src/main/res/layout/control_set_template.xml
index fe739cccd..2c8853bd4 100644
--- a/src/main/res/layout/control_set_template.xml
+++ b/src/main/res/layout/control_set_template.xml
@@ -9,6 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
+        android:tint="?attr/icon_tint"
         android:alpha="@dimen/drawer_icon_alpha"
         android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
         android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
diff --git a/src/main/res/layout/file_row.xml b/src/main/res/layout/file_row.xml
index ada9a522f..2962dd76a 100644
--- a/src/main/res/layout/file_row.xml
+++ b/src/main/res/layout/file_row.xml
@@ -41,7 +41,8 @@
         android:id="@+id/remove_file"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="?attr/ic_action_cancel"
+        android:tint="?attr/icon_tint"
+        android:src="@drawable/ic_close_24dp"
         android:layout_marginLeft="-5dip"
         android:layout_marginRight="5dip"
         android:visibility="gone" />
diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml
index eae67a064..e1dafc90e 100644
--- a/src/main/res/layout/filter_adapter_row.xml
+++ b/src/main/res/layout/filter_adapter_row.xml
@@ -34,6 +34,7 @@
             android:id="@+id/icon"
             android:layout_width="56dp"
             android:layout_height="wrap_content"
+            android:tint="?attr/icon_tint"
             android:alpha="@dimen/drawer_icon_alpha"
             android:scaleType="fitStart" />
 
diff --git a/src/main/res/layout/tag_edit_row.xml b/src/main/res/layout/tag_edit_row.xml
index 2ab062fb5..304be7110 100644
--- a/src/main/res/layout/tag_edit_row.xml
+++ b/src/main/res/layout/tag_edit_row.xml
@@ -30,7 +30,8 @@
 
     <ImageView
         android:id="@+id/button1"
-        android:src="?attr/ic_action_cancel"
+        android:tint="?attr/icon_tint"
+        android:src="@drawable/ic_close_24dp"
         android:contentDescription="@string/remove"
         android:layout_gravity="center_vertical"
         android:layout_margin="4dip"
diff --git a/src/main/res/layout/task_edit_activity.xml b/src/main/res/layout/task_edit_activity.xml
index 6fc6a4bd5..af3fcb624 100644
--- a/src/main/res/layout/task_edit_activity.xml
+++ b/src/main/res/layout/task_edit_activity.xml
@@ -142,7 +142,8 @@
             android:layout_marginLeft="3dip"
             android:layout_weight="1"
             android:background="@android:color/transparent"
-            android:src="@drawable/ic_add_white_24dp"
+            android:tint="@android:color/white"
+            android:src="@drawable/ic_add_24dp"
             android:scaleType="center"
             android:visibility="gone" />
     </LinearLayout>
diff --git a/src/main/res/layout/task_list_activity.xml b/src/main/res/layout/task_list_activity.xml
index 0dfbb4829..4f0e5d72b 100644
--- a/src/main/res/layout/task_list_activity.xml
+++ b/src/main/res/layout/task_list_activity.xml
@@ -24,7 +24,8 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
-        android:src="?attr/fab_icon"
+        android:src="@drawable/ic_add_24dp"
+        android:tint="?attr/fab_tint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
diff --git a/src/main/res/layout/widget_toolbar.xml b/src/main/res/layout/widget_toolbar.xml
index d06c356ac..744df452e 100644
--- a/src/main/res/layout/widget_toolbar.xml
+++ b/src/main/res/layout/widget_toolbar.xml
@@ -25,7 +25,8 @@
         android:layout_height="39dp"
         android:layout_gravity="right|center_vertical"
         android:background="@android:color/transparent"
-        android:src="@drawable/ic_add_white_24dp"
+        android:tint="@android:color/white"
+        android:src="@drawable/ic_add_24dp"
         android:scaleType="fitCenter"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/tag_settings_activity.xml b/src/main/res/menu/tag_settings_activity.xml
index d8277913f..5d37d3872 100644
--- a/src/main/res/menu/tag_settings_activity.xml
+++ b/src/main/res/menu/tag_settings_activity.xml
@@ -5,13 +5,13 @@
     <item
         android:id="@+id/menu_save"
         android:title="@string/save"
-        android:icon="@drawable/ic_save_white_24dp"
+        android:icon="@drawable/ic_save_24dp"
         app:showAsAction="always"/>
 
     <item
         android:id="@+id/delete"
         android:title="@string/delete"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_24dp"
         app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/task_edit_fragment.xml b/src/main/res/menu/task_edit_fragment.xml
index ee423ea9c..c61fff89f 100644
--- a/src/main/res/menu/task_edit_fragment.xml
+++ b/src/main/res/menu/task_edit_fragment.xml
@@ -5,18 +5,18 @@
     <item
         android:id="@+id/menu_save"
         android:title="@string/TEA_menu_save"
-        android:icon="@drawable/ic_save_white_24dp"
+        android:icon="@drawable/ic_save_24dp"
         android:visible="false"
         tasks:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_attach"
         android:title="@string/premium_attach_file"
-        android:icon="@drawable/ic_attachment_white_24dp"
+        android:icon="@drawable/ic_attachment_24dp"
         tasks:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_record_note"
         android:title="@string/premium_record_audio"
-        android:icon="@drawable/ic_mic_white_24dp"
+        android:icon="@drawable/ic_mic_24dp"
         tasks:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_discard"
diff --git a/src/main/res/menu/task_list_activity.xml b/src/main/res/menu/task_list_activity.xml
index b66edf07e..c3c28bade 100644
--- a/src/main/res/menu/task_list_activity.xml
+++ b/src/main/res/menu/task_list_activity.xml
@@ -6,18 +6,18 @@
     <item
         android:id="@+id/menu_voice_add"
         android:title="@string/EPr_voiceInputEnabled_title"
-        android:icon="@drawable/ic_mic_white_24dp"
+        android:icon="@drawable/ic_mic_24dp"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_search"
         android:title="@string/TLA_menu_search"
-        android:icon="@drawable/ic_search_white_24dp"
+        android:icon="@drawable/ic_search_24dp"
         app:showAsAction="ifRoom|collapseActionView"
         app:actionViewClass="android.support.v7.widget.SearchView"/>
     <item
         android:id="@+id/menu_sort"
         android:title="@string/TLA_menu_sort"
-        android:icon="@drawable/ic_sort_white_24dp"
+        android:icon="@drawable/ic_sort_24dp"
         app:showAsAction="ifRoom" />
     <group
         android:checkableBehavior="all">
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index d6bba5e47..18b47272d 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -23,14 +23,13 @@
     <attr name="asThemeTextColor" format="color" />
     <attr name="asEditTextBackground" format="reference" />
     <attr name="asAbBackgroundColor" format="color" />
-    <attr name="ic_action_cancel" format="reference" />
+    <attr name="fab_tint" format="color"/>
     <attr name="importance_background_selected" format="reference" />
-    <attr name="fab_icon" format="reference" />
+    <attr name="icon_tint" format="color"/>
     <attr name="toolbarSeparatorHeight" format="dimension" />
     <attr name="separatorHeight" format="dimension" />
     <attr name="popup_theme" format="reference" />
     <attr name="textfield_underline" format="reference" />
-    <attr name="ic_cancel" format="reference" />
 
     <declare-styleable name="DateAndTimePicker">
         <attr name="shortcutLabels" format="reference" />
diff --git a/src/main/res/values/styles_dark.xml b/src/main/res/values/styles_dark.xml
index 2a4d372f3..7ce20e85b 100644
--- a/src/main/res/values/styles_dark.xml
+++ b/src/main/res/values/styles_dark.xml
@@ -23,10 +23,10 @@
         <item name="asTextColorHint">@android:color/darker_gray</item>
         <item name="asTextColorInverse">@android:color/black</item>
         <item name="asAbBackgroundColor">@android:color/black</item>
+        <item name="icon_tint">@android:color/white</item>
         <item name="task_edit_divider">@color/task_edit_divider_dark</item>
-        <item name="ic_action_cancel">@drawable/ic_close_white_24dp</item>
         <item name="asDueDateColor">#c3c3c3</item>
-        <item name="fab_icon">@drawable/ic_add_black_24dp</item>
+        <item name="fab_tint">@android:color/black</item>
 
         <item name="asEditTextBackground">@null</item>
         <item name="windowActionModeOverlay">true</item>
@@ -41,7 +41,6 @@
         <item name="importance_background_selected">@drawable/importance_background_selected</item>
         <item name="textfield_underline">@drawable/textfield_underline_white</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
-        <item name="ic_cancel">@drawable/ic_cancel_white_24dp</item>
     </style>
 
     <style name="TasksDialogDark" parent="@style/Theme.AppCompat.Dialog">
diff --git a/src/main/res/values/styles_light.xml b/src/main/res/values/styles_light.xml
index e4cb81844..546d0047a 100644
--- a/src/main/res/values/styles_light.xml
+++ b/src/main/res/values/styles_light.xml
@@ -15,8 +15,6 @@
         <item name="asEditTextBackground">@null</item>
         <item name="windowActionModeOverlay">true</item>
 
-        <item name="ic_action_cancel">@drawable/ic_close_black_24dp</item>
-
         <item name="drawer_background">@color/drawer_background</item>
         <item name="drawer_background_selected">@color/drawer_background_selected</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
@@ -36,12 +34,12 @@
         <item name="asListDividerColor">#dddddd</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asAbBackgroundColor">#607d8b</item>
+        <item name="icon_tint">@android:color/black</item>
+        <item name="fab_tint">@android:color/white</item>
         <item name="importance_background_selected">@drawable/importance_background_selected</item>
         <item name="task_edit_divider">@color/task_edit_divider</item>
-        <item name="fab_icon">@drawable/ic_add_white_24dp</item>
         <item name="textfield_underline">@drawable/textfield_underline_black</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
-        <item name="ic_cancel">@drawable/ic_cancel_black_24dp</item>
     </style>
 
     <style name="TasksDialog" parent="@style/Theme.AppCompat.Light.Dialog">