diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 343d907..5575c92 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="apps.amine.bou.readerforselfoss"
-    xmlns:tools="http://schemas.android.com/tools">
+    package="apps.amine.bou.readerforselfoss">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -19,11 +18,11 @@
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <meta-data android:name="android.app.shortcuts"
+            <meta-data
+                android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
@@ -38,7 +37,7 @@
             android:parentActivityName=".HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="apps.amine.bou.readerforselfoss.HomeActivity" />
+                android:value=".HomeActivity" />
         </activity>
         <activity
             android:name=".SourcesActivity"
@@ -56,9 +55,7 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
index 87fa3bf..0c027a8 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@@ -18,17 +18,13 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.appcompat.widget.SearchView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import androidx.recyclerview.widget.ItemTouchHelper
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
 import androidx.room.Room
-import androidx.room.RoomDatabase
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.NetworkType
-import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import apps.amine.bou.readerforselfoss.adapters.ItemCardAdapter
@@ -69,7 +65,6 @@ import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.ftinc.scoop.Scoop
 import com.github.stkent.amplify.tracking.Amplify
-import com.google.gson.reflect.TypeToken
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.materialdrawer.Drawer
@@ -79,7 +74,6 @@ import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
 import kotlinx.android.synthetic.main.activity_home.*
-import kotlinx.android.synthetic.main.fragment_article.*
 import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
@@ -307,19 +301,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         val tabNew =
             BottomNavigationItem(
-                R.drawable.ic_fiber_new_black_24dp,
+                R.drawable.ic_tab_fiber_new_black_24dp,
                 getString(R.string.tab_new)
             ).setActiveColor(appColors.colorAccent)
                 .setBadgeItem(tabNewBadge)
         val tabArchive =
             BottomNavigationItem(
-                R.drawable.ic_archive_black_24dp,
+                R.drawable.ic_tab_archive_black_24dp,
                 getString(R.string.tab_read)
             ).setActiveColor(appColors.colorAccentDark)
                 .setBadgeItem(tabArchiveBadge)
         val tabStarred =
             BottomNavigationItem(
-                R.drawable.ic_favorite_black_24dp,
+                R.drawable.ic_tab_favorite_black_24dp,
                 getString(R.string.tab_favs)
             ).setActiveColorResource(R.color.pink)
                 .setBadgeItem(tabStarredBadge)
