diff --git a/tables_app/src/main/res/drawable-hdpi/ic_action_content_discard.png b/tables_app/src/main/res/drawable-hdpi/ic_action_content_discard.png
deleted file mode 100644
index 1933a794..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_action_content_discard.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_add_black_24dp.png
deleted file mode 100644
index c04b523c..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png
deleted file mode 100644
index 94d06461..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_export_csv_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_export_csv_black_24dp.png
deleted file mode 100644
index 84015509..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_export_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_forward_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_forward_black_24dp.png
deleted file mode 100644
index 13a91284..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_forward_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_import_csv_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_import_csv_black_24dp.png
deleted file mode 100644
index 973edd4f..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_import_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index e531d72a..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_search_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_search_black_24dp.png
deleted file mode 100644
index c593e7ad..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_search_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_sort_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_sort_black_24dp.png
deleted file mode 100644
index 5e664880..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_sort_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_unarchive_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_unarchive_black_24dp.png
deleted file mode 100644
index c05764df..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_unarchive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-hdpi/ic_view_headline_black_24dp.png b/tables_app/src/main/res/drawable-hdpi/ic_view_headline_black_24dp.png
deleted file mode 100644
index 1a22e318..00000000
Binary files a/tables_app/src/main/res/drawable-hdpi/ic_view_headline_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_action_content_discard.png b/tables_app/src/main/res/drawable-mdpi/ic_action_content_discard.png
deleted file mode 100644
index 3d83cb86..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_action_content_discard.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_add_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_add_black_24dp.png
deleted file mode 100644
index 23bf1192..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png
deleted file mode 100644
index bdcd4787..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_export_csv_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_export_csv_black_24dp.png
deleted file mode 100644
index 34fe4f99..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_export_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_forward_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_forward_black_24dp.png
deleted file mode 100644
index 8b185cb1..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_forward_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_import_csv_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_import_csv_black_24dp.png
deleted file mode 100644
index 4cf5c0bb..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_import_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index 9efbaae2..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_search_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_search_black_24dp.png
deleted file mode 100644
index 6b163432..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_search_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_sort_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_sort_black_24dp.png
deleted file mode 100644
index 04a12a43..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_sort_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_unarchive_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_unarchive_black_24dp.png
deleted file mode 100644
index ca7c3c9b..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_unarchive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-mdpi/ic_view_headline_black_24dp.png b/tables_app/src/main/res/drawable-mdpi/ic_view_headline_black_24dp.png
deleted file mode 100644
index c08fe446..00000000
Binary files a/tables_app/src/main/res/drawable-mdpi/ic_view_headline_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_action_content_discard.png b/tables_app/src/main/res/drawable-xhdpi/ic_action_content_discard.png
deleted file mode 100644
index ed3cc22b..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_action_content_discard.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
deleted file mode 100644
index 3191d528..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png
deleted file mode 100644
index 9b882181..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_export_csv_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_export_csv_black_24dp.png
deleted file mode 100644
index aae3b6e4..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_export_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_forward_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_forward_black_24dp.png
deleted file mode 100644
index ec952d43..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_forward_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_import_csv_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_import_csv_black_24dp.png
deleted file mode 100644
index a6cb81b8..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_import_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index 87f8de1c..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png
deleted file mode 100644
index 63819026..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_sort_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_sort_black_24dp.png
deleted file mode 100644
index 9e4fd61d..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_sort_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_unarchive_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_unarchive_black_24dp.png
deleted file mode 100644
index 0567dee0..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_unarchive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xhdpi/ic_view_headline_black_24dp.png b/tables_app/src/main/res/drawable-xhdpi/ic_view_headline_black_24dp.png
deleted file mode 100644
index 0195e1a1..00000000
Binary files a/tables_app/src/main/res/drawable-xhdpi/ic_view_headline_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_action_content_discard.png b/tables_app/src/main/res/drawable-xxhdpi/ic_action_content_discard.png
deleted file mode 100644
index a0b894d8..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_action_content_discard.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
deleted file mode 100644
index a84106b0..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_archive_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_archive_black_24dp.png
deleted file mode 100644
index d6d60f67..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_export_csv_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_export_csv_black_24dp.png
deleted file mode 100644
index 538f2679..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_export_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_forward_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_forward_black_24dp.png
deleted file mode 100644
index 9a05bf26..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_forward_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_import_csv_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_import_csv_black_24dp.png
deleted file mode 100644
index adb0c0ab..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_import_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index 4af4ae63..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png
deleted file mode 100644
index 3ae490ef..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_sort_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_sort_black_24dp.png
deleted file mode 100644
index cb9d1965..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_sort_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_unarchive_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_unarchive_black_24dp.png
deleted file mode 100644
index 7275663e..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_unarchive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxhdpi/ic_view_headline_black_24dp.png b/tables_app/src/main/res/drawable-xxhdpi/ic_view_headline_black_24dp.png
deleted file mode 100644
index 1603195e..00000000
Binary files a/tables_app/src/main/res/drawable-xxhdpi/ic_view_headline_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
deleted file mode 100644
index 3cb10924..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_archive_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_archive_black_24dp.png
deleted file mode 100644
index b8c03760..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_export_csv_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_export_csv_black_24dp.png
deleted file mode 100644
index fee2487b..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_export_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_forward_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_forward_black_24dp.png
deleted file mode 100644
index 2187b5fe..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_forward_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_import_csv_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_import_csv_black_24dp.png
deleted file mode 100644
index 14d8cd4a..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_import_csv_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png
deleted file mode 100644
index d6761ba1..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_search_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_search_black_24dp.png
deleted file mode 100644
index 21be5729..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_search_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_sort_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_sort_black_24dp.png
deleted file mode 100644
index 631663aa..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_sort_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_unarchive_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_unarchive_black_24dp.png
deleted file mode 100644
index 514d69bd..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_unarchive_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable-xxxhdpi/ic_view_headline_black_24dp.png b/tables_app/src/main/res/drawable-xxxhdpi/ic_view_headline_black_24dp.png
deleted file mode 100644
index 1a4e96e3..00000000
Binary files a/tables_app/src/main/res/drawable-xxxhdpi/ic_view_headline_black_24dp.png and /dev/null differ
diff --git a/tables_app/src/main/res/drawable/ic_action_content_discard.xml b/tables_app/src/main/res/drawable/ic_action_content_discard.xml
new file mode 100644
index 00000000..288869de
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_action_content_discard.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        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/tables_app/src/main/res/drawable/ic_add_24dp.xml b/tables_app/src/main/res/drawable/ic_add_24dp.xml
new file mode 100644
index 00000000..e631717c
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_add_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_archive_24dp.xml b/tables_app/src/main/res/drawable/ic_archive_24dp.xml
new file mode 100644
index 00000000..ea067a55
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_archive_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_export_csv_24dp.xml b/tables_app/src/main/res/drawable/ic_export_csv_24dp.xml
new file mode 100644
index 00000000..043917c7
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_export_csv_24dp.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <group>
+        <clip-path android:pathData="M7,3.832L24.93,3.832L24.93,15.445L7,15.445ZM7,3.832" />
+        <path
+            android:fillColor="#000000"
+            android:fillType="nonZero"
+            android:pathData="M9.676,3.82L7.02,6.512L15.859,15.473L24.699,6.512L22.043,3.82L15.859,10.09ZM9.676,3.82" />
+    </group>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3.594,22.716L3.594,20.888L5.531,20.888L5.531,22.716ZM3.594,22.716" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M9.771,16.294C10.709,16.294 11.447,16.529 11.99,16.997C12.529,17.466 12.803,18.134 12.803,18.997L10.865,18.997C10.865,18.634 10.764,18.349 10.568,18.138C10.381,17.919 10.107,17.81 9.756,17.81C9.35,17.81 9.045,17.943 8.85,18.201C8.662,18.451 8.568,18.806 8.568,19.263L8.568,19.857C8.568,20.306 8.662,20.661 8.85,20.919C9.045,21.181 9.342,21.31 9.74,21.31C10.135,21.31 10.432,21.212 10.631,21.013C10.838,20.806 10.943,20.521 10.943,20.154L12.803,20.154C12.803,21.021 12.537,21.681 12.006,22.138C11.482,22.599 10.74,22.826 9.771,22.826C8.697,22.826 7.881,22.552 7.318,21.997C6.764,21.447 6.49,20.634 6.49,19.56C6.49,18.49 6.764,17.677 7.318,17.122C7.881,16.572 8.697,16.294 9.771,16.294ZM9.771,16.294" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M16.545,16.294C17.357,16.294 18.017,16.462 18.529,16.794C19.048,17.119 19.318,17.603 19.341,18.247L19.341,18.357L17.435,18.357L17.435,18.31C17.435,18.134 17.365,17.982 17.232,17.857C17.095,17.732 16.892,17.669 16.623,17.669C16.349,17.669 16.142,17.712 15.998,17.794C15.849,17.869 15.779,17.966 15.779,18.091C15.779,18.247 15.877,18.369 16.076,18.451C16.271,18.536 16.591,18.619 17.029,18.701C17.529,18.806 17.939,18.915 18.263,19.029C18.595,19.146 18.881,19.333 19.123,19.591C19.373,19.841 19.502,20.185 19.513,20.622C19.513,21.372 19.256,21.931 18.748,22.294C18.248,22.65 17.576,22.826 16.732,22.826C15.74,22.826 14.97,22.665 14.42,22.341C13.877,22.009 13.607,21.419 13.607,20.576L15.529,20.576C15.529,20.9 15.611,21.115 15.779,21.216C15.943,21.322 16.201,21.372 16.545,21.372C16.802,21.372 17.017,21.349 17.185,21.294C17.349,21.244 17.435,21.13 17.435,20.951C17.435,20.806 17.341,20.697 17.154,20.622C16.966,20.54 16.662,20.458 16.248,20.372C15.724,20.259 15.298,20.146 14.966,20.029C14.631,19.904 14.341,19.708 14.091,19.435C13.841,19.154 13.716,18.779 13.716,18.31C13.716,17.622 13.982,17.119 14.513,16.794C15.045,16.462 15.72,16.294 16.545,16.294ZM16.545,16.294" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M22.226,22.716L19.992,16.404L22.164,16.404L23.429,20.622L23.461,20.622L24.726,16.404L26.804,16.404L24.57,22.716ZM22.226,22.716" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_forward_24dp.xml b/tables_app/src/main/res/drawable/ic_forward_24dp.xml
new file mode 100644
index 00000000..730a53dc
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_forward_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8V4l8,8 -8,8v-4H4V8z" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_import_csv_24dp.xml b/tables_app/src/main/res/drawable/ic_import_csv_24dp.xml
new file mode 100644
index 00000000..c21c2060
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_import_csv_24dp.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <group>
+        <clip-path android:pathData="M7.328,6.512L20.395,6.512L20.395,15.117L7.328,15.117ZM7.328,6.512" />
+        <path
+            android:fillColor="#040606"
+            android:fillType="nonZero"
+            android:pathData="M19.23,15.117L20.395,14.234L13.859,6.508L7.328,14.234L8.492,15.117L13.859,8.762L19.23,15.117" />
+    </group>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M4.146,22.209L4.146,20.474L5.99,20.474L5.99,22.209ZM4.146,22.209" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M10.019,16.099C10.914,16.099 11.617,16.326 12.128,16.771C12.648,17.22 12.91,17.857 12.91,18.677L11.066,18.677C11.066,18.334 10.972,18.06 10.785,17.849C10.605,17.642 10.351,17.537 10.019,17.537C9.621,17.537 9.332,17.662 9.144,17.912C8.964,18.154 8.878,18.49 8.878,18.927L8.878,19.49C8.878,19.92 8.964,20.255 9.144,20.505C9.332,20.755 9.617,20.88 10.003,20.88C10.367,20.88 10.644,20.787 10.832,20.599C11.027,20.404 11.128,20.127 11.128,19.771L12.91,19.771C12.91,20.595 12.652,21.224 12.144,21.662C11.644,22.099 10.933,22.318 10.019,22.318C8.996,22.318 8.222,22.06 7.691,21.537C7.167,21.005 6.91,20.232 6.91,19.209C6.91,18.189 7.167,17.42 7.691,16.896C8.222,16.365 8.996,16.099 10.019,16.099ZM10.019,16.099" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M16.475,16.099C17.233,16.099 17.858,16.255 18.35,16.568C18.85,16.88 19.104,17.345 19.116,17.959L19.116,18.052L17.319,18.052L17.319,18.021C17.319,17.845 17.249,17.701 17.116,17.584C16.991,17.47 16.796,17.412 16.538,17.412C16.276,17.412 16.077,17.455 15.944,17.537C15.807,17.611 15.741,17.701 15.741,17.802C15.741,17.959 15.835,18.08 16.022,18.162C16.21,18.236 16.511,18.314 16.928,18.396C17.405,18.49 17.803,18.595 18.116,18.709C18.428,18.814 18.698,18.99 18.928,19.24C19.155,19.482 19.276,19.81 19.288,20.224C19.288,20.935 19.046,21.459 18.569,21.802C18.089,22.146 17.448,22.318 16.647,22.318C15.71,22.318 14.979,22.162 14.46,21.849C13.936,21.529 13.678,20.97 13.678,20.177L15.507,20.177C15.507,20.482 15.585,20.685 15.741,20.787C15.897,20.892 16.139,20.943 16.475,20.943C16.714,20.943 16.913,20.92 17.069,20.865C17.233,20.802 17.319,20.693 17.319,20.537C17.319,20.392 17.229,20.283 17.053,20.209C16.874,20.138 16.585,20.06 16.178,19.974C15.686,19.873 15.28,19.763 14.96,19.646C14.647,19.533 14.37,19.345 14.132,19.084C13.889,18.826 13.772,18.47 13.772,18.021C13.772,17.365 14.026,16.88 14.538,16.568C15.046,16.255 15.694,16.099 16.475,16.099ZM16.475,16.099" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M21.881,22.209L19.74,16.209L21.803,16.209L23.006,20.224L23.037,20.224L24.256,16.209L26.225,16.209L24.1,22.209ZM21.881,22.209" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_mode_edit_24dp.xml b/tables_app/src/main/res/drawable/ic_mode_edit_24dp.xml
new file mode 100644
index 00000000..b3dabac2
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_mode_edit_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_search_24dp.xml b/tables_app/src/main/res/drawable/ic_search_24dp.xml
new file mode 100644
index 00000000..c326c587
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_search_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_sort_24dp.xml b/tables_app/src/main/res/drawable/ic_sort_24dp.xml
new file mode 100644
index 00000000..30787138
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_sort_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_unarchive_24dp.xml b/tables_app/src/main/res/drawable/ic_unarchive_24dp.xml
new file mode 100644
index 00000000..602e7d8e
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_unarchive_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.55,5.22l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6C5.53,3 5.12,3.21 4.85,3.55L3.46,5.22C3.17,5.57 3,6.01 3,6.5V19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5C21,6.01 20.83,5.57 20.55,5.22zM12,9.5l5.5,5.5H14v2h-4v-2H6.5L12,9.5zM5.12,5l0.82,-1h12l0.93,1H5.12z" />
+</vector>
diff --git a/tables_app/src/main/res/drawable/ic_view_headline_24dp.xml b/tables_app/src/main/res/drawable/ic_view_headline_24dp.xml
new file mode 100644
index 00000000..820eab1a
--- /dev/null
+++ b/tables_app/src/main/res/drawable/ic_view_headline_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,15h16v-2L4,13v2zM4,19h16v-2L4,17v2zM4,11h16L20,9L4,9v2zM4,5v2h16L20,5L4,5z" />
+</vector>
diff --git a/tables_app/src/main/res/menu/detail_view_menu.xml b/tables_app/src/main/res/menu/detail_view_menu.xml
index 582fdb32..21ef5861 100644
--- a/tables_app/src/main/res/menu/detail_view_menu.xml
+++ b/tables_app/src/main/res/menu/detail_view_menu.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_edit_row"
-        android:icon="@drawable/ic_mode_edit_black_24dp"
+        android:icon="@drawable/ic_mode_edit_24dp"
         android:title="@string/edit_row"
         app:showAsAction="always" />
 
