diff --git a/app/build.gradle b/app/build.gradle
index a400f7a67..61ffb665c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -158,9 +158,6 @@ dependencies {
transitive = true
}
- // Google material icons SVG.
- compile 'com.mikepenz:google-material-typeface:2.1.0.1.original@aar'
-
compile('com.github.afollestad.material-dialogs:core:0.8.5.6@aar') {
transitive = true
}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
index 9a6dc05b0..725332636 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@@ -288,7 +288,7 @@ class LibraryUpdateService : Service() {
setContentTitle(manga.title)
setProgress(total, current, false)
setOngoing(true)
- addAction(R.drawable.ic_clear, getString(R.string.action_cancel), cancelIntent)
+ addAction(R.drawable.ic_clear_black_24dp, getString(R.string.action_cancel), cancelIntent)
}
notificationManager.notify(UPDATE_NOTIFICATION_ID, n)
}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java
index c386a995f..b54223eb7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java
@@ -4,13 +4,14 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.AppBarLayout;
import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.widget.Toolbar;
import android.widget.FrameLayout;
-import com.mikepenz.google_material_typeface_library.GoogleMaterial;
import com.mikepenz.materialdrawer.Drawer;
import com.mikepenz.materialdrawer.DrawerBuilder;
+import com.mikepenz.materialdrawer.holder.ImageHolder;
import com.mikepenz.materialdrawer.model.DividerDrawerItem;
import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
@@ -35,6 +36,7 @@ public class MainActivity extends BaseActivity {
int selectedItem;
private Drawer drawer;
private FragmentStack fragmentStack;
+ private int prevIdentifier = -1;
@Override
protected void onCreate(Bundle savedState) {
@@ -73,42 +75,50 @@ public class MainActivity extends BaseActivity {
new PrimaryDrawerItem()
.withName(R.string.label_library)
.withIdentifier(R.id.nav_drawer_library)
- .withIcon(GoogleMaterial.Icon.gmd_book),
+ .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_book_grey_24dp)),
new PrimaryDrawerItem()
.withName(R.string.label_recent_updates)
.withIdentifier(R.id.nav_drawer_recent_updates)
- .withIcon(GoogleMaterial.Icon.gmd_update),
+ .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_history_grey_24dp)),
new PrimaryDrawerItem()
.withName(R.string.label_catalogues)
.withIdentifier(R.id.nav_drawer_catalogues)
- .withIcon(GoogleMaterial.Icon.gmd_explore),
+ .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_explore_grey_24dp)),
new PrimaryDrawerItem()
.withName(R.string.label_download_queue)
.withIdentifier(R.id.nav_drawer_downloads)
- .withIcon(GoogleMaterial.Icon.gmd_file_download),
+ .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_file_download_grey_24dp)),
new DividerDrawerItem(),
new PrimaryDrawerItem()
.withName(R.string.label_settings)
.withIdentifier(R.id.nav_drawer_settings)
.withSelectable(false)
- .withIcon(GoogleMaterial.Icon.gmd_settings)
+ .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_settings_grey_24dp))
)
.withSavedInstance(savedState)
.withOnDrawerItemClickListener(
(view, position, drawerItem) -> {
if (drawerItem != null) {
int identifier = drawerItem.getIdentifier();
+ if (prevIdentifier != -1)
+ setIconBackToGrey(prevIdentifier, identifier);
+ prevIdentifier = identifier;
+
switch (identifier) {
case R.id.nav_drawer_library:
+ drawer.updateIcon(identifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_book_blue_24dp)));
setFragment(LibraryFragment.newInstance());
break;
case R.id.nav_drawer_recent_updates:
+ drawer.updateIcon(identifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_history_blue_24dp)));
setFragment(RecentChaptersFragment.newInstance());
break;
case R.id.nav_drawer_catalogues:
+ drawer.updateIcon(identifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_explore_blue_24dp)));
setFragment(CatalogueFragment.newInstance());
break;
case R.id.nav_drawer_downloads:
+ drawer.updateIcon(identifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_file_download_blue_24dp)));
setFragment(DownloadFragment.newInstance());
break;
case R.id.nav_drawer_settings:
@@ -135,6 +145,27 @@ public class MainActivity extends BaseActivity {
}
}
+ private void setIconBackToGrey(int prevIdentifier, int identifier) {
+ // Don't set to grey when settings
+ if (identifier == R.id.nav_drawer_settings)
+ return;
+
+ switch (prevIdentifier) {
+ case R.id.nav_drawer_library:
+ drawer.updateIcon(prevIdentifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_book_grey_24dp)));
+ break;
+ case R.id.nav_drawer_recent_updates:
+ drawer.updateIcon(prevIdentifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_history_grey_24dp)));
+ break;
+ case R.id.nav_drawer_catalogues:
+ drawer.updateIcon(prevIdentifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_explore_grey_24dp)));
+ break;
+ case R.id.nav_drawer_downloads:
+ drawer.updateIcon(prevIdentifier, new ImageHolder(ContextCompat.getDrawable(this, R.drawable.ic_file_download_grey_24dp)));
+ break;
+ }
+ }
+
@Override
protected void onSaveInstanceState(Bundle outState) {
selectedItem = drawer.getCurrentSelection();
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java
index 2674ba3d1..086016c5d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java
@@ -191,9 +191,9 @@ public class ReaderMenu {
.subscribe(value -> {
boolean isPortrait = activity.getResources().getConfiguration()
.orientation == Configuration.ORIENTATION_PORTRAIT;
- int resourceId = value == 1 ? R.drawable.ic_screen_rotation : isPortrait ?
- R.drawable.ic_screen_lock_portrait :
- R.drawable.ic_screen_lock_landscape;
+ int resourceId = value == 1 ? R.drawable.ic_screen_rotation_white_24dp : isPortrait ?
+ R.drawable.ic_screen_lock_portrait_white_24dp :
+ R.drawable.ic_screen_lock_landscape_white_24dp;
lockOrientation.setImageResource(resourceId);
}));
diff --git a/app/src/main/res/drawable-hdpi/ic_action_delete_36dp.png b/app/src/main/res/drawable-hdpi/ic_action_delete_36dp.png
deleted file mode 100644
index 8377c1da7..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_delete_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_done_all.png b/app/src/main/res/drawable-hdpi/ic_action_done_all.png
deleted file mode 100644
index 90c28786f..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_done_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_reorder.png b/app/src/main/res/drawable-hdpi/ic_action_reorder.png
deleted file mode 100644
index 9aa1825a0..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_reorder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_select_all.png b/app/src/main/res/drawable-hdpi/ic_action_select_all.png
deleted file mode 100644
index 20f0ee821..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_select_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_undone_all.png b/app/src/main/res/drawable-hdpi/ic_action_undone_all.png
deleted file mode 100644
index a5c8b2bfd..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_undone_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
deleted file mode 100644
index 694179bd4..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark_border_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_bookmark_border_white_24dp.png
deleted file mode 100644
index 8b0c16c24..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bookmark_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_bookmark_white_24dp.png
deleted file mode 100644
index 9de15c51a..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bookmark_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_brightness_high.png b/app/src/main/res/drawable-hdpi/ic_brightness_high.png
deleted file mode 100644
index d9276d779..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_brightness_high.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_clear_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_clear_grey600_24dp.png
deleted file mode 100644
index 0bf2d1466..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_clear_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_crop_original_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_crop_original_white_24dp.png
deleted file mode 100644
index 78ad3222d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_crop_original_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_expand_less_white_36dp.png
deleted file mode 100644
index ddd0078f3..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_expand_less_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index 82e6ac353..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_border_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_favorite_border_white_24dp.png
deleted file mode 100644
index c82d09e60..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index f0328fa2b..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download.png b/app/src/main/res/drawable-hdpi/ic_file_download.png
deleted file mode 100644
index a1714bc05..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png
deleted file mode 100644
index d9aacea4c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_black_36dp.png
deleted file mode 100644
index e8d3ec487..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_file_download_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_black_48dp.png
deleted file mode 100644
index ce97c85df..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_file_download_black_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 595ff10ac..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_more_horiz_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_more_horiz_black_24dp.png
deleted file mode 100644
index 4580c8165..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_more_horiz_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_more_vert.png b/app/src/main/res/drawable-hdpi/ic_more_vert.png
deleted file mode 100644
index 884a7dbee..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_more_vert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pause.png b/app/src/main/res/drawable-hdpi/ic_pause.png
deleted file mode 100644
index 4d2ea05c4..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow.png b/app/src/main/res/drawable-hdpi/ic_play_arrow.png
deleted file mode 100644
index 2c9651862..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_arrow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index 29adeed05..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_screen_lock_landscape.png b/app/src/main/res/drawable-hdpi/ic_screen_lock_landscape.png
deleted file mode 100644
index 5d767ac08..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_screen_lock_landscape.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_screen_lock_portrait.png b/app/src/main/res/drawable-hdpi/ic_screen_lock_portrait.png
deleted file mode 100644
index edb8dcd07..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_screen_lock_portrait.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_screen_rotation.png b/app/src/main/res/drawable-hdpi/ic_screen_rotation.png
deleted file mode 100644
index 4512bb19e..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_screen_rotation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png
deleted file mode 100644
index 48dbcb9b6..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png
deleted file mode 100644
index b50e444f9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stop.png b/app/src/main/res/drawable-hdpi/ic_stop.png
deleted file mode 100644
index a692d9d1c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_view_carousel.png b/app/src/main/res/drawable-hdpi/ic_view_carousel.png
deleted file mode 100644
index 5c6f94afd..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_view_carousel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_view_list_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_view_list_white_24dp.png
deleted file mode 100644
index 98c45924a..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_view_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_view_module_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_view_module_white_24dp.png
deleted file mode 100644
index 53f1e56af..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_view_module_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_zoom_out_map_white_24dp.png
deleted file mode 100644
index 141adc875..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_zoom_out_map_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_delete_36dp.png b/app/src/main/res/drawable-ldpi/ic_action_delete_36dp.png
deleted file mode 100644
index 5bbc47180..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_delete_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_brightness_high.png b/app/src/main/res/drawable-ldpi/ic_brightness_high.png
deleted file mode 100644
index c2e127e65..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_brightness_high.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_clear_grey600_24dp.png b/app/src/main/res/drawable-ldpi/ic_clear_grey600_24dp.png
deleted file mode 100644
index 856b3646b..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_clear_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_crop_original_white_24dp.png b/app/src/main/res/drawable-ldpi/ic_crop_original_white_24dp.png
deleted file mode 100644
index 82a55ffbe..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_crop_original_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_file_download.png b/app/src/main/res/drawable-ldpi/ic_file_download.png
deleted file mode 100644
index be2b7d3b9..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_file_download_black_36dp.png b/app/src/main/res/drawable-ldpi/ic_file_download_black_36dp.png
deleted file mode 100644
index 9ab2d63a6..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_file_download_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_more_vert.png b/app/src/main/res/drawable-ldpi/ic_more_vert.png
deleted file mode 100644
index 3e1947719..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_more_vert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_pause.png b/app/src/main/res/drawable-ldpi/ic_pause.png
deleted file mode 100644
index d3edf7439..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_play_arrow.png b/app/src/main/res/drawable-ldpi/ic_play_arrow.png
deleted file mode 100644
index b83fa2514..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_play_arrow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_screen_lock_landscape.png b/app/src/main/res/drawable-ldpi/ic_screen_lock_landscape.png
deleted file mode 100644
index 95c5360ff..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_screen_lock_landscape.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_screen_lock_portrait.png b/app/src/main/res/drawable-ldpi/ic_screen_lock_portrait.png
deleted file mode 100644
index 51448e2cf..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_screen_lock_portrait.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_screen_rotation.png b/app/src/main/res/drawable-ldpi/ic_screen_rotation.png
deleted file mode 100644
index c713880c3..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_screen_rotation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-ldpi/ic_skip_next_white_24dp.png
deleted file mode 100644
index be6e4e44a..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_skip_next_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-ldpi/ic_skip_previous_white_24dp.png
deleted file mode 100644
index 6f71c7998..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_skip_previous_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_stop.png b/app/src/main/res/drawable-ldpi/ic_stop.png
deleted file mode 100644
index 0d3e6f1a8..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_stop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_view_carousel.png b/app/src/main/res/drawable-ldpi/ic_view_carousel.png
deleted file mode 100644
index 8a84d9a56..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_view_carousel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_view_list_white_24dp.png b/app/src/main/res/drawable-ldpi/ic_view_list_white_24dp.png
deleted file mode 100644
index 35df0ba80..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_view_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_view_module_white_24dp.png b/app/src/main/res/drawable-ldpi/ic_view_module_white_24dp.png
deleted file mode 100644
index 7bf1e34ee..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_view_module_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_delete_36dp.png b/app/src/main/res/drawable-mdpi/ic_action_delete_36dp.png
deleted file mode 100644
index eec14f009..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_delete_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_done_all.png b/app/src/main/res/drawable-mdpi/ic_action_done_all.png
deleted file mode 100644
index c4c3717b6..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_done_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_reorder.png b/app/src/main/res/drawable-mdpi/ic_action_reorder.png
deleted file mode 100644
index 9a7eab26f..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_reorder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_select_all.png b/app/src/main/res/drawable-mdpi/ic_action_select_all.png
deleted file mode 100644
index 8e1c87350..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_select_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_undone_all.png b/app/src/main/res/drawable-mdpi/ic_action_undone_all.png
deleted file mode 100644
index 093b1af9e..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_undone_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
deleted file mode 100644
index 3856041d7..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bookmark_border_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_bookmark_border_white_24dp.png
deleted file mode 100644
index 984270761..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bookmark_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_bookmark_white_24dp.png
deleted file mode 100644
index 84f16627d..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bookmark_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_brightness_high.png b/app/src/main/res/drawable-mdpi/ic_brightness_high.png
deleted file mode 100644
index ad2327817..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_brightness_high.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_clear_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_clear_grey600_24dp.png
deleted file mode 100644
index 9ec1dd4fe..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_clear_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_crop_original_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_crop_original_white_24dp.png
deleted file mode 100644
index a3e55bdc3..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_crop_original_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_expand_less_white_36dp.png
deleted file mode 100644
index dea898838..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_expand_less_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index 022e05799..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_border_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_favorite_border_white_24dp.png
deleted file mode 100644
index 90375702f..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index 259a40c39..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download.png b/app/src/main/res/drawable-mdpi/ic_file_download.png
deleted file mode 100644
index 5cf733335..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png
deleted file mode 100644
index c2c845e84..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_black_36dp.png
deleted file mode 100644
index bdf434535..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_file_download_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_black_48dp.png
deleted file mode 100644
index f5afb24dc..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_file_download_black_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 12b09f1d9..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_more_horiz_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_more_horiz_black_24dp.png
deleted file mode 100644
index ce4349686..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_more_horiz_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_more_vert.png b/app/src/main/res/drawable-mdpi/ic_more_vert.png
deleted file mode 100644
index 653cacd3a..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_more_vert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pause.png b/app/src/main/res/drawable-mdpi/ic_pause.png
deleted file mode 100644
index 2272d478c..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow.png b/app/src/main/res/drawable-mdpi/ic_play_arrow.png
deleted file mode 100644
index 2b0e3baca..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_arrow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index 57c9fa546..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_screen_lock_landscape.png b/app/src/main/res/drawable-mdpi/ic_screen_lock_landscape.png
deleted file mode 100644
index 1d7ee85fe..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_screen_lock_landscape.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_screen_lock_portrait.png b/app/src/main/res/drawable-mdpi/ic_screen_lock_portrait.png
deleted file mode 100644
index 7ee67518f..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_screen_lock_portrait.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_screen_rotation.png b/app/src/main/res/drawable-mdpi/ic_screen_rotation.png
deleted file mode 100644
index 837a3f2cb..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_screen_rotation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png
deleted file mode 100644
index 0f3f6f3e0..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png
deleted file mode 100644
index 3cea26d18..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stop.png b/app/src/main/res/drawable-mdpi/ic_stop.png
deleted file mode 100644
index 8af466941..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_view_carousel.png b/app/src/main/res/drawable-mdpi/ic_view_carousel.png
deleted file mode 100644
index fa2936412..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_view_carousel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_view_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_view_list_white_24dp.png
deleted file mode 100644
index 033401257..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_view_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_view_module_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_view_module_white_24dp.png
deleted file mode 100644
index 11e249249..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_view_module_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_zoom_out_map_white_24dp.png
deleted file mode 100644
index b707939e0..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_zoom_out_map_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_delete_36dp.png b/app/src/main/res/drawable-xhdpi/ic_action_delete_36dp.png
deleted file mode 100644
index 3a25d9b62..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_delete_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_done_all.png b/app/src/main/res/drawable-xhdpi/ic_action_done_all.png
deleted file mode 100644
index a59296259..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_done_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_reorder.png b/app/src/main/res/drawable-xhdpi/ic_action_reorder.png
deleted file mode 100644
index 7e448783e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_reorder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_select_all.png b/app/src/main/res/drawable-xhdpi/ic_action_select_all.png
deleted file mode 100644
index aade8fa89..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_select_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_undone_all.png b/app/src/main/res/drawable-xhdpi/ic_action_undone_all.png
deleted file mode 100644
index 3d5a26b50..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_undone_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
deleted file mode 100644
index 67bb598e5..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmark_border_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_bookmark_border_white_24dp.png
deleted file mode 100644
index e42e09fa2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bookmark_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_bookmark_white_24dp.png
deleted file mode 100644
index 872349cca..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bookmark_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_brightness_high.png b/app/src/main/res/drawable-xhdpi/ic_brightness_high.png
deleted file mode 100644
index 77ca8377a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_brightness_high.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_clear_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_clear_grey600_24dp.png
deleted file mode 100644
index 14a842717..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_clear_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_crop_original_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_crop_original_white_24dp.png
deleted file mode 100644
index 1e26e6e61..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_crop_original_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_white_36dp.png
deleted file mode 100644
index 62fc386c1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_less_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index dbc0b2032..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_border_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_favorite_border_white_24dp.png
deleted file mode 100644
index 5035a36f0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index 4bb727859..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download.png b/app/src/main/res/drawable-xhdpi/ic_file_download.png
deleted file mode 100644
index c9843ba8a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png
deleted file mode 100644
index f5afb24dc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_black_36dp.png
deleted file mode 100644
index 46a95731c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_download_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_black_48dp.png
deleted file mode 100644
index 8c83bffa7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_download_black_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 5a06bff5a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_more_horiz_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_more_horiz_black_24dp.png
deleted file mode 100644
index f8132fbbc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_more_horiz_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_more_vert.png b/app/src/main/res/drawable-xhdpi/ic_more_vert.png
deleted file mode 100644
index 9d5a9e8dc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_more_vert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause.png b/app/src/main/res/drawable-xhdpi/ic_pause.png
deleted file mode 100644
index f49aed757..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow.png
deleted file mode 100644
index c369bafda..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_arrow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index 547ef30aa..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_screen_lock_landscape.png b/app/src/main/res/drawable-xhdpi/ic_screen_lock_landscape.png
deleted file mode 100644
index 1a3ec23c3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_screen_lock_landscape.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_screen_lock_portrait.png b/app/src/main/res/drawable-xhdpi/ic_screen_lock_portrait.png
deleted file mode 100644
index 8195a502a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_screen_lock_portrait.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_screen_rotation.png b/app/src/main/res/drawable-xhdpi/ic_screen_rotation.png
deleted file mode 100644
index 3c64caf47..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_screen_rotation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png
deleted file mode 100644
index 9cbbdc89f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png
deleted file mode 100644
index 95344a056..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stop.png b/app/src/main/res/drawable-xhdpi/ic_stop.png
deleted file mode 100644
index 8b3507383..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_view_carousel.png b/app/src/main/res/drawable-xhdpi/ic_view_carousel.png
deleted file mode 100644
index c3aa25c2a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_view_carousel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_view_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_view_list_white_24dp.png
deleted file mode 100644
index 8ce8a806c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_view_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_view_module_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_view_module_white_24dp.png
deleted file mode 100644
index 89980e262..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_view_module_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_zoom_out_map_white_24dp.png
deleted file mode 100644
index 2182249eb..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_zoom_out_map_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/reader_background_checkbox_selected.png b/app/src/main/res/drawable-xhdpi/reader_background_checkbox_selected.png
deleted file mode 100644
index 7c8102d17..000000000
Binary files a/app/src/main/res/drawable-xhdpi/reader_background_checkbox_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/reader_background_checkbox_unselected.png b/app/src/main/res/drawable-xhdpi/reader_background_checkbox_unselected.png
deleted file mode 100644
index 4faa255e6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/reader_background_checkbox_unselected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_delete_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_action_delete_36dp.png
deleted file mode 100644
index 51f5e8bcb..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_delete_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_done_all.png b/app/src/main/res/drawable-xxhdpi/ic_action_done_all.png
deleted file mode 100644
index 97b9be123..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_done_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_reorder.png b/app/src/main/res/drawable-xxhdpi/ic_action_reorder.png
deleted file mode 100644
index 45c2557b5..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_reorder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_select_all.png b/app/src/main/res/drawable-xxhdpi/ic_action_select_all.png
deleted file mode 100644
index 0b14667a1..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_select_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_undone_all.png b/app/src/main/res/drawable-xxhdpi/ic_action_undone_all.png
deleted file mode 100644
index 7e698e4f7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_undone_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
deleted file mode 100644
index 0fdced8fc..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark_border_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark_border_white_24dp.png
deleted file mode 100644
index 6ed27a24f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bookmark_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark_white_24dp.png
deleted file mode 100644
index 3faff90bb..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bookmark_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_brightness_high.png b/app/src/main/res/drawable-xxhdpi/ic_brightness_high.png
deleted file mode 100644
index 4da536ced..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_brightness_high.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_clear_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_clear_grey600_24dp.png
deleted file mode 100644
index 8ecda2471..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_clear_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_crop_original_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_crop_original_white_24dp.png
deleted file mode 100644
index ec0e760e0..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_crop_original_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_36dp.png
deleted file mode 100644
index 7d0e2c1cc..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index c470ab975..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_border_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_favorite_border_white_24dp.png
deleted file mode 100644
index 884a8a210..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index 07569c876..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download.png b/app/src/main/res/drawable-xxhdpi/ic_file_download.png
deleted file mode 100644
index ea828d089..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png
deleted file mode 100644
index ce97c85df..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_black_36dp.png
deleted file mode 100644
index 5a8afa4d6..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_black_48dp.png
deleted file mode 100644
index 7024677f6..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 02e19d045..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_more_horiz_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_more_horiz_black_24dp.png
deleted file mode 100644
index 9d97e4795..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_more_horiz_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_more_vert.png b/app/src/main/res/drawable-xxhdpi/ic_more_vert.png
deleted file mode 100644
index ccda84a80..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_more_vert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause.png b/app/src/main/res/drawable-xxhdpi/ic_pause.png
deleted file mode 100644
index 7192ad487..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow.png
deleted file mode 100644
index 41061c1c8..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_arrow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index 23bb1ba9f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_screen_lock_landscape.png b/app/src/main/res/drawable-xxhdpi/ic_screen_lock_landscape.png
deleted file mode 100644
index 5f95a70c9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_screen_lock_landscape.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_screen_lock_portrait.png b/app/src/main/res/drawable-xxhdpi/ic_screen_lock_portrait.png
deleted file mode 100644
index 07091e785..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_screen_lock_portrait.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_screen_rotation.png b/app/src/main/res/drawable-xxhdpi/ic_screen_rotation.png
deleted file mode 100644
index 18e92807b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_screen_rotation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png
deleted file mode 100644
index 1da08ccc7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png
deleted file mode 100644
index c0fff0760..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stop.png b/app/src/main/res/drawable-xxhdpi/ic_stop.png
deleted file mode 100644
index f9307dec0..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_view_carousel.png b/app/src/main/res/drawable-xxhdpi/ic_view_carousel.png
deleted file mode 100644
index a9ef5bd5d..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_view_carousel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_view_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_view_list_white_24dp.png
deleted file mode 100644
index 6082dad61..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_view_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_view_module_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_view_module_white_24dp.png
deleted file mode 100644
index 02377043c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_view_module_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_zoom_out_map_white_24dp.png
deleted file mode 100644
index e85a81682..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_zoom_out_map_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_delete_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_action_delete_36dp.png
deleted file mode 100644
index 484eed003..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_delete_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_done_all.png b/app/src/main/res/drawable-xxxhdpi/ic_action_done_all.png
deleted file mode 100644
index 49545afcf..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_done_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_reorder.png b/app/src/main/res/drawable-xxxhdpi/ic_action_reorder.png
deleted file mode 100644
index a6a017b43..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_reorder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_select_all.png b/app/src/main/res/drawable-xxxhdpi/ic_action_select_all.png
deleted file mode 100644
index a8ba08436..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_select_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_undone_all.png b/app/src/main/res/drawable-xxxhdpi/ic_action_undone_all.png
deleted file mode 100644
index e042cc2ba..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_undone_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
deleted file mode 100644
index d64c22e9e..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bookmark_border_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bookmark_border_white_24dp.png
deleted file mode 100644
index 99db20fe6..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_bookmark_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bookmark_white_24dp.png
deleted file mode 100644
index 370cf8af5..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_bookmark_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_brightness_high.png b/app/src/main/res/drawable-xxxhdpi/ic_brightness_high.png
deleted file mode 100644
index 6c893afc1..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_brightness_high.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clear_grey600_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_clear_grey600_24dp.png
deleted file mode 100644
index 6f9e499f4..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_clear_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_crop_original_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_crop_original_white_24dp.png
deleted file mode 100644
index 8fba54fca..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_crop_original_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white_36dp.png
deleted file mode 100644
index 62467ced4..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index 131cfec4f..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_border_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_border_white_24dp.png
deleted file mode 100644
index 134a48692..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite_border_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index 18d0768d4..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download.png
deleted file mode 100644
index 0f286755c..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png
deleted file mode 100644
index 8c83bffa7..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_36dp.png
deleted file mode 100644
index ef8abc125..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_48dp.png
deleted file mode 100644
index 065bcf720..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index d6668a051..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_more_horiz_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_more_horiz_black_24dp.png
deleted file mode 100644
index 7ca2db333..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_more_horiz_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_more_vert.png b/app/src/main/res/drawable-xxxhdpi/ic_more_vert.png
deleted file mode 100644
index 43ccd5e24..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_more_vert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause.png b/app/src/main/res/drawable-xxxhdpi/ic_pause.png
deleted file mode 100644
index 660ac6585..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow.png
deleted file mode 100644
index 6b8b55f78..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index 2745c3ab9..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_screen_lock_landscape.png b/app/src/main/res/drawable-xxxhdpi/ic_screen_lock_landscape.png
deleted file mode 100644
index fd830cac7..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_screen_lock_landscape.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_screen_lock_portrait.png b/app/src/main/res/drawable-xxxhdpi/ic_screen_lock_portrait.png
deleted file mode 100644
index cd656dd3e..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_screen_lock_portrait.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_screen_rotation.png b/app/src/main/res/drawable-xxxhdpi/ic_screen_rotation.png
deleted file mode 100644
index 524ed371b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_screen_rotation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png
deleted file mode 100644
index 268f3d494..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png
deleted file mode 100644
index 516846cce..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stop.png b/app/src/main/res/drawable-xxxhdpi/ic_stop.png
deleted file mode 100644
index 630cb2e63..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_view_carousel.png b/app/src/main/res/drawable-xxxhdpi/ic_view_carousel.png
deleted file mode 100644
index 2b505f5bd..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_view_carousel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_view_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_view_list_white_24dp.png
deleted file mode 100644
index ecd9e1b2a..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_view_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_view_module_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_view_module_white_24dp.png
deleted file mode 100644
index 02cd1b321..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_view_module_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_map_white_24dp.png
deleted file mode 100644
index 470a6f489..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_map_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
new file mode 100644
index 000000000..b9b8eca8b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_book_blue_24dp.xml b/app/src/main/res/drawable/ic_book_blue_24dp.xml
new file mode 100644
index 000000000..debaf260a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_book_blue_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_book_grey_24dp.xml b/app/src/main/res/drawable/ic_book_grey_24dp.xml
new file mode 100644
index 000000000..959ce93b5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_book_grey_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_bookmark_border_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_border_white_24dp.xml
new file mode 100644
index 000000000..e6596c2a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bookmark_border_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_bookmark_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_white_24dp.xml
new file mode 100644
index 000000000..a291197be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bookmark_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_clear.xml
rename to app/src/main/res/drawable/ic_clear_black_24dp.xml
diff --git a/app/src/main/res/drawable/ic_crop_original_white_24dp.xml b/app/src/main/res/drawable/ic_crop_original_white_24dp.xml
new file mode 100644
index 000000000..6e130c7b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_crop_original_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_done_all_grey_24dp.xml b/app/src/main/res/drawable/ic_done_all_grey_24dp.xml
new file mode 100644
index 000000000..9cbc7fdf9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_done_all_grey_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_done_all_white_24dp.xml b/app/src/main/res/drawable/ic_done_all_white_24dp.xml
new file mode 100644
index 000000000..3fa4edb58
--- /dev/null
+++ b/app/src/main/res/drawable/ic_done_all_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_expand_less_white_36dp.xml b/app/src/main/res/drawable/ic_expand_less_white_36dp.xml
new file mode 100644
index 000000000..c092cc2ca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand_less_white_36dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_expand_more_white_36dp.xml b/app/src/main/res/drawable/ic_expand_more_white_36dp.xml
new file mode 100644
index 000000000..5f60a424e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand_more_white_36dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_explore_blue_24dp.xml b/app/src/main/res/drawable/ic_explore_blue_24dp.xml
new file mode 100644
index 000000000..51ea4b5ff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_explore_blue_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_explore_grey_24dp.xml b/app/src/main/res/drawable/ic_explore_grey_24dp.xml
new file mode 100644
index 000000000..4c5e515d9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_explore_grey_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_file_download_blue_24dp.xml b/app/src/main/res/drawable/ic_file_download_blue_24dp.xml
new file mode 100644
index 000000000..0f912b6f3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_download_blue_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_file_download_grey_24dp.xml b/app/src/main/res/drawable/ic_file_download_grey_24dp.xml
new file mode 100644
index 000000000..a3bd2706c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_download_grey_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_file_download_white_24dp.xml b/app/src/main/res/drawable/ic_file_download_white_24dp.xml
new file mode 100644
index 000000000..e43b8645a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_download_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_filter_list.xml b/app/src/main/res/drawable/ic_filter_list_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_filter_list.xml
rename to app/src/main/res/drawable/ic_filter_list_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_history_blue_24dp.xml b/app/src/main/res/drawable/ic_history_blue_24dp.xml
new file mode 100644
index 000000000..4a51847f4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history_blue_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_history_grey_24dp.xml b/app/src/main/res/drawable/ic_history_grey_24dp.xml
new file mode 100644
index 000000000..3e12265b9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history_grey_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml b/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml
new file mode 100644
index 000000000..da83afdb1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
new file mode 100644
index 000000000..3dfd99efc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause_white_24dp.xml
new file mode 100644
index 000000000..8356ff57f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
new file mode 100644
index 000000000..81a8f74f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_36dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_36dp.xml
new file mode 100644
index 000000000..5686df3ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_white_36dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_reorder_grey_24dp.xml b/app/src/main/res/drawable/ic_reorder_grey_24dp.xml
new file mode 100644
index 000000000..1250dae90
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reorder_grey_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_screen_lock_landscape_white_24dp.xml b/app/src/main/res/drawable/ic_screen_lock_landscape_white_24dp.xml
new file mode 100644
index 000000000..79fae1854
--- /dev/null
+++ b/app/src/main/res/drawable/ic_screen_lock_landscape_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_screen_lock_portrait_white_24dp.xml b/app/src/main/res/drawable/ic_screen_lock_portrait_white_24dp.xml
new file mode 100644
index 000000000..774b9764b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_screen_lock_portrait_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_screen_rotation_white_24dp.xml b/app/src/main/res/drawable/ic_screen_rotation_white_24dp.xml
new file mode 100644
index 000000000..617691b39
--- /dev/null
+++ b/app/src/main/res/drawable/ic_screen_rotation_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_select_all_white_24dp.xml b/app/src/main/res/drawable/ic_select_all_white_24dp.xml
new file mode 100644
index 000000000..0fc49c923
--- /dev/null
+++ b/app/src/main/res/drawable/ic_select_all_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_settings_grey_24dp.xml b/app/src/main/res/drawable/ic_settings_grey_24dp.xml
new file mode 100644
index 000000000..51fc037ef
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_grey_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
new file mode 100644
index 000000000..5d1017b1c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
new file mode 100644
index 000000000..752878575
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_view_carousel_white_24dp.xml b/app/src/main/res/drawable/ic_view_carousel_white_24dp.xml
new file mode 100644
index 000000000..c5d900821
--- /dev/null
+++ b/app/src/main/res/drawable/ic_view_carousel_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_view_list_white_24dp.xml b/app/src/main/res/drawable/ic_view_list_white_24dp.xml
new file mode 100644
index 000000000..222dc3b35
--- /dev/null
+++ b/app/src/main/res/drawable/ic_view_list_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_view_module_white_24dp.xml b/app/src/main/res/drawable/ic_view_module_white_24dp.xml
new file mode 100644
index 000000000..aeb72e7b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_view_module_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_zoom_out_map_white_24dp.xml b/app/src/main/res/drawable/ic_zoom_out_map_white_24dp.xml
new file mode 100644
index 000000000..078577510
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zoom_out_map_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/fragment_manga_chapters.xml b/app/src/main/res/layout/fragment_manga_chapters.xml
index 33bec08cb..13b735139 100644
--- a/app/src/main/res/layout/fragment_manga_chapters.xml
+++ b/app/src/main/res/layout/fragment_manga_chapters.xml
@@ -93,6 +93,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:background="?android:selectableItemBackground"
android:src="@drawable/ic_play_arrow_white_36dp"
android:title="@string/action_next_unread"/>
diff --git a/app/src/main/res/layout/item_catalogue_grid.xml b/app/src/main/res/layout/item_catalogue_grid.xml
index 37132be43..cadc73342 100644
--- a/app/src/main/res/layout/item_catalogue_grid.xml
+++ b/app/src/main/res/layout/item_catalogue_grid.xml
@@ -59,9 +59,7 @@
android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
- android:visibility="invisible"
- app:iiv_color="@color/primary"
- app:iiv_icon="gmd_bookmark"/>
+ android:visibility="invisible"/>
+ android:src="@drawable/ic_reorder_grey_24dp"/>
@@ -102,7 +102,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:id="@+id/reader_selector"
- android:src="@drawable/ic_view_carousel"
+ android:src="@drawable/ic_view_carousel_white_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
@@ -111,7 +111,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:id="@+id/reader_extra_settings"
- android:src="@drawable/ic_more_vert"
+ android:src="@drawable/ic_more_vert_white_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
diff --git a/app/src/main/res/menu/chapter_recent.xml b/app/src/main/res/menu/chapter_recent.xml
index b6c5498d9..fda6e9b33 100644
--- a/app/src/main/res/menu/chapter_recent.xml
+++ b/app/src/main/res/menu/chapter_recent.xml
@@ -6,7 +6,7 @@
@@ -20,13 +20,13 @@
\ No newline at end of file
diff --git a/app/src/main/res/menu/chapter_selection.xml b/app/src/main/res/menu/chapter_selection.xml
index 58f275326..270623ea5 100644
--- a/app/src/main/res/menu/chapter_selection.xml
+++ b/app/src/main/res/menu/chapter_selection.xml
@@ -4,9 +4,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
+ android:title="@string/action_download"
+ android:icon="@drawable/ic_file_download_white_24dp"
+ app:showAsAction="ifRoom"/>
+ android:title="@string/action_mark_as_read"
+ android:icon="@drawable/ic_done_all_white_24dp"
+ app:showAsAction="ifRoom"/>
+ android:title="@string/action_mark_as_unread"
+ android:icon="@drawable/ic_done_all_grey_24dp"
+ app:showAsAction="ifRoom"/>
+ android:title="@string/action_select_all"
+ android:icon="@drawable/ic_select_all_white_24dp"
+ app:showAsAction="ifRoom"/>
\ No newline at end of file
diff --git a/app/src/main/res/menu/chapter_single.xml b/app/src/main/res/menu/chapter_single.xml
index 4d3974055..20681c17c 100644
--- a/app/src/main/res/menu/chapter_single.xml
+++ b/app/src/main/res/menu/chapter_single.xml
@@ -5,7 +5,7 @@
@@ -17,12 +17,12 @@
diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml
index 474a8f912..02037e002 100644
--- a/app/src/main/res/menu/library.xml
+++ b/app/src/main/res/menu/library.xml
@@ -5,7 +5,7 @@
-