diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
new file mode 100644
index 0000000000..676797dc9c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
deleted file mode 100644
index 38fbc261b7..0000000000
--- a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_arrow_forward_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward_24dp.xml
new file mode 100644
index 0000000000..3473f8722e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_forward_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
deleted file mode 100644
index 5304b93e18..0000000000
--- a/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_create_white_24dp.xml b/app/src/main/res/drawable/ic_create_white_24dp.xml
deleted file mode 100644
index 35a774a517..0000000000
--- a/app/src/main/res/drawable/ic_create_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml
new file mode 100644
index 0000000000..f683f6e83d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_edit_24dp.xml b/app/src/main/res/drawable/ic_edit_24dp.xml
new file mode 100644
index 0000000000..17a2a81ffd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_filter_list_24dp.xml b/app/src/main/res/drawable/ic_filter_list_24dp.xml
new file mode 100644
index 0000000000..5959f25e23
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_list_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_filter_list_white_24dp.xml b/app/src/main/res/drawable/ic_filter_list_white_24dp.xml
deleted file mode 100644
index 7d435fa2b8..0000000000
--- a/app/src/main/res/drawable/ic_filter_list_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_label_24dp.xml b/app/src/main/res/drawable/ic_label_24dp.xml
new file mode 100644
index 0000000000..6a91a53bdc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_label_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_label_white_24dp.xml b/app/src/main/res/drawable/ic_label_white_24dp.xml
deleted file mode 100644
index b3c9371449..0000000000
--- a/app/src/main/res/drawable/ic_label_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml
new file mode 100644
index 0000000000..ed500a7582
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_play_arrow_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml
new file mode 100644
index 0000000000..a5a83b07f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_refresh_24dp.xml b/app/src/main/res/drawable/ic_refresh_24dp.xml
new file mode 100644
index 0000000000..aaefaea82f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml
new file mode 100644
index 0000000000..da931c27dc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_white_24dp.xml
deleted file mode 100644
index 47432c174b..0000000000
--- a/app/src/main/res/drawable/ic_search_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_select_all_24dp.xml b/app/src/main/res/drawable/ic_select_all_24dp.xml
new file mode 100644
index 0000000000..2f59cda50b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_select_all_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
deleted file mode 100644
index 0fc49c9237..0000000000
--- a/app/src/main/res/drawable/ic_select_all_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml
new file mode 100644
index 0000000000..82ddcec39f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/chapters_controller.xml b/app/src/main/res/layout/chapters_controller.xml
index 5af583b810..32fb318b06 100644
--- a/app/src/main/res/layout/chapters_controller.xml
+++ b/app/src/main/res/layout/chapters_controller.xml
@@ -54,6 +54,6 @@
android:id="@+id/fab"
style="@style/Theme.Widget.FAB"
app:layout_anchor="@id/recycler"
- app:srcCompat="@drawable/ic_play_arrow_white_24dp"/>
+ app:srcCompat="@drawable/ic_play_arrow_24dp" />
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 673e20d8d1..110797c296 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -36,7 +36,7 @@
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/action_edit"
android:padding="8dp"
- app:srcCompat="@drawable/ic_create_white_24dp"
+ app:srcCompat="@drawable/ic_edit_24dp"
app:tint="@color/md_white_1000_50" />
diff --git a/app/src/main/res/menu/catalogue_list.xml b/app/src/main/res/menu/catalogue_list.xml
index 1451609075..28769070eb 100644
--- a/app/src/main/res/menu/catalogue_list.xml
+++ b/app/src/main/res/menu/catalogue_list.xml
@@ -5,15 +5,17 @@
diff --git a/app/src/main/res/menu/catalogue_new_list.xml b/app/src/main/res/menu/catalogue_new_list.xml
index 0db993fcf6..c67527afca 100644
--- a/app/src/main/res/menu/catalogue_new_list.xml
+++ b/app/src/main/res/menu/catalogue_new_list.xml
@@ -5,8 +5,10 @@
+
diff --git a/app/src/main/res/menu/category_selection.xml b/app/src/main/res/menu/category_selection.xml
index 2901b4dcba..c8b4e46f0a 100644
--- a/app/src/main/res/menu/category_selection.xml
+++ b/app/src/main/res/menu/category_selection.xml
@@ -1,18 +1,19 @@
-
diff --git a/app/src/main/res/menu/chapter_selection.xml b/app/src/main/res/menu/chapter_selection.xml
index 25fe964191..aaaf53ec9c 100644
--- a/app/src/main/res/menu/chapter_selection.xml
+++ b/app/src/main/res/menu/chapter_selection.xml
@@ -6,30 +6,35 @@
android:id="@+id/action_download"
android:icon="@drawable/ic_file_download_white_24dp"
android:title="@string/action_download"
+ app:iconTint="?attr/colorOnPrimary"
app:showAsAction="always" />
-
diff --git a/app/src/main/res/menu/generic_selection.xml b/app/src/main/res/menu/generic_selection.xml
index a00db717ac..6da5ebdaca 100644
--- a/app/src/main/res/menu/generic_selection.xml
+++ b/app/src/main/res/menu/generic_selection.xml
@@ -4,8 +4,9 @@
diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml
index 60980efdf0..de1430740f 100644
--- a/app/src/main/res/menu/library.xml
+++ b/app/src/main/res/menu/library.xml
@@ -5,21 +5,24 @@
diff --git a/app/src/main/res/menu/manga_info.xml b/app/src/main/res/menu/manga_info.xml
index e7fcebc39b..909eb6826f 100644
--- a/app/src/main/res/menu/manga_info.xml
+++ b/app/src/main/res/menu/manga_info.xml
@@ -4,8 +4,9 @@
diff --git a/app/src/main/res/menu/updates_chapter_selection.xml b/app/src/main/res/menu/updates_chapter_selection.xml
index 49d2892535..f14e130983 100644
--- a/app/src/main/res/menu/updates_chapter_selection.xml
+++ b/app/src/main/res/menu/updates_chapter_selection.xml
@@ -6,18 +6,21 @@
android:id="@+id/action_download"
android:icon="@drawable/ic_file_download_white_24dp"
android:title="@string/action_download"
+ app:iconTint="?attr/colorOnPrimary"
app:showAsAction="always" />