diff --git a/tables_app/src/main/res/menu/menu_color_rule_list.xml b/tables_app/src/main/res/menu/menu_color_rule_list.xml
index fb0a07b1..ecbfc39e 100644
--- a/tables_app/src/main/res/menu/menu_color_rule_list.xml
+++ b/tables_app/src/main/res/menu/menu_color_rule_list.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_color_rule_list_new"
-        android:icon="@drawable/ic_add_black_24dp"
+        android:icon="@drawable/ic_add_24dp"
         android:title="@string/add_color_rule"
         app:showAsAction="always" />
 
diff --git a/tables_app/src/main/res/menu/table_manager.xml b/tables_app/src/main/res/menu/table_manager.xml
index dcefd3fe..c3353fef 100644
--- a/tables_app/src/main/res/menu/table_manager.xml
+++ b/tables_app/src/main/res/menu/table_manager.xml
@@ -4,12 +4,12 @@
 
     <item
         android:id="@+id/menu_table_manager_import"
-        android:icon="@drawable/ic_add_black_24dp"
+        android:icon="@drawable/ic_add_24dp"
         android:title="@string/import_csv"
         app:showAsAction="always" />
     <item
         android:id="@+id/menu_table_manager_export"
-        android:icon="@drawable/ic_forward_black_24dp"
+        android:icon="@drawable/ic_forward_24dp"
         android:title="@string/export"
         app:showAsAction="always" />
     <item