@@ -481,7 +475,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
             footer {
                 primaryItem(R.string.drawer_report_bug) {
-                    icon = R.drawable.ic_bug_report
+                    icon = R.drawable.ic_bug_report_black_24dp
                     iconTintingEnabled = true
                     onClick { _ ->
                         val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Config.trackerUrl))
@@ -491,7 +485,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 }
 
                 primaryItem(R.string.title_activity_settings) {
-                    icon = R.drawable.ic_settings
+                    icon = R.drawable.ic_settings_black_24dp
                     iconTintingEnabled = true
                     onClick { _ ->
                         startActivityForResult(
@@ -691,7 +685,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     PrimaryDrawerItem()
                         .withName(R.string.action_about)
                         .withSelectable(false)
-                        .withIcon(R.drawable.ic_info_outline)
+                        .withIcon(R.drawable.ic_info_outline_white_24dp)
                         .withIconTintingEnabled(true)
                         .withOnDrawerItemClickListener { _, _, _ ->
                             LibsBuilder()
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
index 59306aa..7638a5d 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
@@ -46,7 +46,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                 .setOngoing(true)
                 .setPriority(PRIORITY_LOW)
                 .setChannelId(Config.syncChannelId)
-                .setSmallIcon(R.drawable.ic_cloud_download)
+                .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
             notificationManager.notify(1, notification.build())
 
@@ -101,7 +101,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                                     .setChannelId(Config.newItemsChannelId)
                                     .setContentIntent(pendingIntent)
                                     .setAutoCancel(true)
-                                    .setSmallIcon(R.drawable.ic_fiber_new_black_24dp)
+                                    .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
 
                                 Timer("", false).schedule(4000) {
                                     notificationManager.notify(2, newItemsNotification.build())
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
index 3d95aa4..7c96dcc 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -24,6 +25,7 @@ import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spanned;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -124,6 +126,27 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public void onBuildHeaders(List<Header> target) {
         loadHeadersFromResource(R.xml.pref_headers, target);
+
+        AppColors appColors = new AppColors(this);
+        if (appColors != null && appColors.isDarkTheme()) {
+            for (Header header : target) {
+                tryLoadIconDark(header);
+            }
+        }
+    }
+
+    private void tryLoadIconDark(Header header){
+        try{
+            if (header.fragmentArguments != null) {
+                String iconDark = header.fragmentArguments.getString("iconDark");
+                int iconDarkId = getResources().getIdentifier(iconDark, "drawable", getPackageName());
+                if (iconDarkId != 0) {
+                    header.iconRes = iconDarkId;
+                }
+            }
+        } catch (Exception e) {
+            Log.e("SettingsActivity", "Can not load dark icon", e);
+        }
     }
 
     /**
diff --git a/app/src/main/res/drawable-hdpi/ic_action_lab.png b/app/src/main/res/drawable-hdpi/ic_action_lab.png
deleted file mode 100644
index 32e2f1c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_lab.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index 45c099a..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add.png b/app/src/main/res/drawable-hdpi/ic_add.png
deleted file mode 100644
index 7800ba3..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png
deleted file mode 100644
index 94d0646..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bug_report.png b/app/src/main/res/drawable-hdpi/ic_bug_report.png
deleted file mode 100644
index c4e1b0d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bug_report.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png
deleted file mode 100644
index 39177c9..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24.png b/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24.png
deleted file mode 100644
index 3d3ccd5..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
deleted file mode 100644
index ceb1a1e..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_cloud_download.png b/app/src/main/res/drawable-hdpi/ic_cloud_download.png
deleted file mode 100644
index 9421b3c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_cloud_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_color_lens_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_color_lens_black_24dp.png
deleted file mode 100644
index 783e787..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_color_lens_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_done_all_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_all_white_24dp.png
deleted file mode 100644
index 8c83ff9..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_done_all_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png
deleted file mode 100644
index b8a2be6..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_fiber_new.png b/app/src/main/res/drawable-hdpi/ic_fiber_new.png
deleted file mode 100644
index 08208c3..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_fiber_new_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_fiber_new_black_24dp.png
deleted file mode 100644
index c701cda..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_fiber_new_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_history.png b/app/src/main/res/drawable-hdpi/ic_history.png
deleted file mode 100644
index c41edb7..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_black_24.png b/app/src/main/res/drawable-hdpi/ic_info_black_24.png
deleted file mode 100644
index d65e6aa..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline.png b/app/src/main/res/drawable-hdpi/ic_info_outline.png
deleted file mode 100644
index 56625bc..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_open_in_browser.png b/app/src/main/res/drawable-hdpi/ic_open_in_browser.png
deleted file mode 100644
index 5e93186..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_open_in_browser.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_open_in_browser_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_open_in_browser_black_24dp.png
deleted file mode 100644
index 5dc9b66..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_open_in_browser_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_refresh.png b/app/src/main/res/drawable-hdpi/ic_refresh.png
deleted file mode 100644
index 6d4481f..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_remove_circle_outline_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_remove_circle_outline_black_24dp.png
deleted file mode 100644
index 21d5ee8..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_remove_circle_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
deleted file mode 100644
index 3739348..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
deleted file mode 100644
index acf1ddf..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_black_24dp.png
deleted file mode 100644
index 20ba480..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_share_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
deleted file mode 100644
index b09a692..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_signal_wifi_statusbar_not_connected.png b/app/src/main/res/drawable-hdpi/ic_signal_wifi_statusbar_not_connected.png
deleted file mode 100644
index f45bb36..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_signal_wifi_statusbar_not_connected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_lab.png b/app/src/main/res/drawable-mdpi/ic_action_lab.png
deleted file mode 100644
index 8454a72..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_lab.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index 174ccaa..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add.png b/app/src/main/res/drawable-mdpi/ic_add.png
deleted file mode 100644
index ed40b2b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png
deleted file mode 100644
index bdcd478..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bug_report.png b/app/src/main/res/drawable-mdpi/ic_bug_report.png
deleted file mode 100644
index f81cf8b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bug_report.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png
deleted file mode 100644
index f2aa911..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24.png b/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24.png
deleted file mode 100644
index 6eb0b6b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
deleted file mode 100644
index af7f828..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cloud_download.png b/app/src/main/res/drawable-mdpi/ic_cloud_download.png
deleted file mode 100644
index f7881ba..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_cloud_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_color_lens_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_color_lens_black_24dp.png
deleted file mode 100644
index b5671f1..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_color_lens_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_done_all_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_all_white_24dp.png
deleted file mode 100644
index 4724d66..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_done_all_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png
deleted file mode 100644
index b3659bc..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_fiber_new.png b/app/src/main/res/drawable-mdpi/ic_fiber_new.png
deleted file mode 100644
index 262cae1..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_fiber_new_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_fiber_new_black_24dp.png
deleted file mode 100644
index f98336a..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_fiber_new_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_history.png b/app/src/main/res/drawable-mdpi/ic_history.png
deleted file mode 100644
index b33a842..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_black_24.png b/app/src/main/res/drawable-mdpi/ic_info_black_24.png
deleted file mode 100644
index 2eceb97..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_info_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline.png b/app/src/main/res/drawable-mdpi/ic_info_outline.png
deleted file mode 100644
index 60fc43f..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_info_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_open_in_browser.png b/app/src/main/res/drawable-mdpi/ic_open_in_browser.png
deleted file mode 100644
index 312f7af..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_open_in_browser.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_open_in_browser_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_open_in_browser_black_24dp.png
deleted file mode 100644
index bbe5c14..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_open_in_browser_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_refresh.png b/app/src/main/res/drawable-mdpi/ic_refresh.png
deleted file mode 100644
index ccca012..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_remove_circle_outline_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_remove_circle_outline_black_24dp.png
deleted file mode 100644
index 844e340..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_remove_circle_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
deleted file mode 100644
index d80d89e..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
deleted file mode 100644
index c59419c..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_black_24dp.png
deleted file mode 100644
index f02d360..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_share_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
deleted file mode 100644
index e944fd7..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_signal_wifi_statusbar_not_connected.png b/app/src/main/res/drawable-mdpi/ic_signal_wifi_statusbar_not_connected.png
deleted file mode 100644
index 3f95269..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_signal_wifi_statusbar_not_connected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_lab.png b/app/src/main/res/drawable-xhdpi/ic_action_lab.png
deleted file mode 100644
index ce1ff52..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_lab.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index 079c9a3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add.png b/app/src/main/res/drawable-xhdpi/ic_add.png
deleted file mode 100644
index 185be8a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png
deleted file mode 100644
index 9b88218..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bug_report.png b/app/src/main/res/drawable-xhdpi/ic_bug_report.png
deleted file mode 100644
index c00d297..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bug_report.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png
deleted file mode 100644
index 2e79886..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode_black_24.png b/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode_black_24.png
deleted file mode 100644
index d4bc567..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
deleted file mode 100644
index b7c7ffd..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cloud_download.png b/app/src/main/res/drawable-xhdpi/ic_cloud_download.png
deleted file mode 100644
index ddd3c68..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_cloud_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_color_lens_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_color_lens_black_24dp.png
deleted file mode 100644
index 0bfef26..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_color_lens_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_done_all_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_all_white_24dp.png
deleted file mode 100644
index 6ace20e..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_done_all_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_favorite_black_24dp.png
deleted file mode 100644
index 460bfb6..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xhdpi/ic_fiber_new.png
deleted file mode 100644
index 88d9d4e..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fiber_new_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_fiber_new_black_24dp.png
deleted file mode 100644
index 3788145..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_fiber_new_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_history.png b/app/src/main/res/drawable-xhdpi/ic_history.png
deleted file mode 100644
index 3ea9dd6..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_black_24.png b/app/src/main/res/drawable-xhdpi/ic_info_black_24.png
deleted file mode 100644
index 7aa8b51..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline.png b/app/src/main/res/drawable-xhdpi/ic_info_outline.png
deleted file mode 100644
index 4c616ba..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png b/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png
deleted file mode 100644
index 4ecaa05..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_open_in_browser_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_open_in_browser_black_24dp.png
deleted file mode 100644
index d87cbcc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_open_in_browser_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh.png b/app/src/main/res/drawable-xhdpi/ic_refresh.png
deleted file mode 100644
index 765ed43..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_remove_circle_outline_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_remove_circle_outline_black_24dp.png
deleted file mode 100644
index dc99afc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_remove_circle_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
deleted file mode 100644
index f3fb91d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index e84e188..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_black_24dp.png
deleted file mode 100644
index 81c80b7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
deleted file mode 100644
index 22a8783..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_wifi_statusbar_not_connected.png b/app/src/main/res/drawable-xhdpi/ic_signal_wifi_statusbar_not_connected.png
deleted file mode 100644
index 7b965c1..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_signal_wifi_statusbar_not_connected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_lab.png b/app/src/main/res/drawable-xxhdpi/ic_action_lab.png
deleted file mode 100644
index 8dcac57..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_lab.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxhdpi/ic_action_search.png
deleted file mode 100644
index 7d8c57b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add.png b/app/src/main/res/drawable-xxhdpi/ic_add.png
deleted file mode 100644
index 2ab780a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_archive_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_archive_black_24dp.png
deleted file mode 100644
index d6d60f6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bug_report.png b/app/src/main/res/drawable-xxhdpi/ic_bug_report.png
deleted file mode 100644
index 18b0024..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bug_report.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png
deleted file mode 100644
index 1797eb5..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode_black_24.png b/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode_black_24.png
deleted file mode 100644
index 7c4fedd..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 6b717e0..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cloud_download.png b/app/src/main/res/drawable-xxhdpi/ic_cloud_download.png
deleted file mode 100644
index e0678b8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_cloud_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_color_lens_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_color_lens_black_24dp.png
deleted file mode 100644
index fc311ab..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_color_lens_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_all_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_all_white_24dp.png
deleted file mode 100644
index 1f3132a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_done_all_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_favorite_black_24dp.png
deleted file mode 100644
index 1139f5f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png
deleted file mode 100644
index 30dacde..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fiber_new_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_fiber_new_black_24dp.png
deleted file mode 100644
index aca9b73..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_fiber_new_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_history.png b/app/src/main/res/drawable-xxhdpi/ic_history.png
deleted file mode 100644
index abe5f3e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_black_24.png b/app/src/main/res/drawable-xxhdpi/ic_info_black_24.png
deleted file mode 100644
index 3c29783..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline.png
deleted file mode 100644
index 89a4b2d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png b/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png
deleted file mode 100644
index 72f373f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_open_in_browser_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_open_in_browser_black_24dp.png
deleted file mode 100644
index 4324fbf..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_open_in_browser_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_refresh.png
deleted file mode 100644
index 455000e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_remove_circle_outline_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_remove_circle_outline_black_24dp.png
deleted file mode 100644
index 63ae14b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_remove_circle_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png
deleted file mode 100644
index 21a880e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index 3023ff8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png
deleted file mode 100644
index 784933a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
deleted file mode 100644
index a35b3cd..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_wifi_statusbar_not_connected.png b/app/src/main/res/drawable-xxhdpi/ic_signal_wifi_statusbar_not_connected.png
deleted file mode 100644
index ea06e23..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_signal_wifi_statusbar_not_connected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_lab.png b/app/src/main/res/drawable-xxxhdpi/ic_action_lab.png
deleted file mode 100644
index 03c6556..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_lab.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxxhdpi/ic_action_search.png
deleted file mode 100644
index aa17f31..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add.png b/app/src/main/res/drawable-xxxhdpi/ic_add.png
deleted file mode 100644
index e6ca376..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_archive_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_archive_black_24dp.png
deleted file mode 100644
index b8c0376..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_archive_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bug_report.png b/app/src/main/res/drawable-xxxhdpi/ic_bug_report.png
deleted file mode 100644
index c2d6679..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_bug_report.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png
deleted file mode 100644
index 63c5a08..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode_black_24.png b/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode_black_24.png
deleted file mode 100644
index 6ca3403..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 3964192..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cloud_download.png b/app/src/main/res/drawable-xxxhdpi/ic_cloud_download.png
deleted file mode 100644
index e129a08..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_cloud_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_color_lens_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_color_lens_black_24dp.png
deleted file mode 100644
index de8d761..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_color_lens_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_all_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_all_white_24dp.png
deleted file mode 100644
index 82dc1e2..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_done_all_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_black_24dp.png
deleted file mode 100644
index b46fa0a..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png
deleted file mode 100644
index f20eda6..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_fiber_new_black_24dp.png
deleted file mode 100644
index 38e9fb7..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_history.png b/app/src/main/res/drawable-xxxhdpi/ic_history.png
deleted file mode 100644
index 289d64b..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24.png b/app/src/main/res/drawable-xxxhdpi/ic_info_black_24.png
deleted file mode 100644
index 2dc9634..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_outline.png b/app/src/main/res/drawable-xxxhdpi/ic_info_outline.png
deleted file mode 100644
index 8df961c..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_info_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png b/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png
deleted file mode 100644
index 40f55c2..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser_black_24dp.png
deleted file mode 100644
index f0e1888..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_refresh.png b/app/src/main/res/drawable-xxxhdpi/ic_refresh.png
deleted file mode 100644
index 58b116e..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_remove_circle_outline_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_remove_circle_outline_black_24dp.png
deleted file mode 100644
index 0861db8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_remove_circle_outline_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/app/src/main/res/drawable-xxxhdpi/ic_settings.png
deleted file mode 100644
index 453dcfa..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index 476d5c9..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png
deleted file mode 100644
index 5a8544c..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
deleted file mode 100644
index e351c7b..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_signal_wifi_statusbar_not_connected.png b/app/src/main/res/drawable-xxxhdpi/ic_signal_wifi_statusbar_not_connected.png
deleted file mode 100644
index b20c6d3..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_signal_wifi_statusbar_not_connected.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 0000000..e3979cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml b/app/src/main/res/drawable/ic_bug_report_black_24dp.xml
new file mode 100644
index 0000000..4d83902
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bug_report_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bug_report_white_24dp.xml b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
new file mode 100644
index 0000000..5c8f5bc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_chrome_reader_mode_black_24dp.xml b/app/src/main/res/drawable/ic_chrome_reader_mode_black_24dp.xml
new file mode 100644
index 0000000..99b5867
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chrome_reader_mode_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_chrome_reader_mode_white_24dp.xml b/app/src/main/res/drawable/ic_chrome_reader_mode_white_24dp.xml
new file mode 100644
index 0000000..43fd20a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chrome_reader_mode_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml
new file mode 100644
index 0000000..0c8775c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_color_lens_black_24dp.xml b/app/src/main/res/drawable/ic_color_lens_black_24dp.xml
new file mode 100644
index 0000000..f75e2fb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_lens_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_color_lens_white_24dp.xml b/app/src/main/res/drawable/ic_color_lens_white_24dp.xml
new file mode 100644
index 0000000..4abeea5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_lens_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_fiber_new_white_24dp.xml b/app/src/main/res/drawable/ic_fiber_new_white_24dp.xml
new file mode 100644
index 0000000..be966ef
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fiber_new_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_history_white_24dp.xml b/app/src/main/res/drawable/ic_history_white_24dp.xml
new file mode 100644
index 0000000..de25eb4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml
new file mode 100644
index 0000000..cc94088
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
new file mode 100644
index 0000000..af0d4d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_white_24dp.xml b/app/src/main/res/drawable/ic_info_white_24dp.xml
new file mode 100644
index 0000000..7be0147
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_done_all_white_24dp.xml b/app/src/main/res/drawable/ic_menu_done_all_white_24dp.xml
new file mode 100644
index 0000000..2479e86
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_done_all_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_refresh_white_24dp.xml b/app/src/main/res/drawable/ic_menu_refresh_white_24dp.xml
new file mode 100644
index 0000000..cc2d1e0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_refresh_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_search_white_24dp.xml b/app/src/main/res/drawable/ic_menu_search_white_24dp.xml
new file mode 100644
index 0000000..be5ad99
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_search_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
new file mode 100644
index 0000000..3fb9799
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
new file mode 100644
index 0000000..3fb9799
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml b/app/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml
new file mode 100644
index 0000000..9af9456
--- /dev/null
+++ b/app/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search_black_24dp.xml
new file mode 100644
index 0000000..affc7ba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml
new file mode 100644
index 0000000..ace746c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml
new file mode 100644
index 0000000..79af3ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share_black_24dp.xml
new file mode 100644
index 0000000..e3fe874
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
new file mode 100644
index 0000000..045bbc0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml b/app/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml
new file mode 100644
index 0000000..8339d79
--- /dev/null
+++ b/app/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml b/app/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml
new file mode 100644
index 0000000..d822afb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stat_cloud_download_black_24dp.xml b/app/src/main/res/drawable/ic_stat_cloud_download_black_24dp.xml
new file mode 100644
index 0000000..261c312
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stat_cloud_download_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tab_archive_black_24dp.xml b/app/src/main/res/drawable/ic_tab_archive_black_24dp.xml
new file mode 100644
index 0000000..8b18a9d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_archive_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="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/app/src/main/res/drawable/ic_tab_favorite_black_24dp.xml b/app/src/main/res/drawable/ic_tab_favorite_black_24dp.xml
new file mode 100644
index 0000000..cfba5d8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_favorite_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tab_fiber_new_black_24dp.xml b/app/src/main/res/drawable/ic_tab_fiber_new_black_24dp.xml
new file mode 100644
index 0000000..6097dff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_fiber_new_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_widgets_black_24dp.xml b/app/src/main/res/drawable/ic_widgets_black_24dp.xml
new file mode 100644
index 0000000..4abb823
--- /dev/null
+++ b/app/src/main/res/drawable/ic_widgets_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_widgets_white_24dp.xml b/app/src/main/res/drawable/ic_widgets_white_24dp.xml
new file mode 100644
index 0000000..6c2c9fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_widgets_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 39a0437..e8b600d 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -97,7 +97,8 @@
                                 android:clipToPadding="false"
                                 android:paddingBottom="60dp"
                                 android:scrollbars="vertical"
-                                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+                                app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                                tools:listitem="@layout/list_item"/>
                         </LinearLayout>
 
                     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/activity_sources.xml b/app/src/main/res/layout/activity_sources.xml
index df18aa4..1097e6b 100644
--- a/app/src/main/res/layout/activity_sources.xml
+++ b/app/src/main/res/layout/activity_sources.xml
@@ -32,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom|right"
-        android:src="@drawable/ic_add"
+        android:src="@drawable/ic_add_white_24dp"
         android:paddingBottom="@dimen/activity_vertical_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
         android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/fragment_article.xml b/app/src/main/res/layout/fragment_article.xml
index 18ee65e..5ddf9ea 100644
--- a/app/src/main/res/layout/fragment_article.xml
+++ b/app/src/main/res/layout/fragment_article.xml
@@ -100,7 +100,7 @@
             android:layout_marginRight="16dp"
             android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingTop="@dimen/activity_vertical_margin"
-            android:src="@drawable/ic_add"
+            android:src="@drawable/ic_add_white_24dp"
             app:backgroundTint="?attr/colorAccent"
             app:fabSize="mini"
             app:rippleColor="?attr/colorAccentDark" />
diff --git a/app/src/main/res/menu/home_menu.xml b/app/src/main/res/menu/home_menu.xml
index 6a8c9b0..537909c 100644
--- a/app/src/main/res/menu/home_menu.xml
+++ b/app/src/main/res/menu/home_menu.xml
@@ -4,19 +4,19 @@
 
     <item android:id="@+id/action_search"
         android:title="@string/menu_home_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="@drawable/ic_menu_search_white_24dp"
         app:showAsAction="ifRoom|collapseActionView"
         app:actionViewClass="androidx.appcompat.widget.SearchView" />
 
     <item android:id="@+id/readAll"
-          android:icon="@drawable/ic_done_all_white_24dp"
+          android:icon="@drawable/ic_menu_done_all_white_24dp"
           android:title="@string/readAll"
           android:orderInCategory="1"
           app:showAsAction="always"/>
 
     <item
         android:id="@+id/refresh"
-        android:icon="@drawable/ic_refresh"
+        android:icon="@drawable/ic_menu_refresh_white_24dp"
         android:orderInCategory="99"
         android:title="@string/menu_home_refresh" />
 
diff --git a/app/src/main/res/menu/login_menu.xml b/app/src/main/res/menu/login_menu.xml
index 8ce65e8..7fd37b3 100644
--- a/app/src/main/res/menu/login_menu.xml
+++ b/app/src/main/res/menu/login_menu.xml
@@ -6,7 +6,7 @@
         android:id="@+id/login_debug"
         android:checkable="true"
         android:checked="false"
-        android:icon="@drawable/ic_bug_report"
+        android:icon="@drawable/ic_bug_report_black_24dp"
         android:title="@string/login_menu_debug"
         app:showAsAction="never" />
 
diff --git a/app/src/main/res/menu/reader_toolbar.xml b/app/src/main/res/menu/reader_toolbar.xml
index f8cf6b3..84c9687 100644
--- a/app/src/main/res/menu/reader_toolbar.xml
+++ b/app/src/main/res/menu/reader_toolbar.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/unread_action"
-        android:icon="@drawable/ic_fiber_new"
+        android:icon="@drawable/ic_fiber_new_white_24dp"
         android:title="@string/unmark"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/more_action"
-        android:icon="@drawable/ic_chrome_reader_mode"
+        android:icon="@drawable/ic_chrome_reader_mode_white_24dp"
         android:title="@string/reader_action_more"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/open_action"
-        android:icon="@drawable/ic_open_in_browser"
+        android:icon="@drawable/ic_open_in_browser_white_24dp"
         android:iconTint="@color/white"
         android:title="@string/reader_action_open"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/settings_theme.xml b/app/src/main/res/menu/settings_theme.xml
index ea3ea42..09bfc20 100644
--- a/app/src/main/res/menu/settings_theme.xml
+++ b/app/src/main/res/menu/settings_theme.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/clear"
-        android:icon="@drawable/ic_history"
+        android:icon="@drawable/ic_history_white_24dp"
         android:title="@string/drawer_action_clear"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5f5ece7..fab61fb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,6 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
-
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
@@ -29,7 +28,6 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
-
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
index 517fe26..de21c22 100644
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -3,7 +3,7 @@
     <shortcut
         android:shortcutId="new"
         android:enabled="true"
-        android:icon="@drawable/ic_fiber_new_black_24dp"
+        android:icon="@drawable/ic_tab_fiber_new_black_24dp"
         android:shortcutShortLabel="@string/tab_new">
         <intent
             android:action="android.intent.action.VIEW"
@@ -17,7 +17,7 @@
     <shortcut
         android:shortcutId="read"
         android:enabled="true"
-        android:icon="@drawable/ic_archive_black_24dp"
+        android:icon="@drawable/ic_tab_archive_black_24dp"
         android:shortcutShortLabel="@string/tab_read">
         <intent
             android:action="android.intent.action.VIEW"
@@ -31,7 +31,7 @@
     <shortcut
         android:shortcutId="favs"
         android:enabled="true"
-        android:icon="@drawable/ic_favorite_black_24dp"
+        android:icon="@drawable/ic_tab_favorite_black_24dp"
         android:shortcutShortLabel="@string/tab_favs">
         <intent
             android:action="android.intent.action.VIEW"
@@ -45,7 +45,7 @@
     <shortcut
         android:shortcutId="offline"
         android:enabled="true"
-        android:icon="@drawable/ic_signal_wifi_statusbar_not_connected"
+        android:icon="@drawable/ic_signal_wifi_off_black_24dp"
         android:shortcutShortLabel="@string/shortcut_offline">
         <intent
             android:action="android.intent.action.VIEW"
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
index 7b766cb..93eed8e 100644
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -3,38 +3,64 @@
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$GeneralPreferenceFragment"
         android:icon="@drawable/ic_settings_black_24dp"
-        android:title="@string/pref_header_general"/>
-
+        android:title="@string/pref_header_general">
+        <extra
+            android:name="iconDark"
+            android:value="ic_settings_white_24dp"/>
+    </header>
 
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ArticleViewerPreferenceFragment"
-        android:icon="@drawable/ic_chrome_reader_mode_black_24"
-        android:title="@string/pref_header_viewer"/>
-
+        android:icon="@drawable/ic_chrome_reader_mode_black_24dp"
+        android:title="@string/pref_header_viewer">
+        <extra
+            android:name="iconDark"
+            android:value="ic_chrome_reader_mode_white_24dp"/>
+    </header>
 
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$OfflinePreferenceFragment"
-        android:icon="@drawable/ic_signal_wifi_statusbar_not_connected"
-        android:title="@string/pref_header_offline"/>
+        android:icon="@drawable/ic_signal_wifi_off_black_24dp"
+        android:title="@string/pref_header_offline">
+        <extra
+            android:name="iconDark"
+            android:value="ic_signal_wifi_off_white_24dp"/>
+    </header>
 
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$DebugPreferenceFragment"
-        android:icon="@drawable/ic_bug_report"
-        android:title="@string/pref_header_debug"/>
+        android:icon="@drawable/ic_bug_report_black_24dp"
+        android:title="@string/pref_header_debug">
+        <extra
+            android:name="iconDark"
+            android:value="ic_bug_report_white_24dp"/>
+    </header>
 
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ThemePreferenceFragment"
         android:icon="@drawable/ic_color_lens_black_24dp"
-        android:title="@string/pref_header_theme"/>
+        android:title="@string/pref_header_theme">
+        <extra
+            android:name="iconDark"
+            android:value="ic_color_lens_white_24dp"/>
+    </header>
 
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$LinksPreferenceFragment"
-        android:icon="@drawable/ic_info_black_24"
-        android:title="@string/pref_header_links"/>
+        android:icon="@drawable/ic_info_black_24dp"
+        android:title="@string/pref_header_links">
+        <extra
+            android:name="iconDark"
+            android:value="ic_info_white_24dp"/>
+    </header>
 
     <header
         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ExperimentalPreferenceFragment"
-        android:icon="@drawable/ic_action_lab"
-        android:title="@string/pref_header_experimental"/>
+        android:icon="@drawable/ic_widgets_black_24dp"
+        android:title="@string/pref_header_experimental">
+        <extra
+            android:name="iconDark"
+            android:value="ic_widgets_white_24dp"/>
+    </header>
 
 </preference-headers>