diff --git a/tables_app/src/main/res/menu/top_level_table_menu.xml b/tables_app/src/main/res/menu/top_level_table_menu.xml
index 379604bc..6d0c3c8b 100644
--- a/tables_app/src/main/res/menu/top_level_table_menu.xml
+++ b/tables_app/src/main/res/menu/top_level_table_menu.xml
@@ -5,14 +5,14 @@
     <!-- Add a row -->
     <item
         android:id="@+id/top_level_table_menu_add"
-        android:icon="@drawable/ic_add_black_24dp"
+        android:icon="@drawable/ic_add_24dp"
         android:title="@string/add_row"
         app:showAsAction="always" />
 
     <!-- Select a view -->
     <item
         android:id="@+id/top_level_table_menu_select_view"
-        android:icon="@drawable/ic_view_headline_black_24dp"
+        android:icon="@drawable/ic_view_headline_24dp"
         android:title="@string/select_view"
         app:showAsAction="always">
 
diff --git a/tables_app/src/main/res/menu/web_view_activity.xml b/tables_app/src/main/res/menu/web_view_activity.xml
index 4dd55b6b..c7b91faf 100644
--- a/tables_app/src/main/res/menu/web_view_activity.xml
+++ b/tables_app/src/main/res/menu/web_view_activity.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_web_view_activity_table_manager"
-        android:icon="@drawable/ic_sort_black_24dp"
+        android:icon="@drawable/ic_sort_24dp"
         android:title="@string/table_manager_title"
         app:showAsAction="always" />